diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index f9c86e91..f15692d3 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -22,9 +22,8 @@ jobs:
     - name: Grant execute permission for gradlew
       run: chmod +x gradlew
     - name: Build with Gradle
-      run: ./gradlew jvmTest
+      run: ./gradlew jvmTest jsTest
   spotless:
-
     runs-on: ubuntu-latest
 
     steps:
diff --git a/build.gradle.kts b/build.gradle.kts
index ac6cc165..0b96ecb5 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -8,7 +8,7 @@ plugins {
     kotlin("plugin.allopen") version "2.0.0"
     kotlin("plugin.serialization") version "2.0.0"
     id("com.github.johnrengelman.shadow") version "8.1.1"
-    id("com.diffplug.spotless") version "6.17.0"
+    id("com.diffplug.spotless") version "6.25.0"
     id("idea")
 }
 
@@ -49,7 +49,7 @@ kotlin {
             }
         }
     }
-    js {
+    js(IR) {
         browser {
             commonWebpackConfig {
                 cssSupport {
@@ -81,8 +81,8 @@ kotlin {
                 implementation(kotlin("stdlib-js"))
                 implementation(
                     project.dependencies.enforcedPlatform(
-                        "org.jetbrains.kotlin-wrappers:kotlin-wrappers-bom:1.0.0-pre.763"
-                    )
+                        "org.jetbrains.kotlin-wrappers:kotlin-wrappers-bom:1.0.0-pre.763",
+                    ),
                 )
                 implementation("org.jetbrains.kotlin-wrappers:kotlin-react")
                 implementation("org.jetbrains.kotlin-wrappers:kotlin-react-dom")
@@ -131,8 +131,8 @@ kotlin {
                 configurations["kapt"].dependencies.addAll(
                     listOf(
                         project.dependencies.create("io.micronaut:micronaut-inject-java:3.10.4"),
-                        project.dependencies.create("info.picocli:picocli-codegen:4.7.6")
-                    )
+                        project.dependencies.create("info.picocli:picocli-codegen:4.7.6"),
+                    ),
                 )
                 if (System.getProperty("os.name").lowercase(Locale.getDefault()).contains("mac")) {
                     implementation("io.micronaut:micronaut-runtime-osx")
@@ -146,8 +146,8 @@ kotlin {
                 configurations["kaptTest"].dependencies.addAll(
                     listOf(
                         project.dependencies.create("io.micronaut:micronaut-inject-java:3.10.4"),
-                        project.dependencies.create("info.picocli:picocli-codegen:4.7.6")
-                    )
+                        project.dependencies.create("info.picocli:picocli-codegen:4.7.6"),
+                    ),
                 )
 
                 implementation(kotlin("test-junit5"))
@@ -208,23 +208,21 @@ spotless {
         val files = project.fileTree(rootDir)
         files.include("**/*.kt")
         target(files)
-        ktlint("0.47.1")
-            .setUseExperimental(true)
+        ktlint("1.3.0")
             .editorConfigOverride(
                 mapOf(
                     "max_line_length" to "256",
-                    "insert_final_newline" to "true"
-                )
+                    "insert_final_newline" to "true",
+                ),
             )
     }
     kotlinGradle {
-        ktlint("0.47.1")
-            .setUseExperimental(true)
+        ktlint("1.3.0")
             .editorConfigOverride(
                 mapOf(
                     "max_line_length" to "256",
-                    "insert_final_newline" to "true"
-                )
+                    "insert_final_newline" to "true",
+                ),
             )
     }
 }
diff --git a/src/commonMain/kotlin/com.github.ikovalyov.model/Article.kt b/src/commonMain/kotlin/com.github.ikovalyov.model/Article.kt
index 7cf4c2c0..5745ae0c 100644
--- a/src/commonMain/kotlin/com.github.ikovalyov.model/Article.kt
+++ b/src/commonMain/kotlin/com.github.ikovalyov.model/Article.kt
@@ -26,162 +26,158 @@ data class Article(
     val meta: List<String>?,
     val template: Template?, // Template uuid
     val userList: List<User>,
-    val templateList: List<Template>
+    val templateList: List<Template>,
 ) : IEditable {
-    override fun getMetadata(): List<IEditable.EditableMetadata<*, Article>> {
-        return listOf(
-            IEditable.EditableMetadata(
-                fieldType = IEditable.FieldType.Id,
-                readOnly = true,
-                serialize = {
-                    it.toString()
-                },
-                deserialize = {
-                    uuidFrom(it)
-                },
-                update = {
-                    copy(id = it)
-                },
-                get = {
-                    id
-                },
-                fieldName = "Id",
-                predefinedList = null
-            ),
-            IEditable.EditableMetadata(
-                fieldType = IEditable.FieldType.Name,
-                readOnly = false,
-                serialize = {
-                    it
-                },
-                deserialize = {
-                    it
-                },
-                update = {
-                    copy(name = it)
-                },
-                get = {
-                    name
-                },
-                fieldName = "Name",
-                predefinedList = null
-            ),
-            IEditable.EditableMetadata(
-                fieldType = IEditable.FieldType.Abstract,
-                readOnly = false,
-                serialize = {
-                    it
-                },
-                deserialize = {
-                    it
-                },
-                update = {
-                    copy(abstract = it)
-                },
-                get = {
-                    abstract
-                },
-                fieldName = "Abstract",
-                predefinedList = null
-            ),
-            IEditable.EditableMetadata(
-                fieldType = IEditable.FieldType.Body,
-                readOnly = false,
-                serialize = {
-                    it
-                },
-                deserialize = {
-                    it
-                },
-                update = {
-                    copy(body = it)
-                },
-                get = {
-                    body
-                },
-                fieldName = "Body",
-                predefinedList = null
-            ),
-            IEditable.EditableMetadata(
-                fieldType = IEditable.FieldType.Author,
-                readOnly = false,
-                serialize = {
-                    it.id.toString()
-                },
-                deserialize = { uuid ->
-                    userList.first {
-                        it.id.toString() == uuid
-                    }
-                },
-                update = {
-                    copy(author = it)
-                },
-                get = {
-                    author
-                },
-                fieldName = "Author",
-                predefinedList = userList
-            ),
-            IEditable.EditableMetadata(
-                fieldType = IEditable.FieldType.Tags,
-                readOnly = false,
-                serialize = {
-                    it.joinToString(separator = ",")
-                },
-                deserialize = {
-                    it.split(",")
-                },
-                update = {
-                    copy(tags = it)
-                },
-                get = {
-                    tags
-                },
-                fieldName = "Tags",
-                predefinedList = null
-            ),
-            IEditable.EditableMetadata(
-                fieldType = IEditable.FieldType.StringListFiledType,
-                readOnly = false,
-                serialize = {
-                    it.joinToString(separator = ",")
-                },
-                deserialize = {
-                    it.split(",")
-                },
-                update = {
-                    copy(meta = it)
-                },
-                get = {
-                    meta
-                },
-                fieldName = "Meta",
-                predefinedList = null
-            ),
-            IEditable.EditableMetadata(
-                fieldType = IEditable.FieldType.Template,
-                readOnly = false,
-                serialize = {
-                    it.id.toString()
-                },
-                deserialize = { uuid ->
-                    templateList.first {
-                        it.id.toString() == uuid
-                    }
-                },
-                update = {
-                    copy(template = it)
-                },
-                get = {
-                    template
-                },
-                fieldName = "Template",
-                predefinedList = templateList
-            )
-        )
-    }
+    override fun getMetadata(): List<IEditable.EditableMetadata<*, Article>> = listOf(
+        IEditable.EditableMetadata(
+            fieldType = IEditable.FieldType.Id,
+            readOnly = true,
+            serialize = {
+                it.toString()
+            },
+            deserialize = {
+                uuidFrom(it)
+            },
+            update = {
+                copy(id = it)
+            },
+            get = {
+                id
+            },
+            fieldName = "Id",
+            predefinedList = null,
+        ),
+        IEditable.EditableMetadata(
+            fieldType = IEditable.FieldType.Name,
+            readOnly = false,
+            serialize = {
+                it
+            },
+            deserialize = {
+                it
+            },
+            update = {
+                copy(name = it)
+            },
+            get = {
+                name
+            },
+            fieldName = "Name",
+            predefinedList = null,
+        ),
+        IEditable.EditableMetadata(
+            fieldType = IEditable.FieldType.Abstract,
+            readOnly = false,
+            serialize = {
+                it
+            },
+            deserialize = {
+                it
+            },
+            update = {
+                copy(abstract = it)
+            },
+            get = {
+                abstract
+            },
+            fieldName = "Abstract",
+            predefinedList = null,
+        ),
+        IEditable.EditableMetadata(
+            fieldType = IEditable.FieldType.Body,
+            readOnly = false,
+            serialize = {
+                it
+            },
+            deserialize = {
+                it
+            },
+            update = {
+                copy(body = it)
+            },
+            get = {
+                body
+            },
+            fieldName = "Body",
+            predefinedList = null,
+        ),
+        IEditable.EditableMetadata(
+            fieldType = IEditable.FieldType.Author,
+            readOnly = false,
+            serialize = {
+                it.id.toString()
+            },
+            deserialize = { uuid ->
+                userList.first {
+                    it.id.toString() == uuid
+                }
+            },
+            update = {
+                copy(author = it)
+            },
+            get = {
+                author
+            },
+            fieldName = "Author",
+            predefinedList = userList,
+        ),
+        IEditable.EditableMetadata(
+            fieldType = IEditable.FieldType.Tags,
+            readOnly = false,
+            serialize = {
+                it.joinToString(separator = ",")
+            },
+            deserialize = {
+                it.split(",")
+            },
+            update = {
+                copy(tags = it)
+            },
+            get = {
+                tags
+            },
+            fieldName = "Tags",
+            predefinedList = null,
+        ),
+        IEditable.EditableMetadata(
+            fieldType = IEditable.FieldType.StringListFiledType,
+            readOnly = false,
+            serialize = {
+                it.joinToString(separator = ",")
+            },
+            deserialize = {
+                it.split(",")
+            },
+            update = {
+                copy(meta = it)
+            },
+            get = {
+                meta
+            },
+            fieldName = "Meta",
+            predefinedList = null,
+        ),
+        IEditable.EditableMetadata(
+            fieldType = IEditable.FieldType.Template,
+            readOnly = false,
+            serialize = {
+                it.id.toString()
+            },
+            deserialize = { uuid ->
+                templateList.first {
+                    it.id.toString() == uuid
+                }
+            },
+            update = {
+                copy(template = it)
+            },
+            get = {
+                template
+            },
+            fieldName = "Template",
+            predefinedList = templateList,
+        ),
+    )
 
-    override fun serialize(): String {
-        return Json.encodeToString(this)
-    }
+    override fun serialize(): String = Json.encodeToString(this)
 }
diff --git a/src/commonMain/kotlin/com.github.ikovalyov.model/Item.kt b/src/commonMain/kotlin/com.github.ikovalyov.model/Item.kt
index 2dd4884c..ef02621b 100644
--- a/src/commonMain/kotlin/com.github.ikovalyov.model/Item.kt
+++ b/src/commonMain/kotlin/com.github.ikovalyov.model/Item.kt
@@ -14,16 +14,12 @@ import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
 
 @Serializable
-data class Item(
-    override val id: Uuid,
-    val lastModified: Instant,
-    val body: String
-) : IEditable {
+data class Item(override val id: Uuid, val lastModified: Instant, val body: String) : IEditable {
 
     companion object {
-        const val id = "id"
-        const val lastModified = "lastModified"
-        const val body = "body"
+        const val ID = "id"
+        const val LAST_MODIFIED = "lastModified"
+        const val BODY = "body"
     }
 
     override fun getMetadata(): List<IEditable.EditableMetadata<*, Item>> = listOf(
@@ -40,8 +36,8 @@ data class Item(
                 copy(id = it)
             },
             get = { id },
-            fieldName = "Id",
-            predefinedList = null
+            fieldName = ID,
+            predefinedList = null,
         ),
         IEditable.EditableMetadata(
             fieldType = IEditable.FieldType.Body,
@@ -52,8 +48,8 @@ data class Item(
                 copy(body = it)
             },
             get = { body },
-            fieldName = "Body",
-            predefinedList = null
+            fieldName = BODY,
+            predefinedList = null,
         ),
         IEditable.EditableMetadata(
             fieldType = IEditable.FieldType.LastModified,
@@ -68,12 +64,10 @@ data class Item(
                 copy(lastModified = it)
             },
             get = { lastModified },
-            fieldName = "Last Modified",
-            predefinedList = null
-        )
+            fieldName = LAST_MODIFIED,
+            predefinedList = null,
+        ),
     )
 
-    override fun serialize(): String {
-        return Json.encodeToString(this)
-    }
+    override fun serialize(): String = Json.encodeToString(this)
 }
diff --git a/src/commonMain/kotlin/com.github.ikovalyov.model/Tag.kt b/src/commonMain/kotlin/com.github.ikovalyov.model/Tag.kt
index 9e8fbd87..156d4cbe 100644
--- a/src/commonMain/kotlin/com.github.ikovalyov.model/Tag.kt
+++ b/src/commonMain/kotlin/com.github.ikovalyov.model/Tag.kt
@@ -6,52 +6,45 @@ import com.github.ikovalyov.model.markers.IEditable
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
 
-data class Tag(
-    override val id: Uuid,
-    val name: String
-) : IEditable {
-    override fun getMetadata(): List<IEditable.EditableMetadata<*, out IEditable>> {
-        return listOf(
-            IEditable.EditableMetadata(
-                fieldType = IEditable.FieldType.Id,
-                readOnly = true,
-                serialize = {
-                    it.toString()
-                },
-                deserialize = {
-                    uuidFrom(it)
-                },
-                update = {
-                    copy(id = it)
-                },
-                get = {
-                    id
-                },
-                fieldName = "Id",
-                predefinedList = null
-            ),
-            IEditable.EditableMetadata(
-                fieldType = IEditable.FieldType.Name,
-                readOnly = false,
-                serialize = {
-                    it
-                },
-                deserialize = {
-                    it
-                },
-                update = {
-                    copy(name = it)
-                },
-                get = {
-                    name
-                },
-                fieldName = "Name",
-                predefinedList = null
-            )
-        )
-    }
+data class Tag(override val id: Uuid, val name: String) : IEditable {
+    override fun getMetadata(): List<IEditable.EditableMetadata<*, out IEditable>> = listOf(
+        IEditable.EditableMetadata(
+            fieldType = IEditable.FieldType.Id,
+            readOnly = true,
+            serialize = {
+                it.toString()
+            },
+            deserialize = {
+                uuidFrom(it)
+            },
+            update = {
+                copy(id = it)
+            },
+            get = {
+                id
+            },
+            fieldName = "Id",
+            predefinedList = null,
+        ),
+        IEditable.EditableMetadata(
+            fieldType = IEditable.FieldType.Name,
+            readOnly = false,
+            serialize = {
+                it
+            },
+            deserialize = {
+                it
+            },
+            update = {
+                copy(name = it)
+            },
+            get = {
+                name
+            },
+            fieldName = "Name",
+            predefinedList = null,
+        ),
+    )
 
-    override fun serialize(): String {
-        return Json.encodeToString(this)
-    }
+    override fun serialize(): String = Json.encodeToString(this)
 }
diff --git a/src/commonMain/kotlin/com.github.ikovalyov.model/Template.kt b/src/commonMain/kotlin/com.github.ikovalyov.model/Template.kt
index c5b85f2a..f2226667 100644
--- a/src/commonMain/kotlin/com.github.ikovalyov.model/Template.kt
+++ b/src/commonMain/kotlin/com.github.ikovalyov.model/Template.kt
@@ -15,17 +15,12 @@ import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
 
 @Serializable
-data class Template(
-    override val id: Uuid,
-    val name: String,
-    val body: String,
-    val lastModified: Instant = Clock.System.now()
-) : IEditable {
+data class Template(override val id: Uuid, val name: String, val body: String, val lastModified: Instant = Clock.System.now()) : IEditable {
     companion object {
-        const val id = "id"
-        const val name = "name"
-        const val body = "body"
-        const val lastModified = "lastModified"
+        const val ID = "id"
+        const val NAME = "name"
+        const val BODY = "body"
+        const val LAST_MODIFIED = "lastModified"
 
         fun create(id: Uuid, name: String, body: String) = Template(id, name, body, Clock.System.now())
     }
@@ -44,8 +39,8 @@ data class Template(
                 copy(id = it)
             },
             get = { id },
-            fieldName = "Id",
-            predefinedList = null
+            fieldName = ID,
+            predefinedList = null,
         ),
         IEditable.EditableMetadata(
             fieldType = IEditable.FieldType.Name,
@@ -60,8 +55,8 @@ data class Template(
                 copy(name = it)
             },
             get = { name },
-            fieldName = "Name",
-            predefinedList = null
+            fieldName = NAME,
+            predefinedList = null,
         ),
         IEditable.EditableMetadata(
             fieldType = IEditable.FieldType.Body,
@@ -72,8 +67,8 @@ data class Template(
                 copy(body = it)
             },
             get = { body },
-            fieldName = "Body",
-            predefinedList = null
+            fieldName = BODY,
+            predefinedList = null,
         ),
         IEditable.EditableMetadata(
             fieldType = IEditable.FieldType.LastModified,
@@ -92,12 +87,10 @@ data class Template(
                 copy(lastModified = it)
             },
             get = { lastModified },
-            fieldName = "Last Modified",
-            predefinedList = null
-        )
+            fieldName = LAST_MODIFIED,
+            predefinedList = null,
+        ),
     )
 
-    override fun serialize(): String {
-        return Json.encodeToString(this)
-    }
+    override fun serialize(): String = Json.encodeToString(this)
 }
diff --git a/src/commonMain/kotlin/com.github.ikovalyov.model/TemplateListItem.kt b/src/commonMain/kotlin/com.github.ikovalyov.model/TemplateListItem.kt
index f831f5fc..dea72222 100644
--- a/src/commonMain/kotlin/com.github.ikovalyov.model/TemplateListItem.kt
+++ b/src/commonMain/kotlin/com.github.ikovalyov.model/TemplateListItem.kt
@@ -10,13 +10,8 @@ import kotlinx.serialization.Serializable
 import kotlinx.serialization.UseSerializers
 
 @Serializable
-data class TemplateListItem(
-    val id: Uuid,
-    val lastModified: Instant
-) {
+data class TemplateListItem(val id: Uuid, val lastModified: Instant) {
     companion object {
-        fun fromTemplate(template: Template): TemplateListItem {
-            return TemplateListItem(template.id, template.lastModified)
-        }
+        fun fromTemplate(template: Template): TemplateListItem = TemplateListItem(template.id, template.lastModified)
     }
 }
diff --git a/src/commonMain/kotlin/com.github.ikovalyov.model/markers/IEditable.kt b/src/commonMain/kotlin/com.github.ikovalyov.model/markers/IEditable.kt
index a1209813..32a78f3b 100644
--- a/src/commonMain/kotlin/com.github.ikovalyov.model/markers/IEditable.kt
+++ b/src/commonMain/kotlin/com.github.ikovalyov.model/markers/IEditable.kt
@@ -1,9 +1,6 @@
 package com.github.ikovalyov.model.markers
 
 import com.benasher44.uuid.Uuid
-import com.github.ikovalyov.model.Template
-import com.github.ikovalyov.model.security.Email
-import com.github.ikovalyov.model.security.Password
 import com.github.ikovalyov.model.security.User
 import kotlinx.datetime.Instant
 import kotlinx.serialization.ExperimentalSerializationApi
@@ -17,7 +14,7 @@ interface IEditable {
         val update: I.(F) -> I,
         val get: () -> F?,
         val fieldName: String,
-        val predefinedList: List<F>?
+        val predefinedList: List<F>?,
     )
 
     sealed class FieldType<T : Any> {
diff --git a/src/commonMain/kotlin/com.github.ikovalyov.model/security/Security.kt b/src/commonMain/kotlin/com.github.ikovalyov.model/security/Security.kt
index 76b98c58..7460d1ff 100644
--- a/src/commonMain/kotlin/com.github.ikovalyov.model/security/Security.kt
+++ b/src/commonMain/kotlin/com.github.ikovalyov.model/security/Security.kt
@@ -1,5 +1,3 @@
 package com.github.ikovalyov.model.security
 
-data class Security(
-    val attributes: Map<String, Any>
-)
+data class Security(val attributes: Map<String, Any>)
diff --git a/src/commonMain/kotlin/com.github.ikovalyov.model/security/ShortString.kt b/src/commonMain/kotlin/com.github.ikovalyov.model/security/ShortString.kt
index 53fd5b81..2e5d5b89 100644
--- a/src/commonMain/kotlin/com.github.ikovalyov.model/security/ShortString.kt
+++ b/src/commonMain/kotlin/com.github.ikovalyov.model/security/ShortString.kt
@@ -7,13 +7,13 @@ import kotlin.jvm.JvmInline
 @JvmInline
 value class ShortString(val value: String) {
     companion object {
-        const val shortStringSize = 256
+        const val SHORT_STRING_SIZE = 256
     }
     init {
-        if (value.length > shortStringSize) {
-            throw IllegalArgumentException("value can't be longer than $shortStringSize characters")
+        if (value.length > SHORT_STRING_SIZE) {
+            throw IllegalArgumentException("value can't be longer than $SHORT_STRING_SIZE characters")
         }
     }
 
-    override fun toString() = value.toString()
+    override fun toString() = value
 }
diff --git a/src/commonMain/kotlin/com.github.ikovalyov.model/security/User.kt b/src/commonMain/kotlin/com.github.ikovalyov.model/security/User.kt
index 075e2945..8faafd3b 100644
--- a/src/commonMain/kotlin/com.github.ikovalyov.model/security/User.kt
+++ b/src/commonMain/kotlin/com.github.ikovalyov.model/security/User.kt
@@ -1,4 +1,4 @@
-@file:OptIn(kotlinx.serialization.ExperimentalSerializationApi::class)
+@file:OptIn(ExperimentalSerializationApi::class)
 @file:UseSerializers(UuidSerializer::class)
 
 package com.github.ikovalyov.model.security
@@ -16,80 +16,69 @@ import kotlinx.serialization.json.Json
 
 @ExperimentalSerializationApi
 @Serializable
-data class User(
-    override val id: Uuid,
-    var email: Email,
-    val loggedIn: Boolean,
-    val nickname: String,
-    val roles: List<Uuid>,
-    val password: Password
-) : IEditable {
-    override fun getMetadata(): List<IEditable.EditableMetadata<*, User>> {
-        return listOf(
-            IEditable.EditableMetadata(
-                fieldType = IEditable.FieldType.Id,
-                readOnly = true,
-                serialize = { id.toString() },
-                deserialize = { uuidFrom(it) },
-                get = { id },
-                update = {
-                    copy(id = it)
-                },
-                fieldName = "Id",
-                predefinedList = null
-            ),
-            IEditable.EditableMetadata(
-                fieldType = IEditable.FieldType.Email,
-                readOnly = false,
-                serialize = { it.value.value },
-                deserialize = { Email(ShortString(it)) },
-                get = { email },
-                update = {
-                    copy(email = it)
-                },
-                fieldName = "Email",
-                predefinedList = null
-            ),
-            IEditable.EditableMetadata(
-                fieldType = IEditable.FieldType.Nickname,
-                readOnly = false,
-                serialize = { it },
-                deserialize = { it },
-                get = { nickname },
-                update = {
-                    copy(nickname = it)
-                },
-                fieldName = "Nickname",
-                predefinedList = null
-            ),
-            IEditable.EditableMetadata(
-                fieldType = IEditable.FieldType.UserRoles,
-                readOnly = false,
-                serialize = { Json.encodeToString(ListSerializer(UuidSerializer), it) },
-                deserialize = { Json.decodeFromString(ListSerializer(UuidSerializer), it) },
-                get = { roles },
-                update = {
-                    copy(roles = it)
-                },
-                fieldName = "User Roles",
-                predefinedList = null
-            ),
-            IEditable.EditableMetadata(
-                fieldType = IEditable.FieldType.Password,
-                readOnly = false,
-                serialize = { it.value.value },
-                deserialize = { Password(ShortString(it)) },
-                get = { password },
-                update = {
-                    copy(password = it)
-                },
-                fieldName = "Password",
-                predefinedList = null
-            )
-        )
-    }
+data class User(override val id: Uuid, var email: Email, val loggedIn: Boolean, val nickname: String, val roles: List<Uuid>, val password: Password) : IEditable {
+    override fun getMetadata(): List<IEditable.EditableMetadata<*, User>> = listOf(
+        IEditable.EditableMetadata(
+            fieldType = IEditable.FieldType.Id,
+            readOnly = true,
+            serialize = { id.toString() },
+            deserialize = { uuidFrom(it) },
+            get = { id },
+            update = {
+                copy(id = it)
+            },
+            fieldName = "Id",
+            predefinedList = null,
+        ),
+        IEditable.EditableMetadata(
+            fieldType = IEditable.FieldType.Email,
+            readOnly = false,
+            serialize = { it.value.value },
+            deserialize = { Email(ShortString(it)) },
+            get = { email },
+            update = {
+                copy(email = it)
+            },
+            fieldName = "Email",
+            predefinedList = null,
+        ),
+        IEditable.EditableMetadata(
+            fieldType = IEditable.FieldType.Nickname,
+            readOnly = false,
+            serialize = { it },
+            deserialize = { it },
+            get = { nickname },
+            update = {
+                copy(nickname = it)
+            },
+            fieldName = "Nickname",
+            predefinedList = null,
+        ),
+        IEditable.EditableMetadata(
+            fieldType = IEditable.FieldType.UserRoles,
+            readOnly = false,
+            serialize = { Json.encodeToString(ListSerializer(UuidSerializer), it) },
+            deserialize = { Json.decodeFromString(ListSerializer(UuidSerializer), it) },
+            get = { roles },
+            update = {
+                copy(roles = it)
+            },
+            fieldName = "User Roles",
+            predefinedList = null,
+        ),
+        IEditable.EditableMetadata(
+            fieldType = IEditable.FieldType.Password,
+            readOnly = false,
+            serialize = { it.value.value },
+            deserialize = { Password(ShortString(it)) },
+            get = { password },
+            update = {
+                copy(password = it)
+            },
+            fieldName = "Password",
+            predefinedList = null,
+        ),
+    )
 
-    override fun serialize(): String {
-        return Json.encodeToString(this)
-    }
+    override fun serialize(): String = Json.encodeToString(this)
 }
diff --git a/src/commonMain/kotlin/com.github.ikovalyov.model/security/UserRole.kt b/src/commonMain/kotlin/com.github.ikovalyov.model/security/UserRole.kt
index e7f102b2..a1704e07 100644
--- a/src/commonMain/kotlin/com.github.ikovalyov.model/security/UserRole.kt
+++ b/src/commonMain/kotlin/com.github.ikovalyov.model/security/UserRole.kt
@@ -15,15 +15,11 @@ import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
 
 @Serializable
-data class UserRole(
-    override val id: Uuid,
-    val lastModified: Instant,
-    val name: String
-) : IEditable {
+data class UserRole(override val id: Uuid, val lastModified: Instant, val name: String) : IEditable {
     companion object {
-        const val id = "id"
-        const val name = "name"
-        const val lastModified = "lastModified"
+        const val ID = "id"
+        const val NAME = "name"
+        const val LAST_MODIFIED = "lastModified"
     }
 
     override fun getMetadata(): List<IEditable.EditableMetadata<*, UserRole>> = listOf(
@@ -42,8 +38,8 @@ data class UserRole(
             update = {
                 copy(id = it)
             },
-            fieldName = "Id",
-            predefinedList = null
+            fieldName = ID,
+            predefinedList = null,
         ),
         IEditable.EditableMetadata(
             fieldType = IEditable.FieldType.Name,
@@ -56,8 +52,8 @@ data class UserRole(
             update = {
                 copy(name = it)
             },
-            fieldName = "Name",
-            predefinedList = null
+            fieldName = NAME,
+            predefinedList = null,
         ),
 
         IEditable.EditableMetadata(
@@ -79,12 +75,10 @@ data class UserRole(
             update = {
                 copy(lastModified = it)
             },
-            fieldName = "Last Modified",
-            predefinedList = null
-        )
+            fieldName = LAST_MODIFIED,
+            predefinedList = null,
+        ),
     )
 
-    override fun serialize(): String {
-        return Json.encodeToString(this)
-    }
+    override fun serialize(): String = Json.encodeToString(this)
 }
diff --git a/src/commonMain/kotlin/com.github.ikovalyov.model/validator/EmailValidator.kt b/src/commonMain/kotlin/com.github.ikovalyov.model/validator/EmailValidator.kt
index 290345d2..6845eb93 100644
--- a/src/commonMain/kotlin/com.github.ikovalyov.model/validator/EmailValidator.kt
+++ b/src/commonMain/kotlin/com.github.ikovalyov.model/validator/EmailValidator.kt
@@ -5,7 +5,5 @@ import com.github.ikovalyov.model.security.ShortString
 class EmailValidator : ValidatorInterface<ShortString> {
     private val emailAddressRegex = "^[A-Za-z](.*)(@)(.+)(\\.)(.+)".toRegex()
 
-    override fun validate(input: ShortString): Boolean {
-        return input.toString().matches(emailAddressRegex)
-    }
+    override fun validate(input: ShortString): Boolean = input.toString().matches(emailAddressRegex)
 }
diff --git a/src/commonMain/kotlin/com/github/ikovalyov/Api.kt b/src/commonMain/kotlin/com/github/ikovalyov/Api.kt
index 323fa5fb..907decc4 100644
--- a/src/commonMain/kotlin/com/github/ikovalyov/Api.kt
+++ b/src/commonMain/kotlin/com/github/ikovalyov/Api.kt
@@ -1,13 +1,13 @@
 package com.github.ikovalyov
 
 object Api {
-    const val articleApiUrl = "/application/api/article"
-    const val templateApiUrl = "/application/api/template"
-    const val recordsApiUrl = "/application/api/records"
-    const val viewsApiUrl = "/application/api/views"
-    const val userRoleApiUrl = "/application/api/user-role"
-    const val userApiUrl = "/application/api/user"
-    const val userUrl = "/application/user"
-    const val backendEndpoint = "http://localhost:8082"
-    const val frontendEndpoint = "http://localhost:8080"
+    const val ARTICLE_API_URL = "/application/api/article"
+    const val TEMPLATE_API_URL = "/application/api/template"
+    const val RECORDS_API_URL = "/application/api/records"
+    const val VIEWS_API_URL = "/application/api/views"
+    const val USER_ROLE_API_URL = "/application/api/user-role"
+    const val USER_API_URL = "/application/api/user"
+    const val USER_URL = "/application/user"
+    const val BACKEND_ENDPOINT = "http://localhost:8082"
+    const val FRONTEND_ENDPOINT = "http://localhost:8080"
 }
diff --git a/src/jsMain/kotlin/com.github.ikovalyov/App.kt b/src/jsMain/kotlin/com.github.ikovalyov/App.kt
index 81b03f93..6d9df5f1 100644
--- a/src/jsMain/kotlin/com.github.ikovalyov/App.kt
+++ b/src/jsMain/kotlin/com.github.ikovalyov/App.kt
@@ -3,11 +3,9 @@ package com.github.ikovalyov
 import com.github.ikovalyov.react.components.bootstrap.Button
 import com.github.ikovalyov.react.components.bootstrap.Div
 import com.github.ikovalyov.react.components.bootstrap.Input
-import com.github.ikovalyov.react.components.bootstrap.ScreenReaderSpan
-import com.github.ikovalyov.react.components.bootstrap.nav.CollapseButton
+import com.github.ikovalyov.react.components.bootstrap.nav.collapseButton
 import com.github.ikovalyov.react.components.bootstrap.nav.menuItem
-import csstype.ClassName
-import csstype.px
+import com.github.ikovalyov.react.components.bootstrap.screenReaderSpan
 import emotion.react.css
 import react.FC
 import react.Props
@@ -16,16 +14,18 @@ import react.dom.html.ReactHTML.form
 import react.dom.html.ReactHTML.nav
 import react.dom.html.ReactHTML.ul
 import react.router.dom.Link
+import web.cssom.ClassName
+import web.cssom.px
 
-const val navbarTogglerId = "navbarTogglerDemo01"
+const val NAVBAR_TOGGLER_ID = "navbarTogglerDemo01"
 val App = FC<Props> {
     nav {
         className = ClassName("navbar navbar-expand-lg navbar-light bg-light")
         Div.ContainerFluidDiv(this) {
-            CollapseButton(target = navbarTogglerId)
+            collapseButton(target = NAVBAR_TOGGLER_ID)
             div {
                 className = ClassName("collapse navbar-collapse")
-                id = navbarTogglerId
+                id = NAVBAR_TOGGLER_ID
                 Link {
                     to = "/"
                     className = ClassName("navbar-brand")
@@ -36,10 +36,20 @@ val App = FC<Props> {
 
                     menuItem(href = "#", active = true, disabled = false) {
                         +"Home "
-                        ScreenReaderSpan("(current)")
+                        screenReaderSpan("(current)")
                     }
-                    menuItem(href = "${Api.backendEndpoint}/oauth/login/google", active = false, disabled = false, reactLink = false) { +"Login" }
-                    menuItem(href = "${Api.backendEndpoint}/logout", active = false, disabled = false, reactLink = false) { +"Logout" }
+                    menuItem(
+                        href = "${Api.BACKEND_ENDPOINT}/oauth/login/google",
+                        active = false,
+                        disabled = false,
+                        reactLink = false,
+                    ) { +"Login" }
+                    menuItem(
+                        href = "${Api.BACKEND_ENDPOINT}/logout",
+                        active = false,
+                        disabled = false,
+                        reactLink = false,
+                    ) { +"Logout" }
                     menuItem(href = "#", active = false, disabled = true) { +"Disabled" }
                 }
                 form {
diff --git a/src/jsMain/kotlin/com.github.ikovalyov/Main.kt b/src/jsMain/kotlin/com.github.ikovalyov/Main.kt
index c9071652..0f40f548 100644
--- a/src/jsMain/kotlin/com.github.ikovalyov/Main.kt
+++ b/src/jsMain/kotlin/com.github.ikovalyov/Main.kt
@@ -4,15 +4,16 @@ import com.github.ikovalyov.model.security.service.SecurityService
 import com.github.ikovalyov.model.service.TemplateService
 import com.github.ikovalyov.model.service.UserService
 import com.github.ikovalyov.routes.Index
-import csstype.ClassName
 import kotlinx.serialization.ExperimentalSerializationApi
+import react.FC
 import react.Fragment
 import react.create
 import react.dom.client.createRoot
 import react.dom.html.ReactHTML
-import react.router.Route
-import react.router.Routes
-import react.router.dom.BrowserRouter
+import react.router.RouteObject
+import react.router.RouterProvider
+import react.router.dom.createBrowserRouter
+import web.cssom.ClassName
 import web.dom.document
 
 @OptIn(ExperimentalSerializationApi::class)
@@ -25,25 +26,32 @@ suspend fun main() {
     val allUsers = userService.getAllUsers()
     val templateService = TemplateService()
     val allTemplates = templateService.getAllTemplates()
-    root.render(
-        Fragment.create {
-            BrowserRouter {
-                App { }
-                ReactHTML.div {
-                    className = ClassName("container-fluid")
-                    Routes {
-                        Route {
-                            index = true
-                            element = Index.create {
-                                this.currentUser = currentUser
-                                this.userList = allUsers
-                                this.templateList = allTemplates
-                            }
-                            path = "/"
+
+    val appRouter = createBrowserRouter(
+        arrayOf(
+            RouteObject(
+                path = "/",
+                element = Fragment.create {
+                    +App.create()
+                    ReactHTML.div {
+                        className = ClassName("container-fluid")
+                        +Index.create {
+                            this.currentUser = currentUser
+                            this.userList = allUsers
+                            this.templateList = allTemplates
                         }
                     }
-                }
-            }
+                },
+            ),
+        ),
+    )
+
+    val reactRouterDomApp = FC {
+        RouterProvider {
+            router = appRouter
         }
+    }
+    root.render(
+        reactRouterDomApp.create(),
     )
 }
diff --git a/src/jsMain/kotlin/com.github.ikovalyov/extenstion/Dom.kt b/src/jsMain/kotlin/com.github.ikovalyov/extenstion/Dom.kt
deleted file mode 100644
index b8be5fb5..00000000
--- a/src/jsMain/kotlin/com.github.ikovalyov/extenstion/Dom.kt
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.github.ikovalyov.extenstion
-
-import js.core.Object
-import react.Props
-import react.dom.html.HTMLAttributes
-import web.dom.Element
-
-var <T : Element>HTMLAttributes<T>.extraAttrs: Props
-    @Deprecated(level = DeprecationLevel.HIDDEN, message = "write only")
-    get() = error("write only")
-    set(value) {
-        for (key in Object.keys(value)) {
-            asDynamic()[key] = value.asDynamic()[key]
-        }
-    }
diff --git a/src/jsMain/kotlin/com.github.ikovalyov/model/security/service/SecurityService.kt b/src/jsMain/kotlin/com.github.ikovalyov/model/security/service/SecurityService.kt
index 20330a7e..ade988b8 100644
--- a/src/jsMain/kotlin/com.github.ikovalyov/model/security/service/SecurityService.kt
+++ b/src/jsMain/kotlin/com.github.ikovalyov/model/security/service/SecurityService.kt
@@ -19,10 +19,10 @@ actual class SecurityService {
         val user = kotlin.runCatching {
             val result = window
                 .fetch(
-                    Api.backendEndpoint + Api.userUrl,
+                    Api.BACKEND_ENDPOINT + Api.USER_URL,
                     RequestInit(
-                        credentials = RequestCredentials.INCLUDE
-                    )
+                        credentials = RequestCredentials.INCLUDE,
+                    ),
                 )
                 .await()
                 .text()
diff --git a/src/jsMain/kotlin/com.github.ikovalyov/model/service/TemplateService.kt b/src/jsMain/kotlin/com.github.ikovalyov/model/service/TemplateService.kt
index 8ca7ce34..c6e51e75 100644
--- a/src/jsMain/kotlin/com.github.ikovalyov/model/service/TemplateService.kt
+++ b/src/jsMain/kotlin/com.github.ikovalyov/model/service/TemplateService.kt
@@ -16,10 +16,10 @@ class TemplateService {
     suspend fun getAllTemplates(): List<Template> {
         val result = kotlin.runCatching {
             val result = window.fetch(
-                Api.backendEndpoint + Api.templateApiUrl,
+                Api.BACKEND_ENDPOINT + Api.TEMPLATE_API_URL,
                 RequestInit(
-                    credentials = RequestCredentials.INCLUDE
-                )
+                    credentials = RequestCredentials.INCLUDE,
+                ),
             ).await().text().await()
             Json.decodeFromString(ListSerializer(Template.serializer()), result)
         }
diff --git a/src/jsMain/kotlin/com.github.ikovalyov/model/service/UserService.kt b/src/jsMain/kotlin/com.github.ikovalyov/model/service/UserService.kt
index 13b2f93b..509007d7 100644
--- a/src/jsMain/kotlin/com.github.ikovalyov/model/service/UserService.kt
+++ b/src/jsMain/kotlin/com.github.ikovalyov/model/service/UserService.kt
@@ -7,7 +7,6 @@ import kotlinx.browser.window
 import kotlinx.coroutines.await
 import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.builtins.ListSerializer
-import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.json.Json
 import mu.KotlinLogging
 import org.w3c.fetch.INCLUDE
@@ -21,10 +20,10 @@ class UserService {
     suspend fun getAllUsers(): List<User> {
         val result = kotlin.runCatching {
             val result = window.fetch(
-                Api.backendEndpoint + Api.userApiUrl,
+                Api.BACKEND_ENDPOINT + Api.USER_API_URL,
                 RequestInit(
-                    credentials = RequestCredentials.INCLUDE
-                )
+                    credentials = RequestCredentials.INCLUDE,
+                ),
             ).await().text().await()
             Json.decodeFromString(ListSerializer(User.serializer()), result)
         }
@@ -39,10 +38,10 @@ class UserService {
 
     suspend fun getUser(userId: Uuid): User {
         val result = window.fetch(
-            Api.backendEndpoint + Api.userApiUrl + "/$userId",
+            Api.BACKEND_ENDPOINT + Api.USER_API_URL + "/$userId",
             RequestInit(
-                credentials = RequestCredentials.INCLUDE
-            )
+                credentials = RequestCredentials.INCLUDE,
+            ),
         ).await().text().await()
         return Json.decodeFromString(User.serializer(), result)
     }
diff --git a/src/jsMain/kotlin/com.github.ikovalyov/react/components/bootstrap/Button.kt b/src/jsMain/kotlin/com.github.ikovalyov/react/components/bootstrap/Button.kt
index a70522f7..4cfe030f 100644
--- a/src/jsMain/kotlin/com.github.ikovalyov/react/components/bootstrap/Button.kt
+++ b/src/jsMain/kotlin/com.github.ikovalyov/react/components/bootstrap/Button.kt
@@ -1,12 +1,12 @@
 package com.github.ikovalyov.react.components.bootstrap
 
-import csstype.ClassName
 import react.ChildrenBuilder
-import react.dom.html.ButtonType
 import react.dom.html.ReactHTML
+import web.cssom.ClassName
+import web.html.ButtonType
 
 sealed class Button {
-    abstract operator fun invoke(builder: ChildrenBuilder, block: ChildrenBuilder.() -> Unit): Unit
+    abstract operator fun invoke(builder: ChildrenBuilder, block: ChildrenBuilder.() -> Unit)
 
     object ButtonOutlineSuccess : Button() {
         override operator fun invoke(builder: ChildrenBuilder, block: ChildrenBuilder.() -> Unit) {
diff --git a/src/jsMain/kotlin/com.github.ikovalyov/react/components/bootstrap/Div.kt b/src/jsMain/kotlin/com.github.ikovalyov/react/components/bootstrap/Div.kt
index c0447800..f5493926 100644
--- a/src/jsMain/kotlin/com.github.ikovalyov/react/components/bootstrap/Div.kt
+++ b/src/jsMain/kotlin/com.github.ikovalyov/react/components/bootstrap/Div.kt
@@ -1,11 +1,11 @@
 package com.github.ikovalyov.react.components.bootstrap
 
-import csstype.ClassName
 import react.ChildrenBuilder
 import react.dom.html.ReactHTML
+import web.cssom.ClassName
 
 sealed class Div {
-    abstract operator fun invoke(builder: ChildrenBuilder, block: ChildrenBuilder.() -> Unit): Unit
+    abstract operator fun invoke(builder: ChildrenBuilder, block: ChildrenBuilder.() -> Unit)
 
     object ContainerFluidDiv : Div() {
         override operator fun invoke(builder: ChildrenBuilder, block: ChildrenBuilder.() -> Unit) {
diff --git a/src/jsMain/kotlin/com.github.ikovalyov/react/components/bootstrap/Input.kt b/src/jsMain/kotlin/com.github.ikovalyov/react/components/bootstrap/Input.kt
index 1344dfd3..3f3d3fec 100644
--- a/src/jsMain/kotlin/com.github.ikovalyov/react/components/bootstrap/Input.kt
+++ b/src/jsMain/kotlin/com.github.ikovalyov/react/components/bootstrap/Input.kt
@@ -1,13 +1,13 @@
 package com.github.ikovalyov.react.components.bootstrap
 
 import com.github.ikovalyov.react.components.bootstrap.nav.ariaLabel
-import csstype.ClassName
 import react.ChildrenBuilder
-import react.dom.html.InputType
 import react.dom.html.ReactHTML
+import web.cssom.ClassName
+import web.html.InputType
 
 sealed class Input {
-    abstract operator fun invoke(name: String, builder: ChildrenBuilder): Unit
+    abstract operator fun invoke(name: String, builder: ChildrenBuilder)
 
     object SearchInput : Input() {
         override operator fun invoke(name: String, builder: ChildrenBuilder) {
diff --git a/src/jsMain/kotlin/com.github.ikovalyov/react/components/bootstrap/ScreenReaderSpan.kt b/src/jsMain/kotlin/com.github.ikovalyov/react/components/bootstrap/ScreenReaderSpan.kt
index adafda47..a8089571 100644
--- a/src/jsMain/kotlin/com.github.ikovalyov/react/components/bootstrap/ScreenReaderSpan.kt
+++ b/src/jsMain/kotlin/com.github.ikovalyov/react/components/bootstrap/ScreenReaderSpan.kt
@@ -1,10 +1,10 @@
 package com.github.ikovalyov.react.components.bootstrap
 
-import csstype.ClassName
 import react.ChildrenBuilder
 import react.dom.html.ReactHTML
+import web.cssom.ClassName
 
-fun ChildrenBuilder.ScreenReaderSpan(text: String) {
+fun ChildrenBuilder.screenReaderSpan(text: String) {
     ReactHTML.span {
         className = ClassName("sr-only")
         +text
diff --git a/src/jsMain/kotlin/com.github.ikovalyov/react/components/bootstrap/nav/Anchor.kt b/src/jsMain/kotlin/com.github.ikovalyov/react/components/bootstrap/nav/Anchor.kt
index c9a612d1..b7161726 100644
--- a/src/jsMain/kotlin/com.github.ikovalyov/react/components/bootstrap/nav/Anchor.kt
+++ b/src/jsMain/kotlin/com.github.ikovalyov/react/components/bootstrap/nav/Anchor.kt
@@ -1,11 +1,11 @@
 package com.github.ikovalyov.react.components.bootstrap.nav
 
-import csstype.ClassName
 import kotlinx.browser.window
 import react.ChildrenBuilder
 import react.router.dom.Link
+import web.cssom.ClassName
 
-fun ChildrenBuilder.ReactAnchor(hrefString: String, active: Boolean, disabled: Boolean, block: ChildrenBuilder.() -> Unit) {
+fun ChildrenBuilder.reactAnchor(hrefString: String, active: Boolean, disabled: Boolean, block: ChildrenBuilder.() -> Unit) {
     Link {
         to = hrefString
         val classes = buildList {
@@ -23,7 +23,7 @@ fun ChildrenBuilder.ReactAnchor(hrefString: String, active: Boolean, disabled: B
         this.apply(block)
     }
 }
-fun ChildrenBuilder.Anchor(hrefString: String, active: Boolean, disabled: Boolean, block: ChildrenBuilder.() -> Unit) {
+fun ChildrenBuilder.htmlAnchor(hrefString: String, active: Boolean, disabled: Boolean, block: ChildrenBuilder.() -> Unit) {
     Link {
         to = "#"
         val classes = buildList {
diff --git a/src/jsMain/kotlin/com.github.ikovalyov/react/components/bootstrap/nav/CollapseButton.kt b/src/jsMain/kotlin/com.github.ikovalyov/react/components/bootstrap/nav/CollapseButton.kt
index e66a4267..f467d3cf 100644
--- a/src/jsMain/kotlin/com.github.ikovalyov/react/components/bootstrap/nav/CollapseButton.kt
+++ b/src/jsMain/kotlin/com.github.ikovalyov/react/components/bootstrap/nav/CollapseButton.kt
@@ -1,11 +1,11 @@
 package com.github.ikovalyov.react.components.bootstrap.nav
 
-import csstype.ClassName
 import react.ChildrenBuilder
-import react.dom.html.ButtonType
 import react.dom.html.HTMLAttributes
 import react.dom.html.ReactHTML
 import react.dom.html.ReactHTML.span
+import web.cssom.ClassName
+import web.html.ButtonType
 
 var HTMLAttributes<*>.dataBsToggle: String?
     get() = asDynamic()["data-bs-toggle"]
@@ -34,7 +34,7 @@ var HTMLAttributes<*>.ariaLabel: String?
         asDynamic()["aria-label"] = value
     }
 
-fun ChildrenBuilder.CollapseButton(target: String) = ReactHTML.button {
+fun ChildrenBuilder.collapseButton(target: String) = ReactHTML.button {
     type = ButtonType.button
     className = ClassName("navbar-toggler")
     dataBsToggle = "collapse"
diff --git a/src/jsMain/kotlin/com.github.ikovalyov/react/components/bootstrap/nav/MenuItem.kt b/src/jsMain/kotlin/com.github.ikovalyov/react/components/bootstrap/nav/MenuItem.kt
index 4684254f..dc371739 100644
--- a/src/jsMain/kotlin/com.github.ikovalyov/react/components/bootstrap/nav/MenuItem.kt
+++ b/src/jsMain/kotlin/com.github.ikovalyov/react/components/bootstrap/nav/MenuItem.kt
@@ -1,16 +1,16 @@
 package com.github.ikovalyov.react.components.bootstrap.nav
 
-import csstype.ClassName
 import react.ChildrenBuilder
 import react.dom.html.ReactHTML.div
+import web.cssom.ClassName
 
 fun ChildrenBuilder.menuItem(href: String, active: Boolean, disabled: Boolean, reactLink: Boolean = true, block: ChildrenBuilder.() -> Unit) {
     div {
         className = ClassName("nav-item")
         if (reactLink) {
-            ReactAnchor(href, active, disabled, block)
+            reactAnchor(href, active, disabled, block)
         } else {
-            Anchor(href, active, disabled, block)
+            htmlAnchor(href, active, disabled, block)
         }
     }
 }
diff --git a/src/jsMain/kotlin/com.github.ikovalyov/react/components/template/Crud.kt b/src/jsMain/kotlin/com.github.ikovalyov/react/components/template/Crud.kt
index f6069d06..2402d0ba 100644
--- a/src/jsMain/kotlin/com.github.ikovalyov/react/components/template/Crud.kt
+++ b/src/jsMain/kotlin/com.github.ikovalyov/react/components/template/Crud.kt
@@ -1,10 +1,10 @@
 package com.github.ikovalyov.react.components.template
 
 import com.benasher44.uuid.Uuid
-import com.github.ikovalyov.Api.backendEndpoint
+import com.github.ikovalyov.Api.BACKEND_ENDPOINT
 import com.github.ikovalyov.coroutines.SimpleCoroutineScope
 import com.github.ikovalyov.model.markers.IEditable
-import js.core.jso
+import js.objects.jso
 import kotlinx.browser.window
 import kotlinx.coroutines.await
 import kotlinx.coroutines.launch
@@ -38,12 +38,12 @@ enum class CrudState {
     VIEW,
     EDIT,
     ADD,
-    INIT
+    INIT,
 }
 
 private val coroutineScope = SimpleCoroutineScope()
 
-private fun <I : IEditable> ChildrenBuilder.CrudComponent(props: CrudComponentProps<I>) {
+private fun <I : IEditable> ChildrenBuilder.crudComponent(props: CrudComponentProps<I>) {
     val stateInstance = useState<CrudComponentState<I>> {
         jso {
             currentState = CrudState.INIT
@@ -55,10 +55,10 @@ private fun <I : IEditable> ChildrenBuilder.CrudComponent(props: CrudComponentPr
     suspend fun loadItem(itemId: Uuid): I {
         val result = window
             .fetch(
-                backendEndpoint + props.apiUri + "/$itemId",
+                BACKEND_ENDPOINT + props.apiUri + "/$itemId",
                 RequestInit(
-                    credentials = RequestCredentials.INCLUDE
-                )
+                    credentials = RequestCredentials.INCLUDE,
+                ),
             )
             .await()
             .text()
@@ -72,13 +72,13 @@ private fun <I : IEditable> ChildrenBuilder.CrudComponent(props: CrudComponentPr
         headers.append("Content-Type", "application/json")
         val fetchResult =
             window.fetch(
-                backendEndpoint + props.apiUri,
+                BACKEND_ENDPOINT + props.apiUri,
                 RequestInit(
                     method = "PATCH",
                     headers = headers,
                     body = body,
-                    credentials = RequestCredentials.INCLUDE
-                )
+                    credentials = RequestCredentials.INCLUDE,
+                ),
             )
         val response = fetchResult.await()
         response.text().await()
@@ -90,13 +90,13 @@ private fun <I : IEditable> ChildrenBuilder.CrudComponent(props: CrudComponentPr
         headers.append("Content-Type", "application/json")
         val fetchResult =
             window.fetch(
-                backendEndpoint + props.apiUri,
+                BACKEND_ENDPOINT + props.apiUri,
                 RequestInit(
                     method = "POST",
                     headers = headers,
                     body = body,
-                    credentials = RequestCredentials.INCLUDE
-                )
+                    credentials = RequestCredentials.INCLUDE,
+                ),
             )
         val response = fetchResult.await()
         response.text().await()
@@ -118,10 +118,10 @@ private fun <I : IEditable> ChildrenBuilder.CrudComponent(props: CrudComponentPr
     suspend fun switchToListViewStateFunc() {
         coroutineScope.launch {
             val result = window.fetch(
-                backendEndpoint + props.apiUri,
+                BACKEND_ENDPOINT + props.apiUri,
                 RequestInit(
-                    credentials = RequestCredentials.INCLUDE
-                )
+                    credentials = RequestCredentials.INCLUDE,
+                ),
             ).await().text().await()
             val templatesList = props.decodeItems(result)
             updateState {
@@ -149,11 +149,11 @@ private fun <I : IEditable> ChildrenBuilder.CrudComponent(props: CrudComponentPr
             val headers = Headers()
             headers.append("Content-Type", "application/json")
             window.fetch(
-                backendEndpoint + props.apiUri + "/${t.id}",
+                BACKEND_ENDPOINT + props.apiUri + "/${t.id}",
                 RequestInit(
                     method = "DELETE",
-                    credentials = RequestCredentials.INCLUDE
-                )
+                    credentials = RequestCredentials.INCLUDE,
+                ),
             ).await()
             switchToListViewStateFunc()
         }
@@ -197,70 +197,62 @@ private fun <I : IEditable> ChildrenBuilder.CrudComponent(props: CrudComponentPr
 
         CrudState.LIST -> {
             console.log("Loading ItemList")
-            child(
-                ItemList(
-                    jso<ItemListProps<I>> {
-                        switchToEditState = ::switchToEditStateFuncVar
-                        switchToViewState = ::switchToViewStateFunc
-                        switchToInsertState = ::switchToInsertStateFunc
-                        deleteItem = ::deleteItem
-                        items = componentState.itemsList
-                    }
-                ).render()
-            )
+            +ItemList(
+                jso<ItemListProps<I>> {
+                    switchToEditState = ::switchToEditStateFuncVar
+                    switchToViewState = ::switchToViewStateFunc
+                    switchToInsertState = ::switchToInsertStateFunc
+                    deleteItem = ::deleteItem
+                    items = componentState.itemsList
+                },
+            ).render()
         }
 
         CrudState.EDIT -> {
             console.log("Loading TemplateEdit")
-            child(
-                TemplateEdit(
-                    jso {
-                        switchToListState = ::switchToListViewStateFunc
-                        submitForm = ::submitEditItemForm
-                    },
-                    jso<TemplateEditState<I>> {
-                        item = componentState.currentItem!!
-                    }
-                ).render()
-            )
+            +TemplateEdit(
+                jso {
+                    switchToListState = ::switchToListViewStateFunc
+                    submitForm = ::submitEditItemForm
+                },
+                jso<TemplateEditState<I>> {
+                    item = componentState.currentItem!!
+                },
+            ).render()
         }
 
         CrudState.VIEW -> {
             console.log("Loading TemplateView")
-            child(
-                TemplateView(
-                    jso<TemplateViewProps<I>> {
-                        switchToListState = ::switchToListViewStateFunc
-                    },
-                    jso {
-                        item = componentState.currentItem!!
-                    }
-                ).render()
-            )
+            +TemplateView(
+                jso<TemplateViewProps<I>> {
+                    switchToListState = ::switchToListViewStateFunc
+                },
+                jso {
+                    item = componentState.currentItem!!
+                },
+            ).render()
         }
 
         CrudState.ADD -> {
             console.log("Loading TemplateInsert")
-            child(
-                TemplateInsert(
-                    jso<TemplateInsertProps<I>> {
-                        this.item = props.factory()
-                        this.submitForm = ::submitInsertItemForm
-                        this.switchToListState = ::switchToListViewStateFunc
-                    },
-                    jso {
-                        this.currentItem = props.factory()
-                    }
-                ).render()
-            )
+            +TemplateInsert(
+                jso<TemplateInsertProps<I>> {
+                    this.item = props.factory()
+                    this.submitForm = ::submitInsertItemForm
+                    this.switchToListState = ::switchToListViewStateFunc
+                },
+                jso {
+                    this.currentItem = props.factory()
+                },
+            ).render()
         }
     }
 }
 
 private val CrudComponent = FC<CrudComponentProps<IEditable>> {
-    CrudComponent(it)
+    crudComponent(it)
 }
 
-fun <T : IEditable> ChildrenBuilder.CrudComponent(block: CrudComponentProps<T>.() -> Unit) {
+fun <T : IEditable> ChildrenBuilder.crudComponent(block: CrudComponentProps<T>.() -> Unit) {
     child(type = CrudComponent, props = jso(block))
 }
diff --git a/src/jsMain/kotlin/com.github.ikovalyov/react/components/template/ItemList.kt b/src/jsMain/kotlin/com.github.ikovalyov/react/components/template/ItemList.kt
index 6e1f7882..1b8a0d9d 100644
--- a/src/jsMain/kotlin/com.github.ikovalyov/react/components/template/ItemList.kt
+++ b/src/jsMain/kotlin/com.github.ikovalyov/react/components/template/ItemList.kt
@@ -1,7 +1,7 @@
 package com.github.ikovalyov.react.components.template
 
 import com.github.ikovalyov.model.markers.IEditable
-import com.github.ikovalyov.react.components.template.table.Table
+import com.github.ikovalyov.react.components.template.table.tableChild
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
@@ -10,8 +10,8 @@ import react.Fragment
 import react.PropsWithChildren
 import react.ReactNode
 import react.create
-import react.dom.html.ButtonType
 import react.dom.html.ReactHTML
+import web.html.ButtonType
 import kotlin.coroutines.CoroutineContext
 
 external interface ItemListProps<T : Any> : PropsWithChildren {
@@ -30,30 +30,28 @@ class ItemList<I : IEditable>(props: ItemListProps<I>) :
     override val coroutineContext: CoroutineContext
         get() = job
 
-    override fun render(): ReactNode? {
-        return Fragment.create {
-            Table<I> {
-                items = props.items?.toTypedArray()
-                onViewClick = {
-                    console.log("switch to view state")
-                    props.switchToViewState(it)
-                }
-                onEditClick = {
-                    console.log("switch to edit state")
-                    props.switchToEditState(it)
-                }
-                onDeleteClick = {
-                    console.log("delete")
-                    launch { props.deleteItem(it) }
-                }
+    override fun render(): ReactNode = Fragment.create {
+        tableChild<I> {
+            items = props.items?.toTypedArray()
+            onViewClick = {
+                console.log("switch to view state")
+                props.switchToViewState(it)
             }
-
-            ReactHTML.button {
-                +"Add new"
-                name = "new"
-                type = ButtonType.button
-                onClick = { props.switchToInsertState() }
+            onEditClick = {
+                console.log("switch to edit state")
+                props.switchToEditState(it)
+            }
+            onDeleteClick = {
+                console.log("delete")
+                launch { props.deleteItem(it) }
             }
         }
+
+        ReactHTML.button {
+            +"Add new"
+            name = "new"
+            type = ButtonType.button
+            onClick = { props.switchToInsertState() }
+        }
     }
 }
diff --git a/src/jsMain/kotlin/com.github.ikovalyov/react/components/template/TemplateEdit.kt b/src/jsMain/kotlin/com.github.ikovalyov/react/components/template/TemplateEdit.kt
index 6b55af6b..3c0b0658 100644
--- a/src/jsMain/kotlin/com.github.ikovalyov/react/components/template/TemplateEdit.kt
+++ b/src/jsMain/kotlin/com.github.ikovalyov/react/components/template/TemplateEdit.kt
@@ -4,12 +4,7 @@ import com.github.ikovalyov.model.markers.IEditable
 import com.github.ikovalyov.model.markers.getFieldValueAsString
 import com.github.ikovalyov.model.markers.getPredefinedValuesAsStrings
 import com.github.ikovalyov.model.markers.updateField
-import com.github.ikovalyov.react.components.template.table.Button
-import csstype.Color
-import csstype.Display
-import csstype.Float
-import csstype.FontWeight
-import csstype.px
+import com.github.ikovalyov.react.components.template.table.buttonChild
 import emotion.react.css
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Job
@@ -20,7 +15,6 @@ import react.PropsWithChildren
 import react.ReactNode
 import react.State
 import react.create
-import react.dom.html.ButtonType
 import react.dom.html.ReactHTML.fieldset
 import react.dom.html.ReactHTML.form
 import react.dom.html.ReactHTML.input
@@ -28,6 +22,13 @@ import react.dom.html.ReactHTML.label
 import react.dom.html.ReactHTML.option
 import react.dom.html.ReactHTML.p
 import react.dom.html.ReactHTML.select
+import web.cssom.Color
+import web.cssom.Content
+import web.cssom.Display
+import web.cssom.Float
+import web.cssom.FontWeight
+import web.cssom.px
+import web.html.ButtonType
 import kotlin.coroutines.CoroutineContext
 
 external interface ItemEditProps<T> : PropsWithChildren {
@@ -39,10 +40,8 @@ external interface TemplateEditState<T> : State {
     var item: T
 }
 
-class TemplateEdit<I : IEditable>(
-    props: ItemEditProps<I>,
-    private val initialState: TemplateEditState<I>
-) : Component<ItemEditProps<I>, TemplateEditState<I>>(props),
+class TemplateEdit<I : IEditable>(props: ItemEditProps<I>, private val initialState: TemplateEditState<I>) :
+    Component<ItemEditProps<I>, TemplateEditState<I>>(props),
     CoroutineScope {
 
     init {
@@ -58,98 +57,96 @@ class TemplateEdit<I : IEditable>(
         setState(initialState)
     }
 
-    override fun render(): ReactNode {
-        return Fragment.create {
-            form {
-                onSubmit =
-                    {
-                        it.preventDefault()
-                        launch {
-                            props.submitForm(state.item)
-                        }
+    override fun render(): ReactNode = Fragment.create {
+        form {
+            onSubmit =
+                {
+                    it.preventDefault()
+                    launch {
+                        props.submitForm(state.item)
                     }
-                fieldset {
-                    val fields = state.item.getMetadata().filterIsInstance<IEditable.EditableMetadata<*, I>>()
-                    fields.let {
-                        it.forEach {
-                            p {
-                                label {
-                                    +it.fieldName
-                                    css {
-                                        color = Color("B4886B")
-                                        fontWeight = FontWeight.bold
-                                        display = Display.block
-                                        width = 150.px
-                                        float = Float.left
-                                        after { content = "\":\"".asDynamic() }
-                                    }
-                                    htmlFor = it.hashCode().toString()
+                }
+            fieldset {
+                val fields = state.item.getMetadata().filterIsInstance<IEditable.EditableMetadata<*, I>>()
+                fields.let {
+                    it.forEach {
+                        p {
+                            label {
+                                +it.fieldName
+                                css {
+                                    color = Color("B4886B")
+                                    fontWeight = FontWeight.bold
+                                    display = Display.block
+                                    width = 150.px
+                                    float = Float.left
+                                    after { content = Content(":") }
                                 }
-                                if (it.predefinedList.isNullOrEmpty()) {
-                                    input {
-                                        name = it.hashCode().toString()
-                                        readOnly = it.readOnly
-                                        if (!it.readOnly) {
-                                            defaultValue = state.item.getFieldValueAsString(it)
-                                            onChange =
-                                                { event ->
-                                                    launch {
-                                                        val stringValue = event.target.asDynamic().value.toString()
-                                                        state.item =
-                                                            state.item.updateField(
-                                                                field = it,
-                                                                serializedData = stringValue
-                                                            )
-                                                    }
-                                                }
-                                        } else {
-                                            value = state.item.getFieldValueAsString(it)
-                                        }
-                                    }
-                                } else {
-                                    select {
-                                        name = it.hashCode().toString()
-                                        disabled = it.readOnly
-                                        if (!it.readOnly) {
-                                            val storedObject = it.get()
-                                            if (storedObject != null) {
-                                                defaultValue = state.item.getFieldValueAsString(it)
-                                            }
-                                            onChange =
-                                                { event ->
+                                htmlFor = it.hashCode().toString()
+                            }
+                            if (it.predefinedList.isNullOrEmpty()) {
+                                input {
+                                    name = it.hashCode().toString()
+                                    readOnly = it.readOnly
+                                    if (!it.readOnly) {
+                                        defaultValue = state.item.getFieldValueAsString(it)
+                                        onChange =
+                                            { event ->
+                                                launch {
                                                     val stringValue = event.target.asDynamic().value.toString()
                                                     state.item =
-                                                        state.item.updateField(field = it, serializedData = stringValue)
-                                                }
-                                            val optionsList = state.item.getPredefinedValuesAsStrings(it)
-                                            optionsList.forEach {
-                                                option {
-                                                    value = it.key
-                                                    +it.value
+                                                        state.item.updateField(
+                                                            field = it,
+                                                            serializedData = stringValue,
+                                                        )
                                                 }
                                             }
-                                            if (optionsList.isNotEmpty() && storedObject == null) {
-                                                state.item = state.item.updateField(field = it, serializedData = optionsList.entries.first().value)
+                                    } else {
+                                        value = state.item.getFieldValueAsString(it)
+                                    }
+                                }
+                            } else {
+                                select {
+                                    name = it.hashCode().toString()
+                                    disabled = it.readOnly
+                                    if (!it.readOnly) {
+                                        val storedObject = it.get()
+                                        if (storedObject != null) {
+                                            defaultValue = state.item.getFieldValueAsString(it)
+                                        }
+                                        onChange =
+                                            { event ->
+                                                val stringValue = event.target.asDynamic().value.toString()
+                                                state.item =
+                                                    state.item.updateField(field = it, serializedData = stringValue)
+                                            }
+                                        val optionsList = state.item.getPredefinedValuesAsStrings(it)
+                                        optionsList.forEach {
+                                            option {
+                                                value = it.key
+                                                +it.value
                                             }
                                         }
+                                        if (optionsList.isNotEmpty() && storedObject == null) {
+                                            state.item = state.item.updateField(field = it, serializedData = optionsList.entries.first().value)
+                                        }
                                     }
                                 }
                             }
                         }
                     }
                 }
-                Button<I> {
-                    body = state.item
-                    text = "Update"
-                    type = ButtonType.submit
-                }
-                Button<I> {
-                    onClick = {
-                        launch { props.switchToListState() }
-                    }
-                    body = state.item
-                    text = "Cancel"
+            }
+            buttonChild<I> {
+                body = state.item
+                text = "Update"
+                type = ButtonType.submit
+            }
+            buttonChild<I> {
+                onClick = {
+                    launch { props.switchToListState() }
                 }
+                body = state.item
+                text = "Cancel"
             }
         }
     }
diff --git a/src/jsMain/kotlin/com.github.ikovalyov/react/components/template/TemplateInsert.kt b/src/jsMain/kotlin/com.github.ikovalyov/react/components/template/TemplateInsert.kt
index 89ef4294..62aa0a3c 100644
--- a/src/jsMain/kotlin/com.github.ikovalyov/react/components/template/TemplateInsert.kt
+++ b/src/jsMain/kotlin/com.github.ikovalyov/react/components/template/TemplateInsert.kt
@@ -4,11 +4,6 @@ import com.github.ikovalyov.model.markers.IEditable
 import com.github.ikovalyov.model.markers.getFieldValueAsString
 import com.github.ikovalyov.model.markers.getPredefinedValuesAsStrings
 import com.github.ikovalyov.model.markers.updateField
-import csstype.Color
-import csstype.Display
-import csstype.Float
-import csstype.FontWeight
-import csstype.px
 import emotion.react.css
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Job
@@ -19,7 +14,6 @@ import react.PropsWithChildren
 import react.ReactNode
 import react.State
 import react.create
-import react.dom.html.ButtonType
 import react.dom.html.ReactHTML
 import react.dom.html.ReactHTML.button
 import react.dom.html.ReactHTML.fieldset
@@ -28,6 +22,13 @@ import react.dom.html.ReactHTML.input
 import react.dom.html.ReactHTML.label
 import react.dom.html.ReactHTML.p
 import react.dom.html.ReactHTML.select
+import web.cssom.Color
+import web.cssom.Content
+import web.cssom.Display
+import web.cssom.Float
+import web.cssom.FontWeight
+import web.cssom.px
+import web.html.ButtonType
 import kotlin.coroutines.CoroutineContext
 
 external interface TemplateInsertProps<I : IEditable> : PropsWithChildren {
@@ -40,10 +41,9 @@ external interface TemplateInsertState<I : IEditable> : State {
     var currentItem: I
 }
 
-class TemplateInsert<I : IEditable>(
-    props: TemplateInsertProps<I>,
-    private val initialState: TemplateInsertState<I>
-) : Component<TemplateInsertProps<I>, TemplateInsertState<I>>(props), CoroutineScope {
+class TemplateInsert<I : IEditable>(props: TemplateInsertProps<I>, initialState: TemplateInsertState<I>) :
+    Component<TemplateInsertProps<I>, TemplateInsertState<I>>(props),
+    CoroutineScope {
 
     init {
         state = initialState
@@ -53,107 +53,105 @@ class TemplateInsert<I : IEditable>(
     override val coroutineContext: CoroutineContext
         get() = job
 
-    override fun render(): ReactNode {
-        return Fragment.create {
-            form {
-                onSubmit = {
-                    it.preventDefault()
-                    launch {
-                        props.submitForm(state.currentItem)
-                    }
+    override fun render(): ReactNode = Fragment.create {
+        form {
+            onSubmit = {
+                it.preventDefault()
+                launch {
+                    props.submitForm(state.currentItem)
                 }
-                fieldset {
-                    val metadata = state.currentItem.getMetadata().filterIsInstance<IEditable.EditableMetadata<*, I>>()
+            }
+            fieldset {
+                val metadata = state.currentItem.getMetadata().filterIsInstance<IEditable.EditableMetadata<*, I>>()
 
-                    metadata.forEach {
-                        p {
-                            label {
-                                +it.fieldName
-                                css {
-                                    color = csstype.Color("B4886B")
-                                    fontWeight = csstype.FontWeight.bold
-                                    display = csstype.Display.block
-                                    width = 150.px
-                                    float = csstype.Float.left
-                                    after {
-                                        content = "\":\"".asDynamic()
-                                    }
+                metadata.forEach {
+                    p {
+                        label {
+                            +it.fieldName
+                            css {
+                                color = Color("B4886B")
+                                fontWeight = FontWeight.bold
+                                display = Display.block
+                                width = 150.px
+                                float = Float.left
+                                after {
+                                    content = Content(":")
                                 }
-                                htmlFor = it.hashCode().toString()
                             }
-                            if (it.predefinedList.isNullOrEmpty()) {
-                                input {
-                                    name = it.hashCode().toString()
-                                    readOnly = it.readOnly
-                                    if (!it.readOnly) {
-                                        defaultValue = ""
-                                        onChange = { event ->
-                                            launch {
-                                                val value = event.target.value
-                                                state.currentItem = state.currentItem.updateField(
-                                                    field = it,
-                                                    serializedData = value
-                                                )
-                                            }
+                            htmlFor = it.hashCode().toString()
+                        }
+                        if (it.predefinedList.isNullOrEmpty()) {
+                            input {
+                                name = it.hashCode().toString()
+                                readOnly = it.readOnly
+                                if (!it.readOnly) {
+                                    defaultValue = ""
+                                    onChange = { event ->
+                                        launch {
+                                            val value = event.target.value
+                                            state.currentItem = state.currentItem.updateField(
+                                                field = it,
+                                                serializedData = value,
+                                            )
                                         }
-                                    } else {
-                                        value = state.currentItem.getFieldValueAsString(it)
                                     }
+                                } else {
+                                    value = state.currentItem.getFieldValueAsString(it)
                                 }
-                            } else {
-                                select {
-                                    name = it.hashCode().toString()
-                                    disabled = it.readOnly
-                                    if (!it.readOnly) {
-                                        val storedObject = it.get()
-                                        if (storedObject != null) {
-                                            defaultValue = state.currentItem.getFieldValueAsString(it)
-                                        }
-                                        onChange =
-                                            { event ->
-                                                launch {
-                                                    val stringValue = event.target.options.item(event.target.selectedIndex)!!.text
-                                                    state.currentItem =
-                                                        state.currentItem.updateField(
-                                                            field = it,
-                                                            serializedData = stringValue
-                                                        )
-                                                }
-                                            }
-                                        val optionsList = state.currentItem.getPredefinedValuesAsStrings(it)
-                                        optionsList.forEach {
-                                            ReactHTML.option {
-                                                value = it.key
-                                                +it.value
+                            }
+                        } else {
+                            select {
+                                name = it.hashCode().toString()
+                                disabled = it.readOnly
+                                if (!it.readOnly) {
+                                    val storedObject = it.get()
+                                    if (storedObject != null) {
+                                        defaultValue = state.currentItem.getFieldValueAsString(it)
+                                    }
+                                    onChange =
+                                        { event ->
+                                            launch {
+                                                val stringValue = event.target.options.item(event.target.selectedIndex)!!.text
+                                                state.currentItem =
+                                                    state.currentItem.updateField(
+                                                        field = it,
+                                                        serializedData = stringValue,
+                                                    )
                                             }
                                         }
-                                        if (optionsList.isNotEmpty() && storedObject == null) {
-                                            val stringValue = optionsList.values.first()
-                                            state.currentItem =
-                                                state.currentItem.updateField(
-                                                    field = it,
-                                                    serializedData = stringValue
-                                                )
+                                    val optionsList = state.currentItem.getPredefinedValuesAsStrings(it)
+                                    optionsList.forEach {
+                                        ReactHTML.option {
+                                            value = it.key
+                                            +it.value
                                         }
                                     }
+                                    if (optionsList.isNotEmpty() && storedObject == null) {
+                                        val stringValue = optionsList.values.first()
+                                        state.currentItem =
+                                            state.currentItem.updateField(
+                                                field = it,
+                                                serializedData = stringValue,
+                                            )
+                                    }
                                 }
                             }
                         }
                     }
+                }
 
-                    button {
-                        name = "insert"
-                        type = ButtonType.submit
-                        +"Insert"
-                    }
+                button {
+                    name = "insert"
+                    type = ButtonType.submit
+                    +"Insert"
+                }
 
-                    button {
-                        name = "Cancel"
-                        type = ButtonType.button
-                        +"Cancel"
-                        onClick = {
-                            launch { props.switchToListState() }
-                        }
+                button {
+                    name = "Cancel"
+                    type = ButtonType.button
+                    +"Cancel"
+                    onClick = {
+                        launch { props.switchToListState() }
                     }
                 }
             }
diff --git a/src/jsMain/kotlin/com.github.ikovalyov/react/components/template/TemplateView.kt b/src/jsMain/kotlin/com.github.ikovalyov/react/components/template/TemplateView.kt
index d6b4dcbc..7a65725c 100644
--- a/src/jsMain/kotlin/com.github.ikovalyov/react/components/template/TemplateView.kt
+++ b/src/jsMain/kotlin/com.github.ikovalyov/react/components/template/TemplateView.kt
@@ -2,7 +2,7 @@ package com.github.ikovalyov.react.components.template
 
 import com.github.ikovalyov.model.markers.IEditable
 import com.github.ikovalyov.model.markers.getFieldValueAsString
-import com.github.ikovalyov.react.components.template.table.Button
+import com.github.ikovalyov.react.components.template.table.buttonChild
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
@@ -26,10 +26,9 @@ external interface TemplateViewState<I> : State {
     var item: I
 }
 
-class TemplateView<I : IEditable>(
-    props: TemplateViewProps<I>,
-    state: TemplateViewState<I>
-) : Component<TemplateViewProps<I>, TemplateViewState<I>>(props), CoroutineScope {
+class TemplateView<I : IEditable>(props: TemplateViewProps<I>, state: TemplateViewState<I>) :
+    Component<TemplateViewProps<I>, TemplateViewState<I>>(props),
+    CoroutineScope {
 
     init {
         this.state = state
@@ -39,23 +38,21 @@ class TemplateView<I : IEditable>(
     override val coroutineContext: CoroutineContext
         get() = job
 
-    override fun render(): ReactNode {
-        return Fragment.create {
-            div {
-                val fields = state.item.getMetadata().filterIsInstance<IEditable.EditableMetadata<*, I>>()
-                fields.forEach {
-                    section {
-                        h1 { +it.fieldType::class.simpleName!! }
-                        p { +(state.item.getFieldValueAsString(it) ?: "") }
-                    }
+    override fun render(): ReactNode = Fragment.create {
+        div {
+            val fields = state.item.getMetadata().filterIsInstance<IEditable.EditableMetadata<*, I>>()
+            fields.forEach {
+                section {
+                    h1 { +it.fieldType::class.simpleName!! }
+                    p { +(state.item.getFieldValueAsString(it) ?: "") }
                 }
-                Button<I> {
-                    onClick = {
-                        launch { props.switchToListState() }
-                    }
-                    body = state.item
-                    text = "Back to list"
+            }
+            buttonChild<I> {
+                onClick = {
+                    launch { props.switchToListState() }
                 }
+                body = state.item
+                text = "Back to list"
             }
         }
     }
diff --git a/src/jsMain/kotlin/com.github.ikovalyov/react/components/template/table/Button.kt b/src/jsMain/kotlin/com.github.ikovalyov/react/components/template/table/Button.kt
index ee27e322..639e7391 100644
--- a/src/jsMain/kotlin/com.github.ikovalyov/react/components/template/table/Button.kt
+++ b/src/jsMain/kotlin/com.github.ikovalyov/react/components/template/table/Button.kt
@@ -1,12 +1,12 @@
 package com.github.ikovalyov.react.components.template.table
 
 import com.github.ikovalyov.model.markers.IEditable
-import js.core.jso
+import js.objects.jso
 import react.ChildrenBuilder
 import react.FC
 import react.PropsWithChildren
-import react.dom.html.ButtonType
 import react.dom.html.ReactHTML.button
+import web.html.ButtonType
 
 external interface ButtonProps<T : IEditable> : PropsWithChildren {
     var body: T
@@ -15,7 +15,7 @@ external interface ButtonProps<T : IEditable> : PropsWithChildren {
     var type: ButtonType?
 }
 
-private fun <T : IEditable> ChildrenBuilder.Button(props: ButtonProps<T>) {
+private fun <T : IEditable> ChildrenBuilder.button(props: ButtonProps<T>) {
     button {
         +props.text
         value = props.body.id.toString()
@@ -25,10 +25,10 @@ private fun <T : IEditable> ChildrenBuilder.Button(props: ButtonProps<T>) {
     }
 }
 
-private val Button: FC<ButtonProps<*>> = FC {
-    this.Button(it)
+private val Button: FC<ButtonProps<*>> = FC { props ->
+    button(props)
 }
 
-fun <T : IEditable> ChildrenBuilder.Button(block: ButtonProps<T>.() -> Unit) {
+fun <T : IEditable> ChildrenBuilder.buttonChild(block: ButtonProps<T>.() -> Unit) {
     child(type = Button, props = jso(block))
 }
diff --git a/src/jsMain/kotlin/com.github.ikovalyov/react/components/template/table/Table.kt b/src/jsMain/kotlin/com.github.ikovalyov/react/components/template/table/Table.kt
index a78fdc0e..d6bc9189 100644
--- a/src/jsMain/kotlin/com.github.ikovalyov/react/components/template/table/Table.kt
+++ b/src/jsMain/kotlin/com.github.ikovalyov/react/components/template/table/Table.kt
@@ -3,18 +3,8 @@ package com.github.ikovalyov.react.components.template.table
 import com.github.ikovalyov.model.markers.IEditable
 import com.github.ikovalyov.model.markers.getFieldValueAsString
 import com.github.ikovalyov.styles.Colors
-import csstype.Auto
-import csstype.BorderCollapse
-import csstype.Cursor
-import csstype.FontWeight
-import csstype.LineStyle
-import csstype.Margin
-import csstype.Padding
-import csstype.TextAlign
-import csstype.WhiteSpace
-import csstype.px
 import emotion.react.css
-import js.core.jso
+import js.objects.jso
 import react.ChildrenBuilder
 import react.FC
 import react.Fragment
@@ -35,6 +25,16 @@ import tanstack.table.core.ColumnDefTemplate
 import tanstack.table.core.StringOrTemplateHeader
 import tanstack.table.core.Table
 import tanstack.table.core.getCoreRowModel
+import web.cssom.Auto
+import web.cssom.BorderCollapse
+import web.cssom.Cursor
+import web.cssom.FontWeight
+import web.cssom.LineStyle
+import web.cssom.Margin
+import web.cssom.Padding
+import web.cssom.TextAlign
+import web.cssom.WhiteSpace
+import web.cssom.px
 
 external interface TableProps<T : IEditable> : PropsWithChildren {
     var items: Array<T>?
@@ -43,7 +43,7 @@ external interface TableProps<T : IEditable> : PropsWithChildren {
     var onViewClick: (T) -> Unit
 }
 
-private fun <T : IEditable> ChildrenBuilder.Table(props: TableProps<T>) {
+private fun <T : IEditable> ChildrenBuilder.table(props: TableProps<T>) {
     val items = props.items
     if (!items.isNullOrEmpty()) {
         val tableColumns = buildTableColumns(props, items.first())
@@ -52,7 +52,7 @@ private fun <T : IEditable> ChildrenBuilder.Table(props: TableProps<T>) {
                 this.data = items
                 this.columns = tableColumns
                 this.getCoreRowModel = getCoreRowModel()
-            }
+            },
         )
         buildTableBody(table)
     }
@@ -77,24 +77,24 @@ private fun <T : IEditable> buildTableColumns(componentProps: TableProps<T>, ite
         }
     }.toMutableList()
     columns.add(
-        jso<ColumnDef<T, String>> {
+        jso {
             id = "Action"
             header = StringOrTemplateHeader("Action")
             accessorKey = "id"
             cell = ColumnDefTemplate { props ->
                 Fragment.create {
                     div {
-                        Button<T> {
+                        buttonChild<T> {
                             onClick = componentProps.onViewClick
                             body = props.row.original
                             text = "view"
                         }
-                        Button<T> {
+                        buttonChild<T> {
                             onClick = componentProps.onEditClick
                             body = props.row.original
                             text = "update"
                         }
-                        Button<T> {
+                        buttonChild<T> {
                             onClick = componentProps.onDeleteClick
                             body = props.row.original
                             text = "delete"
@@ -102,7 +102,7 @@ private fun <T : IEditable> buildTableColumns(componentProps: TableProps<T>, ite
                     }
                 }
             }
-        }
+        },
     )
     return columns.toTypedArray()
 }
@@ -177,8 +177,8 @@ private fun <T : IEditable> ChildrenBuilder.buildTableBody(table: Table<T>) {
     }
 }
 
-private val Table: FC<TableProps<*>> = FC { Table(it) }
+private val Table: FC<TableProps<*>> = FC { prop -> table(prop) }
 
-fun <T : IEditable> ChildrenBuilder.Table(block: TableProps<T>.() -> Unit) {
+fun <T : IEditable> ChildrenBuilder.tableChild(block: TableProps<T>.() -> Unit) {
     child(type = Table, props = jso(block))
 }
diff --git a/src/jsMain/kotlin/com.github.ikovalyov/routes/Index.kt b/src/jsMain/kotlin/com.github.ikovalyov/routes/Index.kt
index 7aa7371d..d26ebbc4 100644
--- a/src/jsMain/kotlin/com.github.ikovalyov/routes/Index.kt
+++ b/src/jsMain/kotlin/com.github.ikovalyov/routes/Index.kt
@@ -9,10 +9,9 @@ import com.github.ikovalyov.model.security.Password
 import com.github.ikovalyov.model.security.ShortString
 import com.github.ikovalyov.model.security.User
 import com.github.ikovalyov.model.security.UserRole
-import com.github.ikovalyov.react.components.bootstrap.ScreenReaderSpan
 import com.github.ikovalyov.react.components.bootstrap.nav.menuItem
-import com.github.ikovalyov.react.components.template.CrudComponent
-import csstype.ClassName
+import com.github.ikovalyov.react.components.bootstrap.screenReaderSpan
+import com.github.ikovalyov.react.components.template.crudComponent
 import kotlinx.datetime.Clock
 import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.builtins.ListSerializer
@@ -22,6 +21,7 @@ import react.Props
 import react.dom.html.ReactHTML.div
 import react.dom.html.ReactHTML.nav
 import react.dom.html.ReactHTML.ul
+import web.cssom.ClassName
 
 @OptIn(ExperimentalSerializationApi::class)
 external interface IndexProps : Props {
@@ -33,6 +33,7 @@ external interface IndexProps : Props {
 @OptIn(ExperimentalSerializationApi::class)
 val Index = FC<IndexProps> { props ->
     val currentUser = props.currentUser
+    console.log(currentUser)
 
     if (currentUser != null) {
         div {
@@ -45,7 +46,7 @@ val Index = FC<IndexProps> { props ->
                         className = ClassName("navbar-nav me-auto mb-2 mb-lg-0")
                         menuItem(href = "#", active = true, disabled = false) {
                             +"Home"
-                            ScreenReaderSpan("(current)")
+                            screenReaderSpan("(current)")
                         }
                         menuItem(href = "#", active = false, disabled = false) {
                             +"Link"
@@ -58,40 +59,40 @@ val Index = FC<IndexProps> { props ->
             }
             div {
                 className = ClassName("col-auto")
-                CrudComponent {
+                crudComponent {
                     decodeItem = {
                         Json.decodeFromString(Template.serializer(), it)
                     }
                     decodeItems = {
                         Json.decodeFromString(ListSerializer(Template.serializer()), it)
                     }
-                    apiUri = Api.templateApiUrl
+                    apiUri = Api.TEMPLATE_API_URL
                     factory = {
                         Template(id = uuid4(), "", "")
                     }
                     header = "Template"
                 }
-                CrudComponent {
+                crudComponent {
                     decodeItem = {
                         Json.decodeFromString(UserRole.serializer(), it)
                     }
                     decodeItems = {
                         Json.decodeFromString(ListSerializer(UserRole.serializer()), it)
                     }
-                    apiUri = Api.userRoleApiUrl
+                    apiUri = Api.USER_ROLE_API_URL
                     factory = {
                         UserRole(uuid4(), Clock.System.now(), "")
                     }
                     header = "User Role"
                 }
-                CrudComponent {
+                crudComponent {
                     decodeItem = {
                         Json.decodeFromString(User.serializer(), it)
                     }
                     decodeItems = {
                         Json.decodeFromString(ListSerializer(User.serializer()), it)
                     }
-                    apiUri = Api.userApiUrl
+                    apiUri = Api.USER_API_URL
                     factory = {
                         User(
                             uuid4(),
@@ -99,19 +100,19 @@ val Index = FC<IndexProps> { props ->
                             false,
                             "",
                             emptyList(),
-                            Password(ShortString(""))
+                            Password(ShortString("")),
                         )
                     }
                     header = "User"
                 }
-                CrudComponent {
+                crudComponent {
                     decodeItem = {
                         Json.decodeFromString(Article.serializer(), it)
                     }
                     decodeItems = {
                         Json.decodeFromString(ListSerializer(Article.serializer()), it)
                     }
-                    apiUri = Api.articleApiUrl
+                    apiUri = Api.ARTICLE_API_URL
                     factory = {
                         Article(
                             id = uuid4(),
@@ -123,7 +124,7 @@ val Index = FC<IndexProps> { props ->
                             meta = emptyList(),
                             template = null,
                             userList = props.userList,
-                            templateList = props.templateList
+                            templateList = props.templateList,
                         )
                     }
                     header = "Article"
diff --git a/src/jsMain/kotlin/com.github.ikovalyov/styles/Colors.kt b/src/jsMain/kotlin/com.github.ikovalyov/styles/Colors.kt
index 6787691b..0e87d53d 100644
--- a/src/jsMain/kotlin/com.github.ikovalyov/styles/Colors.kt
+++ b/src/jsMain/kotlin/com.github.ikovalyov/styles/Colors.kt
@@ -1,6 +1,6 @@
 package com.github.ikovalyov.styles
 
-import csstype.Color
+import web.cssom.Color
 
 object Colors {
     object Text {
diff --git a/src/jvmMain/kotlin/com/github/ikovalyov/application/UsersController.kt b/src/jvmMain/kotlin/com/github/ikovalyov/application/UsersController.kt
index 3fcb5077..8dbc3ed8 100644
--- a/src/jvmMain/kotlin/com/github/ikovalyov/application/UsersController.kt
+++ b/src/jvmMain/kotlin/com/github/ikovalyov/application/UsersController.kt
@@ -15,7 +15,7 @@ import jakarta.inject.Inject
 import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.json.Json
 
-@Controller(Api.userUrl)
+@Controller(Api.USER_URL)
 @Secured(SecurityRule.IS_ANONYMOUS)
 @OptIn(ExperimentalSerializationApi::class)
 class UsersController {
diff --git a/src/jvmMain/kotlin/com/github/ikovalyov/application/api/ArticlesController.kt b/src/jvmMain/kotlin/com/github/ikovalyov/application/api/ArticlesController.kt
index c5a5465e..91936cfe 100644
--- a/src/jvmMain/kotlin/com/github/ikovalyov/application/api/ArticlesController.kt
+++ b/src/jvmMain/kotlin/com/github/ikovalyov/application/api/ArticlesController.kt
@@ -18,13 +18,11 @@ import io.micronaut.security.rules.SecurityRule
 import kotlinx.serialization.builtins.ListSerializer
 import kotlinx.serialization.json.Json
 
-@Controller(Api.articleApiUrl)
+@Controller(Api.ARTICLE_API_URL)
 @Secured(SecurityRule.IS_AUTHENTICATED)
 class ArticlesController(private val articleRepository: ArticleRepository) {
     @Get
-    suspend fun list(): String {
-        return Json.encodeToString(ListSerializer(Article.serializer()), articleRepository.list())
-    }
+    suspend fun list(): String = Json.encodeToString(ListSerializer(Article.serializer()), articleRepository.list())
 
     @Get("{id}")
     suspend fun get(id: Uuid): String? {
diff --git a/src/jvmMain/kotlin/com/github/ikovalyov/application/api/RecordsController.kt b/src/jvmMain/kotlin/com/github/ikovalyov/application/api/RecordsController.kt
index 67d6f1eb..98aeac0b 100644
--- a/src/jvmMain/kotlin/com/github/ikovalyov/application/api/RecordsController.kt
+++ b/src/jvmMain/kotlin/com/github/ikovalyov/application/api/RecordsController.kt
@@ -19,13 +19,11 @@ import software.amazon.awssdk.services.dynamodb.model.AttributeValue
 import software.amazon.awssdk.services.dynamodb.model.GetItemRequest
 import software.amazon.awssdk.services.dynamodb.model.PutItemRequest
 
-@Controller(Api.recordsApiUrl)
+@Controller(Api.RECORDS_API_URL)
 @Secured(SecurityRule.IS_AUTHENTICATED)
 class RecordsController(private val client: DynamoDbAsyncClient) {
     @Get
-    fun get(): String {
-        return "success"
-    }
+    fun get(): String = "success"
 
     @Get("{id}")
     fun getItem(id: Int): HttpResponse<Item> {
@@ -51,8 +49,8 @@ class RecordsController(private val client: DynamoDbAsyncClient) {
                 .item(
                     mutableMapOf(
                         "id" to AttributeValue.builder().s(item.id.toString()).build(),
-                        "body" to AttributeValue.builder().s(item.body).build()
-                    )
+                        "body" to AttributeValue.builder().s(item.body).build(),
+                    ),
                 )
                 .build()
         val response = client.putItem(request).get()
diff --git a/src/jvmMain/kotlin/com/github/ikovalyov/application/api/TemplateController.kt b/src/jvmMain/kotlin/com/github/ikovalyov/application/api/TemplateController.kt
index 668f2582..a05aef1b 100644
--- a/src/jvmMain/kotlin/com/github/ikovalyov/application/api/TemplateController.kt
+++ b/src/jvmMain/kotlin/com/github/ikovalyov/application/api/TemplateController.kt
@@ -17,15 +17,13 @@ import kotlinx.serialization.builtins.ListSerializer
 import kotlinx.serialization.json.Json
 import mu.KotlinLogging
 
-@Controller(Api.templateApiUrl)
+@Controller(Api.TEMPLATE_API_URL)
 @Secured(SecurityRule.IS_AUTHENTICATED)
 class TemplateController(private val templateRepository: TemplateRepository) {
     private val logger = KotlinLogging.logger {}
 
     @Get
-    suspend fun list(): String {
-        return Json.encodeToString(ListSerializer(Template.serializer()), templateRepository.list())
-    }
+    suspend fun list(): String = Json.encodeToString(ListSerializer(Template.serializer()), templateRepository.list())
 
     @Get("/{itemId}")
     suspend fun get(itemId: Uuid): String? {
diff --git a/src/jvmMain/kotlin/com/github/ikovalyov/application/api/UserRolesController.kt b/src/jvmMain/kotlin/com/github/ikovalyov/application/api/UserRolesController.kt
index c61667b9..e47968a1 100644
--- a/src/jvmMain/kotlin/com/github/ikovalyov/application/api/UserRolesController.kt
+++ b/src/jvmMain/kotlin/com/github/ikovalyov/application/api/UserRolesController.kt
@@ -17,15 +17,13 @@ import kotlinx.serialization.builtins.ListSerializer
 import kotlinx.serialization.json.Json
 import mu.KotlinLogging
 
-@Controller(Api.userRoleApiUrl)
+@Controller(Api.USER_ROLE_API_URL)
 @Secured(SecurityRule.IS_AUTHENTICATED)
 class UserRolesController(private val userRolesRepository: UserRoleRepository) {
     private val logger = KotlinLogging.logger {}
 
     @Get
-    suspend fun list(): String {
-        return Json.encodeToString(ListSerializer(UserRole.serializer()), userRolesRepository.list())
-    }
+    suspend fun list(): String = Json.encodeToString(ListSerializer(UserRole.serializer()), userRolesRepository.list())
 
     @Get("/{itemId}")
     suspend fun get(itemId: Uuid): String? {
diff --git a/src/jvmMain/kotlin/com/github/ikovalyov/application/api/UsersApiController.kt b/src/jvmMain/kotlin/com/github/ikovalyov/application/api/UsersApiController.kt
index 0d16c552..47135d70 100644
--- a/src/jvmMain/kotlin/com/github/ikovalyov/application/api/UsersApiController.kt
+++ b/src/jvmMain/kotlin/com/github/ikovalyov/application/api/UsersApiController.kt
@@ -19,15 +19,13 @@ import kotlinx.serialization.json.Json
 import mu.KotlinLogging
 
 @ExperimentalSerializationApi
-@Controller(Api.userApiUrl)
+@Controller(Api.USER_API_URL)
 @Secured(SecurityRule.IS_AUTHENTICATED)
 class UsersApiController(private val userRepository: UserRepository) {
     private val logger = KotlinLogging.logger {}
 
     @Get
-    suspend fun list(): String {
-        return Json.encodeToString(ListSerializer(User.serializer()), userRepository.list())
-    }
+    suspend fun list(): String = Json.encodeToString(ListSerializer(User.serializer()), userRepository.list())
 
     @Get("/{itemId}")
     suspend fun get(itemId: Uuid): String? {
diff --git a/src/jvmMain/kotlin/com/github/ikovalyov/application/api/ViewsController.kt b/src/jvmMain/kotlin/com/github/ikovalyov/application/api/ViewsController.kt
index 0a98c982..06c10263 100644
--- a/src/jvmMain/kotlin/com/github/ikovalyov/application/api/ViewsController.kt
+++ b/src/jvmMain/kotlin/com/github/ikovalyov/application/api/ViewsController.kt
@@ -12,13 +12,11 @@ import io.micronaut.http.annotation.Post
 import io.micronaut.security.annotation.Secured
 import io.micronaut.security.rules.SecurityRule
 
-@Controller(Api.viewsApiUrl)
+@Controller(Api.VIEWS_API_URL)
 @Secured(SecurityRule.IS_AUTHENTICATED)
 class ViewsController(private val templateRepository: TemplateRepository) {
     @Get("/list-views")
-    suspend fun listViews(): List<TemplateListItem> {
-        return templateRepository.list().map(TemplateListItem::fromTemplate)
-    }
+    suspend fun listViews(): List<TemplateListItem> = templateRepository.list().map(TemplateListItem::fromTemplate)
 
     @Post("/add")
     suspend fun insertView(@Body template: Template): HttpResponse<*> {
diff --git a/src/jvmMain/kotlin/com/github/ikovalyov/application/auth/AuthController.kt b/src/jvmMain/kotlin/com/github/ikovalyov/application/auth/AuthController.kt
index 19db52a9..0139719b 100644
--- a/src/jvmMain/kotlin/com/github/ikovalyov/application/auth/AuthController.kt
+++ b/src/jvmMain/kotlin/com/github/ikovalyov/application/auth/AuthController.kt
@@ -44,12 +44,12 @@ class AuthController {
                     loggedIn = true,
                     nickname = "",
                     roles = emptyList(),
-                    password = Password(ShortString(""))
-                )
+                    password = Password(ShortString("")),
+                ),
             )
         }
 
-        val location = URI(Api.frontendEndpoint)
+        val location = URI(Api.FRONTEND_ENDPOINT)
         return HttpResponse.temporaryRedirect(location)
     }
 }
diff --git a/src/jvmMain/kotlin/com/github/ikovalyov/command/DynamoDbInitCommand.kt b/src/jvmMain/kotlin/com/github/ikovalyov/command/DynamoDbInitCommand.kt
index 73797045..5e48d1ea 100644
--- a/src/jvmMain/kotlin/com/github/ikovalyov/command/DynamoDbInitCommand.kt
+++ b/src/jvmMain/kotlin/com/github/ikovalyov/command/DynamoDbInitCommand.kt
@@ -14,7 +14,7 @@ import picocli.CommandLine
     name = "Init dynamo db",
     description = ["This command generates tables in the dynamo db required for app to operate"],
     mixinStandardHelpOptions = true,
-    helpCommand = true
+    helpCommand = true,
 )
 @Singleton
 open class DynamoDbInitCommand : Runnable {
diff --git a/src/jvmMain/kotlin/com/github/ikovalyov/infrastructure/dynamodb/converter/DynamodbArticleConverter.kt b/src/jvmMain/kotlin/com/github/ikovalyov/infrastructure/dynamodb/converter/DynamodbArticleConverter.kt
index 6d0f2002..5d6acb17 100644
--- a/src/jvmMain/kotlin/com/github/ikovalyov/infrastructure/dynamodb/converter/DynamodbArticleConverter.kt
+++ b/src/jvmMain/kotlin/com/github/ikovalyov/infrastructure/dynamodb/converter/DynamodbArticleConverter.kt
@@ -48,7 +48,7 @@ class DynamodbArticleConverter : DynamodbConverterInterface<Article> {
             meta = map["meta"]?.ss(),
             template,
             userList = users,
-            templateList = templates
+            templateList = templates,
         )
     }
 
@@ -57,7 +57,7 @@ class DynamodbArticleConverter : DynamodbConverterInterface<Article> {
             "id" to AttributeValue.builder().s(item.id.toString()).build(),
             "name" to AttributeValue.builder().s(item.name).build(),
             "abstract" to AttributeValue.builder().s(item.abstract).build(),
-            "body" to AttributeValue.builder().s(item.body).build()
+            "body" to AttributeValue.builder().s(item.body).build(),
         )
         if (item.meta !== null && item.meta.isNotEmpty()) {
             mutableMap["meta"] = AttributeValue.builder().ss(item.meta).build()
diff --git a/src/jvmMain/kotlin/com/github/ikovalyov/infrastructure/dynamodb/factory/DynamoDbClientFactory.kt b/src/jvmMain/kotlin/com/github/ikovalyov/infrastructure/dynamodb/factory/DynamoDbClientFactory.kt
index da655315..473b625f 100644
--- a/src/jvmMain/kotlin/com/github/ikovalyov/infrastructure/dynamodb/factory/DynamoDbClientFactory.kt
+++ b/src/jvmMain/kotlin/com/github/ikovalyov/infrastructure/dynamodb/factory/DynamoDbClientFactory.kt
@@ -18,20 +18,18 @@ class DynamoDbClientFactory(
     @Property(name = "blog.aws.credentials.username") private val username: String,
     @Property(name = "blog.aws.credentials.secretAccessKey") private val accessKey: String,
     @Property(name = "aws.region", defaultValue = "") private val region: String?,
-    private val clientBuilder: DynamoDbAsyncClientBuilder
+    private val clientBuilder: DynamoDbAsyncClientBuilder,
 ) {
     @Singleton
     @Requires(property = "blog.aws.localstack", value = "true")
     @Replaces(DynamoDbAsyncClient::class)
-    fun createDynamoDbClient(): DynamoDbAsyncClient {
-        return clientBuilder
-            .endpointOverride(URI(endpoint))
-            .credentialsProvider { AwsBasicCredentials.create(username, accessKey) }
-            .also {
-                if (!region.isNullOrEmpty()) {
-                    it.region(Region.of(region))
-                }
+    fun createDynamoDbClient(): DynamoDbAsyncClient = clientBuilder
+        .endpointOverride(URI(endpoint))
+        .credentialsProvider { AwsBasicCredentials.create(username, accessKey) }
+        .also {
+            if (!region.isNullOrEmpty()) {
+                it.region(Region.of(region))
             }
-            .build()
-    }
+        }
+        .build()
 }
diff --git a/src/jvmMain/kotlin/com/github/ikovalyov/infrastructure/dynamodb/repository/AbstractKeyValueRepository.kt b/src/jvmMain/kotlin/com/github/ikovalyov/infrastructure/dynamodb/repository/AbstractKeyValueRepository.kt
index aaba11ba..6b0d61e5 100644
--- a/src/jvmMain/kotlin/com/github/ikovalyov/infrastructure/dynamodb/repository/AbstractKeyValueRepository.kt
+++ b/src/jvmMain/kotlin/com/github/ikovalyov/infrastructure/dynamodb/repository/AbstractKeyValueRepository.kt
@@ -12,10 +12,9 @@ import software.amazon.awssdk.services.dynamodb.model.ResourceInUseException
 import software.amazon.awssdk.services.dynamodb.model.ScalarAttributeType
 import software.amazon.awssdk.services.dynamodb.model.Tag
 
-abstract class AbstractKeyValueRepository(protected val dynamoDbClient: DynamoDbAsyncClient) :
-    InitDynamoDbDatabaseInterface {
+abstract class AbstractKeyValueRepository(protected val dynamoDbClient: DynamoDbAsyncClient) : InitDynamoDbDatabaseInterface {
     companion object {
-        const val primaryKey = "id"
+        const val PRIMARY_KEY = "id"
     }
 
     abstract val tableName: String
@@ -28,9 +27,9 @@ abstract class AbstractKeyValueRepository(protected val dynamoDbClient: DynamoDb
             it.tableName(tableName)
             it.attributeDefinitions(
                 AttributeDefinition.builder()
-                    .attributeName(primaryKey)
+                    .attributeName(PRIMARY_KEY)
                     .attributeType(ScalarAttributeType.S)
-                    .build()
+                    .build(),
             )
             it.keySchema(KeySchemaElement.builder().attributeName("id").keyType(KeyType.HASH).build())
             it.provisionedThroughput { builder ->
diff --git a/src/jvmMain/kotlin/com/github/ikovalyov/infrastructure/dynamodb/repository/ArticleRepository.kt b/src/jvmMain/kotlin/com/github/ikovalyov/infrastructure/dynamodb/repository/ArticleRepository.kt
index 7e0e852a..27a04043 100644
--- a/src/jvmMain/kotlin/com/github/ikovalyov/infrastructure/dynamodb/repository/ArticleRepository.kt
+++ b/src/jvmMain/kotlin/com/github/ikovalyov/infrastructure/dynamodb/repository/ArticleRepository.kt
@@ -9,40 +9,30 @@ import kotlinx.serialization.ExperimentalSerializationApi
 import software.amazon.awssdk.services.dynamodb.DynamoDbAsyncClient
 
 @Singleton
-@OptIn(ExperimentalSerializationApi::class)
-class ArticleRepository(dynamoDbClient: DynamoDbAsyncClient) :
-    CrudRepository<Article>(dynamoDbClient) {
+class ArticleRepository(dynamoDbClient: DynamoDbAsyncClient) : CrudRepository<Article>(dynamoDbClient) {
 
     @Inject private lateinit var articleConverter: DynamodbArticleConverter
 
     companion object {
-        const val tableName = "article"
+        const val TABLE_NAME = "article"
     }
 
-    override val tableName = ArticleRepository.tableName
+    override val tableName = TABLE_NAME
 
     @OptIn(ExperimentalSerializationApi::class)
-    suspend fun list(): List<Article> {
-        return list {
-            articleConverter.fromDynamoDB(it)
-        }
+    suspend fun list(): List<Article> = list {
+        articleConverter.fromDynamoDB(it)
     }
 
-    suspend fun insert(item: Article): Boolean {
-        return insert(item) {
-            articleConverter.toDynamoDB(it)
-        }
+    suspend fun insert(item: Article): Boolean = insert(item) {
+        articleConverter.toDynamoDB(it)
     }
 
-    suspend fun update(item: Article): Boolean {
-        return update(item) {
-            articleConverter.toDynamoDB(it)
-        }
+    suspend fun update(item: Article): Boolean = update(item) {
+        articleConverter.toDynamoDB(it)
     }
 
-    suspend fun get(id: Uuid): Article? {
-        return get(id) {
-            articleConverter.fromDynamoDB(it)
-        }
+    suspend fun get(id: Uuid): Article? = get(id) {
+        articleConverter.fromDynamoDB(it)
     }
 }
diff --git a/src/jvmMain/kotlin/com/github/ikovalyov/infrastructure/dynamodb/repository/ConfigurationRepository.kt b/src/jvmMain/kotlin/com/github/ikovalyov/infrastructure/dynamodb/repository/ConfigurationRepository.kt
index 5229c240..030616d4 100644
--- a/src/jvmMain/kotlin/com/github/ikovalyov/infrastructure/dynamodb/repository/ConfigurationRepository.kt
+++ b/src/jvmMain/kotlin/com/github/ikovalyov/infrastructure/dynamodb/repository/ConfigurationRepository.kt
@@ -9,50 +9,41 @@ import software.amazon.awssdk.services.dynamodb.model.AttributeValue
 import software.amazon.awssdk.services.dynamodb.model.GetItemResponse
 
 @Singleton
-class ConfigurationRepository(
-    dynamoDbClient: DynamoDbAsyncClient,
-    @Property(name = "blog.template.default-template") private val defaultTemplate: String
-) : AbstractKeyValueRepository(dynamoDbClient) {
+class ConfigurationRepository(dynamoDbClient: DynamoDbAsyncClient, @Property(name = "blog.template.default-template") private val defaultTemplate: String) : AbstractKeyValueRepository(dynamoDbClient) {
     companion object {
-        const val tableName = "configuration"
-        const val activeTemplateKeyId = "active-template"
-        const val configurationValueFieldName = "value"
+        const val TABLE_NAME = "configuration"
+        const val ACTIVE_TEMPLATE_KEY_ID = "active-template"
+        const val CONFIGURATION_VALUE_FIELD_NAME = "value"
     }
-    override val tableName = ConfigurationRepository.tableName
+    override val tableName = TABLE_NAME
 
     override suspend fun init(): Boolean {
         super.init()
-        return insertConfiguration(activeTemplateKeyId, defaultTemplate)
+        return insertConfiguration(ACTIVE_TEMPLATE_KEY_ID, defaultTemplate)
     }
 
-    suspend fun getActiveTemplateId(): Uuid? {
-        return Uuid.fromString(
-            getConfigProperty(activeTemplateKeyId).item()[configurationValueFieldName]?.s()
-        )
-    }
+    suspend fun getActiveTemplateId(): Uuid? = Uuid.fromString(
+        getConfigProperty(ACTIVE_TEMPLATE_KEY_ID).item()[CONFIGURATION_VALUE_FIELD_NAME]?.s(),
+    )
 
-    private suspend fun insertConfiguration(key: String, value: String): Boolean {
-        return dynamoDbClient
-            .putItem {
-                it.tableName(tableName)
-                    .item(
-                        mapOf(
-                            primaryKey to AttributeValue.builder().s(key).build(),
-                            configurationValueFieldName to AttributeValue.builder().s(value).build()
-                        )
-                    )
-            }
-            .await()
-            .sdkHttpResponse()
-            .isSuccessful
-    }
+    private suspend fun insertConfiguration(key: String, value: String): Boolean = dynamoDbClient
+        .putItem {
+            it.tableName(tableName)
+                .item(
+                    mapOf(
+                        PRIMARY_KEY to AttributeValue.builder().s(key).build(),
+                        CONFIGURATION_VALUE_FIELD_NAME to AttributeValue.builder().s(value).build(),
+                    ),
+                )
+        }
+        .await()
+        .sdkHttpResponse()
+        .isSuccessful
 
-    private suspend fun getConfigProperty(key: String): GetItemResponse {
-        return dynamoDbClient
-            .getItem {
-                it.tableName(tableName)
-                it.key(mapOf(primaryKey to AttributeValue.builder().s(key).build()))
-            }
-            .await()
-    }
+    private suspend fun getConfigProperty(key: String): GetItemResponse = dynamoDbClient
+        .getItem {
+            it.tableName(tableName)
+            it.key(mapOf(PRIMARY_KEY to AttributeValue.builder().s(key).build()))
+        }
+        .await()
 }
diff --git a/src/jvmMain/kotlin/com/github/ikovalyov/infrastructure/dynamodb/repository/CrudRepository.kt b/src/jvmMain/kotlin/com/github/ikovalyov/infrastructure/dynamodb/repository/CrudRepository.kt
index a4b14468..14aa437d 100644
--- a/src/jvmMain/kotlin/com/github/ikovalyov/infrastructure/dynamodb/repository/CrudRepository.kt
+++ b/src/jvmMain/kotlin/com/github/ikovalyov/infrastructure/dynamodb/repository/CrudRepository.kt
@@ -10,21 +10,18 @@ import mu.KotlinLogging
 import software.amazon.awssdk.services.dynamodb.DynamoDbAsyncClient
 import software.amazon.awssdk.services.dynamodb.model.AttributeValue
 
-abstract class CrudRepository<T : IEditable>(dynamoDbClient: DynamoDbAsyncClient) :
-    AbstractKeyValueRepository(dynamoDbClient) {
+abstract class CrudRepository<T : IEditable>(dynamoDbClient: DynamoDbAsyncClient) : AbstractKeyValueRepository(dynamoDbClient) {
 
     private val logger = KotlinLogging.logger {}
 
-    protected suspend fun list(convert: suspend (Map<String, AttributeValue>) -> T): List<T> {
-        return coroutineScope {
-            val scanResponse = dynamoDbClient.scan { it.tableName(tableName) }.await()
-            scanResponse.items().map {
-                async {
-                    convert(it)
-                }
-            }.map {
-                it.await()
+    protected suspend fun list(convert: suspend (Map<String, AttributeValue>) -> T): List<T> = coroutineScope {
+        val scanResponse = dynamoDbClient.scan { it.tableName(tableName) }.await()
+        scanResponse.items().map {
+            async {
+                convert(it)
             }
+        }.map {
+            it.await()
         }
     }
 
@@ -37,20 +34,18 @@ abstract class CrudRepository<T : IEditable>(dynamoDbClient: DynamoDbAsyncClient
             .statusCode() == HttpStatus.OK.code
     }
 
-    protected suspend fun update(item: T, convert: suspend (T) -> Map<String, AttributeValue>): Boolean {
-        return try {
-            delete(item.id)
-            insert(item, convert)
-        } catch (t: Throwable) {
-            logger.error(t) { t.message }
-            insert(item, convert)
-        }
+    protected suspend fun update(item: T, convert: suspend (T) -> Map<String, AttributeValue>): Boolean = try {
+        delete(item.id)
+        insert(item, convert)
+    } catch (t: Throwable) {
+        logger.error(t) { t.message }
+        insert(item, convert)
     }
 
     protected suspend fun get(id: Uuid, convert: suspend (Map<String, AttributeValue>) -> T): T? {
         val response = dynamoDbClient.getItem {
             it.tableName(tableName)
-            it.key(mapOf(primaryKey to AttributeValue.builder().s(id.toString()).build()))
+            it.key(mapOf(PRIMARY_KEY to AttributeValue.builder().s(id.toString()).build()))
         }
             .await()
         if (!response.hasItem()) return null
@@ -60,7 +55,7 @@ abstract class CrudRepository<T : IEditable>(dynamoDbClient: DynamoDbAsyncClient
     suspend fun delete(id: Uuid): Boolean {
         val response = dynamoDbClient.deleteItem {
             it.tableName(tableName)
-                .key(mapOf(primaryKey to AttributeValue.builder().s(id.toString()).build()))
+                .key(mapOf(PRIMARY_KEY to AttributeValue.builder().s(id.toString()).build()))
         }
             .await()
         return response.sdkHttpResponse().isSuccessful
diff --git a/src/jvmMain/kotlin/com/github/ikovalyov/infrastructure/dynamodb/repository/RecordsRepository.kt b/src/jvmMain/kotlin/com/github/ikovalyov/infrastructure/dynamodb/repository/RecordsRepository.kt
index 15eb74f7..1339caae 100644
--- a/src/jvmMain/kotlin/com/github/ikovalyov/infrastructure/dynamodb/repository/RecordsRepository.kt
+++ b/src/jvmMain/kotlin/com/github/ikovalyov/infrastructure/dynamodb/repository/RecordsRepository.kt
@@ -4,10 +4,9 @@ import jakarta.inject.Singleton
 import software.amazon.awssdk.services.dynamodb.DynamoDbAsyncClient
 
 @Singleton
-class RecordsRepository(dynamoDbClient: DynamoDbAsyncClient) :
-    AbstractKeyValueRepository(dynamoDbClient) {
+class RecordsRepository(dynamoDbClient: DynamoDbAsyncClient) : AbstractKeyValueRepository(dynamoDbClient) {
     companion object {
-        const val tableName = "record"
+        const val TABLE_NAME = "record"
     }
-    override val tableName = RecordsRepository.tableName
+    override val tableName = TABLE_NAME
 }
diff --git a/src/jvmMain/kotlin/com/github/ikovalyov/infrastructure/dynamodb/repository/TemplateRepository.kt b/src/jvmMain/kotlin/com/github/ikovalyov/infrastructure/dynamodb/repository/TemplateRepository.kt
index b939a93f..cb3f1693 100644
--- a/src/jvmMain/kotlin/com/github/ikovalyov/infrastructure/dynamodb/repository/TemplateRepository.kt
+++ b/src/jvmMain/kotlin/com/github/ikovalyov/infrastructure/dynamodb/repository/TemplateRepository.kt
@@ -6,45 +6,40 @@ import com.github.ikovalyov.model.Template
 import com.github.ikovalyov.model.extension.fromDynamoDbMap
 import com.github.ikovalyov.model.extension.toDynamoDbMap
 import jakarta.inject.Singleton
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
 import software.amazon.awssdk.services.dynamodb.DynamoDbAsyncClient
 
 @Singleton
-class TemplateRepository(dynamoDbClient: DynamoDbAsyncClient) :
-    CrudRepository<Template>(dynamoDbClient) {
+class TemplateRepository(dynamoDbClient: DynamoDbAsyncClient) : CrudRepository<Template>(dynamoDbClient) {
     companion object {
-        const val tableName = "template"
+        const val TABLE_NAME = "template"
     }
 
-    override val tableName = TemplateRepository.tableName
+    override val tableName = TABLE_NAME
 
-    suspend fun list(): List<Template> {
-        return list {
-            Template.fromDynamoDbMap(it)
-        }
+    suspend fun list(): List<Template> = list {
+        Template.fromDynamoDbMap(it)
     }
 
-    suspend fun insert(item: Template): Boolean {
-        return insert(item) {
-            it.toDynamoDbMap()
-        }
+    suspend fun insert(item: Template): Boolean = insert(item) {
+        it.toDynamoDbMap()
     }
 
-    suspend fun update(item: Template): Boolean {
-        return update(item) {
-            it.toDynamoDbMap()
-        }
+    suspend fun update(item: Template): Boolean = update(item) {
+        it.toDynamoDbMap()
     }
 
-    suspend fun get(id: Uuid): Template? {
-        return get(id) {
-            Template.fromDynamoDbMap(it)
-        }
+    suspend fun get(id: Uuid): Template? = get(id) {
+        Template.fromDynamoDbMap(it)
     }
 
     override suspend fun init(): Boolean {
         super.init()
         val stream = javaClass.classLoader.getResourceAsStream("template/home.ftl")!!
-        val templateString = stream.readAllBytes().decodeToString()
+        val templateString = withContext(Dispatchers.IO) {
+            stream.readAllBytes()
+        }.decodeToString()
         val template = Template.create(uuid4(), "home.ftl", templateString)
         return insert(template)
     }
diff --git a/src/jvmMain/kotlin/com/github/ikovalyov/infrastructure/dynamodb/repository/UserRepository.kt b/src/jvmMain/kotlin/com/github/ikovalyov/infrastructure/dynamodb/repository/UserRepository.kt
index 7a5ad03e..b0dc7f28 100644
--- a/src/jvmMain/kotlin/com/github/ikovalyov/infrastructure/dynamodb/repository/UserRepository.kt
+++ b/src/jvmMain/kotlin/com/github/ikovalyov/infrastructure/dynamodb/repository/UserRepository.kt
@@ -16,15 +16,12 @@ import software.amazon.awssdk.services.dynamodb.model.AttributeValue
 
 @ExperimentalSerializationApi
 @Singleton
-class UserRepository(
-    dynamoDbClient: DynamoDbAsyncClient,
-    private val userRoleRepository: UserRoleRepository
-) : CrudRepository<User>(dynamoDbClient) {
+class UserRepository(dynamoDbClient: DynamoDbAsyncClient, private val userRoleRepository: UserRoleRepository) : CrudRepository<User>(dynamoDbClient) {
     companion object {
-        const val tableName = "user"
+        const val TABLE_NAME = "user"
     }
 
-    override val tableName = UserRepository.tableName
+    override val tableName = TABLE_NAME
 
     override suspend fun init(): Boolean {
         super.init()
@@ -32,40 +29,32 @@ class UserRepository(
             delay(100)
         }
         userRoleRepository.createDefaultUserRoles()
-        val adminRole = userRoleRepository.getByName(UserRoleRepository.adminRoleName)!!
+        val adminRole = userRoleRepository.getByName(UserRoleRepository.ADMIN_ROLE_NAME)!!
         val admin = User(
             id = uuid4(),
             email = Email(ShortString("test@example.com")),
             loggedIn = false,
             nickname = "admin",
             roles = listOf(adminRole.id),
-            password = Password(ShortString("password"))
+            password = Password(ShortString("password")),
         )
         return insert(admin)
     }
 
-    suspend fun list(): List<User> {
-        return list {
-            User.fromDynamoDbMap(it)
-        }
+    suspend fun list(): List<User> = list {
+        User.fromDynamoDbMap(it)
     }
 
-    suspend fun insert(item: User): Boolean {
-        return insert(item) {
-            item.toDynamoDbMap()
-        }
+    suspend fun insert(item: User): Boolean = insert(item) {
+        item.toDynamoDbMap()
     }
 
-    suspend fun update(item: User): Boolean {
-        return update(item) {
-            item.toDynamoDbMap()
-        }
+    suspend fun update(item: User): Boolean = update(item) {
+        item.toDynamoDbMap()
     }
 
-    suspend fun get(id: Uuid): User? {
-        return get(id) {
-            User.fromDynamoDbMap(it)
-        }
+    suspend fun get(id: Uuid): User? = get(id) {
+        User.fromDynamoDbMap(it)
     }
 
     suspend fun getUserByEmail(email: Email): User? {
@@ -74,7 +63,7 @@ class UserRepository(
 
         val emails = find(
             mapOf(":email" to AttributeValue.fromS(email.toString())),
-            filterExpression = "email = :email"
+            filterExpression = "email = :email",
         ) {
             User.fromDynamoDbMap(it)
         }
diff --git a/src/jvmMain/kotlin/com/github/ikovalyov/infrastructure/dynamodb/repository/UserRoleRepository.kt b/src/jvmMain/kotlin/com/github/ikovalyov/infrastructure/dynamodb/repository/UserRoleRepository.kt
index a0df44cf..c12a15bb 100644
--- a/src/jvmMain/kotlin/com/github/ikovalyov/infrastructure/dynamodb/repository/UserRoleRepository.kt
+++ b/src/jvmMain/kotlin/com/github/ikovalyov/infrastructure/dynamodb/repository/UserRoleRepository.kt
@@ -15,19 +15,19 @@ import software.amazon.awssdk.services.dynamodb.model.AttributeValue
 class UserRoleRepository(dynamoDbClient: DynamoDbAsyncClient) : CrudRepository<UserRole>(dynamoDbClient) {
 
     companion object {
-        const val tableName = "userRole"
-        const val adminRoleName = "admin"
-        const val userRoleName = "user"
-        const val guestRoleName = "guest"
-        const val fieldName = "name"
+        const val TABLE_NAME = "userRole"
+        const val ADMIN_ROLE_NAME = "admin"
+        const val USER_ROLE_NAME = "user"
+        const val GUEST_USER_ROLE_NAME = "guest"
+        const val FIELD_NAME = "name"
     }
 
-    override val tableName = UserRoleRepository.tableName
+    override val tableName = TABLE_NAME
 
     suspend fun createDefaultUserRoles(): Boolean {
-        val adminRoleFromDb = getByName(adminRoleName)
-        val userRole = UserRole(uuid4(), Clock.System.now(), userRoleName)
-        val guestRole = UserRole(uuid4(), Clock.System.now(), guestRoleName)
+        val adminRoleFromDb = getByName(ADMIN_ROLE_NAME)
+        val userRole = UserRole(uuid4(), Clock.System.now(), USER_ROLE_NAME)
+        val guestRole = UserRole(uuid4(), Clock.System.now(), GUEST_USER_ROLE_NAME)
         val adminInsertResult = if (adminRoleFromDb == null) {
             createAdmin()
         } else {
@@ -37,32 +37,24 @@ class UserRoleRepository(dynamoDbClient: DynamoDbAsyncClient) : CrudRepository<U
     }
 
     suspend fun createAdmin(): Boolean {
-        val admin = UserRole(uuid4(), Clock.System.now(), adminRoleName)
+        val admin = UserRole(uuid4(), Clock.System.now(), ADMIN_ROLE_NAME)
         return insert(admin)
     }
 
-    suspend fun list(): List<UserRole> {
-        return list {
-            UserRole.fromDynamoDbMap(it)
-        }
+    suspend fun list(): List<UserRole> = list {
+        UserRole.fromDynamoDbMap(it)
     }
 
-    suspend fun insert(item: UserRole): Boolean {
-        return insert(item) {
-            item.toDynamoDbMap()
-        }
+    suspend fun insert(item: UserRole): Boolean = insert(item) {
+        item.toDynamoDbMap()
     }
 
-    suspend fun update(item: UserRole): Boolean {
-        return update(item) {
-            item.toDynamoDbMap()
-        }
+    suspend fun update(item: UserRole): Boolean = update(item) {
+        item.toDynamoDbMap()
     }
 
-    suspend fun get(id: Uuid): UserRole? {
-        return get(id) {
-            UserRole.fromDynamoDbMap(it)
-        }
+    suspend fun get(id: Uuid): UserRole? = get(id) {
+        UserRole.fromDynamoDbMap(it)
     }
 
     suspend fun getByName(name: String): UserRole? {
@@ -72,8 +64,8 @@ class UserRoleRepository(dynamoDbClient: DynamoDbAsyncClient) : CrudRepository<U
             it.filterExpression("#keyone = :nameParam")
             it.expressionAttributeNames(
                 mutableMapOf(
-                    Pair("#keyone", fieldName)
-                )
+                    Pair("#keyone", FIELD_NAME),
+                ),
             )
         }.await()
         if (!response.hasItems() || response.items().isEmpty()) return null
diff --git a/src/jvmMain/kotlin/com/github/ikovalyov/infrastructure/service/TemplateService.kt b/src/jvmMain/kotlin/com/github/ikovalyov/infrastructure/service/TemplateService.kt
index ef83adfa..88d8de98 100644
--- a/src/jvmMain/kotlin/com/github/ikovalyov/infrastructure/service/TemplateService.kt
+++ b/src/jvmMain/kotlin/com/github/ikovalyov/infrastructure/service/TemplateService.kt
@@ -10,7 +10,5 @@ class TemplateService {
     @Inject
     private lateinit var templateRepository: TemplateRepository
 
-    suspend fun getAllTemplates(): List<Template> {
-        return templateRepository.list()
-    }
+    suspend fun getAllTemplates(): List<Template> = templateRepository.list()
 }
diff --git a/src/jvmMain/kotlin/com/github/ikovalyov/infrastructure/service/UserService.kt b/src/jvmMain/kotlin/com/github/ikovalyov/infrastructure/service/UserService.kt
index ee189a32..8b129844 100644
--- a/src/jvmMain/kotlin/com/github/ikovalyov/infrastructure/service/UserService.kt
+++ b/src/jvmMain/kotlin/com/github/ikovalyov/infrastructure/service/UserService.kt
@@ -11,7 +11,5 @@ import kotlinx.serialization.ExperimentalSerializationApi
 class UserService {
     @Inject private lateinit var userRepository: UserRepository
 
-    suspend fun getAllUsers(): List<User> {
-        return userRepository.list()
-    }
+    suspend fun getAllUsers(): List<User> = userRepository.list()
 }
diff --git a/src/jvmMain/kotlin/com/github/ikovalyov/model/extension/Template.kt b/src/jvmMain/kotlin/com/github/ikovalyov/model/extension/Template.kt
index 9254a28f..326522e1 100644
--- a/src/jvmMain/kotlin/com/github/ikovalyov/model/extension/Template.kt
+++ b/src/jvmMain/kotlin/com/github/ikovalyov/model/extension/Template.kt
@@ -5,20 +5,16 @@ import com.github.ikovalyov.model.Template
 import kotlinx.datetime.Instant
 import software.amazon.awssdk.services.dynamodb.model.AttributeValue
 
-fun Template.toDynamoDbMap(): Map<String, AttributeValue> {
-    return mapOf(
-        "id" to AttributeValue.builder().s(id.toString()).build(),
-        "name" to AttributeValue.builder().s(name).build(),
-        "body" to AttributeValue.builder().s(body).build(),
-        "lastModified" to AttributeValue.builder().s(lastModified.toString()).build()
-    )
-}
+fun Template.toDynamoDbMap(): Map<String, AttributeValue> = mapOf(
+    "id" to AttributeValue.builder().s(id.toString()).build(),
+    "name" to AttributeValue.builder().s(name).build(),
+    "body" to AttributeValue.builder().s(body).build(),
+    "lastModified" to AttributeValue.builder().s(lastModified.toString()).build(),
+)
 
-fun Template.Companion.fromDynamoDbMap(map: Map<String, AttributeValue>): Template {
-    return Template(
-        uuidFrom(map["id"]!!.s()),
-        map["name"]!!.s(),
-        map["body"]!!.s(),
-        Instant.parse(map["lastModified"]!!.s())
-    )
-}
+fun Template.Companion.fromDynamoDbMap(map: Map<String, AttributeValue>): Template = Template(
+    uuidFrom(map["id"]!!.s()),
+    map["name"]!!.s(),
+    map["body"]!!.s(),
+    Instant.parse(map["lastModified"]!!.s()),
+)
diff --git a/src/jvmMain/kotlin/com/github/ikovalyov/model/extension/UserExtension.kt b/src/jvmMain/kotlin/com/github/ikovalyov/model/extension/UserExtension.kt
index 48b0e431..3bd7de2f 100644
--- a/src/jvmMain/kotlin/com/github/ikovalyov/model/extension/UserExtension.kt
+++ b/src/jvmMain/kotlin/com/github/ikovalyov/model/extension/UserExtension.kt
@@ -13,27 +13,23 @@ import software.amazon.awssdk.services.dynamodb.model.AttributeValue
 
 @ExperimentalSerializationApi
 object UserExtension {
-    fun User.toDynamoDbMap(): Map<String, AttributeValue> {
-        return mapOf(
-            "id" to AttributeValue.builder().s(id.toString()).build(),
-            "email" to AttributeValue.builder().s(email.toString()).build(),
-            "loggedIn" to AttributeValue.builder().bool(loggedIn).build(),
-            "nickname" to AttributeValue.builder().s(nickname).build(),
-            "roles" to AttributeValue.builder().s(
-                Json.encodeToString(ListSerializer(UuidSerializer), roles)
-            ).build(),
-            "password" to AttributeValue.builder().s(password.toString()).build()
-        )
-    }
+    fun User.toDynamoDbMap(): Map<String, AttributeValue> = mapOf(
+        "id" to AttributeValue.builder().s(id.toString()).build(),
+        "email" to AttributeValue.builder().s(email.toString()).build(),
+        "loggedIn" to AttributeValue.builder().bool(loggedIn).build(),
+        "nickname" to AttributeValue.builder().s(nickname).build(),
+        "roles" to AttributeValue.builder().s(
+            Json.encodeToString(ListSerializer(UuidSerializer), roles),
+        ).build(),
+        "password" to AttributeValue.builder().s(password.toString()).build(),
+    )
 
-    fun User.Companion.fromDynamoDbMap(map: Map<String, AttributeValue>): User {
-        return User(
-            id = uuidFrom(map["id"]!!.s()),
-            email = Email(ShortString(map["email"]!!.s())),
-            loggedIn = map["loggedIn"]!!.bool(),
-            password = Password(ShortString(map["password"]!!.s())),
-            nickname = map["nickname"]!!.s(),
-            roles = Json.decodeFromString(ListSerializer(UuidSerializer), map["roles"]!!.s())
-        )
-    }
+    fun User.Companion.fromDynamoDbMap(map: Map<String, AttributeValue>): User = User(
+        id = uuidFrom(map["id"]!!.s()),
+        email = Email(ShortString(map["email"]!!.s())),
+        loggedIn = map["loggedIn"]!!.bool(),
+        password = Password(ShortString(map["password"]!!.s())),
+        nickname = map["nickname"]!!.s(),
+        roles = Json.decodeFromString(ListSerializer(UuidSerializer), map["roles"]!!.s()),
+    )
 }
diff --git a/src/jvmMain/kotlin/com/github/ikovalyov/model/extension/UserRoleExtension.kt b/src/jvmMain/kotlin/com/github/ikovalyov/model/extension/UserRoleExtension.kt
index 0476556f..112b600c 100644
--- a/src/jvmMain/kotlin/com/github/ikovalyov/model/extension/UserRoleExtension.kt
+++ b/src/jvmMain/kotlin/com/github/ikovalyov/model/extension/UserRoleExtension.kt
@@ -8,19 +8,15 @@ import software.amazon.awssdk.services.dynamodb.model.AttributeValue
 object UserRoleExtension {
     val fieldName = "name"
 
-    fun UserRole.toDynamoDbMap(): Map<String, AttributeValue> {
-        return mapOf(
-            "id" to AttributeValue.builder().s(id.toString()).build(),
-            fieldName to AttributeValue.builder().s(name).build(),
-            "lastModified" to AttributeValue.builder().n(lastModified.epochSeconds.toString()).build()
-        )
-    }
+    fun UserRole.toDynamoDbMap(): Map<String, AttributeValue> = mapOf(
+        "id" to AttributeValue.builder().s(id.toString()).build(),
+        fieldName to AttributeValue.builder().s(name).build(),
+        "lastModified" to AttributeValue.builder().n(lastModified.epochSeconds.toString()).build(),
+    )
 
-    fun UserRole.Companion.fromDynamoDbMap(map: Map<String, AttributeValue>): UserRole {
-        return UserRole(
-            uuidFrom(map["id"]!!.s()),
-            Clock.System.now(),
-            map[fieldName]!!.s()
-        )
-    }
+    fun UserRole.Companion.fromDynamoDbMap(map: Map<String, AttributeValue>): UserRole = UserRole(
+        uuidFrom(map["id"]!!.s()),
+        Clock.System.now(),
+        map[fieldName]!!.s(),
+    )
 }
diff --git a/src/jvmMain/kotlin/com/github/ikovalyov/template/DynamoDbTemplateLoader.kt b/src/jvmMain/kotlin/com/github/ikovalyov/template/DynamoDbTemplateLoader.kt
index 2591b41a..fac71fdd 100644
--- a/src/jvmMain/kotlin/com/github/ikovalyov/template/DynamoDbTemplateLoader.kt
+++ b/src/jvmMain/kotlin/com/github/ikovalyov/template/DynamoDbTemplateLoader.kt
@@ -10,10 +10,7 @@ import java.io.Reader
 import java.io.StringReader
 
 @Singleton
-class DynamoDbTemplateLoader(
-    private val configurationRepository: ConfigurationRepository,
-    private val templateRepository: TemplateRepository
-) : TemplateLoader {
+class DynamoDbTemplateLoader(private val configurationRepository: ConfigurationRepository, private val templateRepository: TemplateRepository) : TemplateLoader {
     override fun findTemplateSource(name: String): Template? = runBlocking {
         val templateName = configurationRepository.getActiveTemplateId()
         templateName?.let { templateRepository.get(it) }
diff --git a/src/jvmTest/kotlin/com/github/ikovalyov/application/api/TemplateControllerTest.kt b/src/jvmTest/kotlin/com/github/ikovalyov/application/api/TemplateControllerTest.kt
index 25bb3b69..78a76bdf 100644
--- a/src/jvmTest/kotlin/com/github/ikovalyov/application/api/TemplateControllerTest.kt
+++ b/src/jvmTest/kotlin/com/github/ikovalyov/application/api/TemplateControllerTest.kt
@@ -30,12 +30,10 @@ class TemplateControllerTest : TestPropertyProvider {
             it.start()
         }
 
-    override fun getProperties(): MutableMap<String, String> {
-        return mutableMapOf(
-            "micronaut.server.port" to "0",
-            "blog.aws.endpoint" to localstack.getEndpointOverride(LocalStackContainer.Service.DYNAMODB).toString()
-        )
-    }
+    override fun getProperties(): MutableMap<String, String> = mutableMapOf(
+        "micronaut.server.port" to "0",
+        "blog.aws.endpoint" to localstack.getEndpointOverride(LocalStackContainer.Service.DYNAMODB).toString(),
+    )
 
     private lateinit var uuid: Uuid
     private val uuid2 = uuid4()
diff --git a/src/jvmTest/kotlin/com/github/ikovalyov/application/api/UserRolesControllerTest.kt b/src/jvmTest/kotlin/com/github/ikovalyov/application/api/UserRolesControllerTest.kt
index 04de7fb1..7460246c 100644
--- a/src/jvmTest/kotlin/com/github/ikovalyov/application/api/UserRolesControllerTest.kt
+++ b/src/jvmTest/kotlin/com/github/ikovalyov/application/api/UserRolesControllerTest.kt
@@ -29,8 +29,8 @@ internal class UserRolesControllerTest : TestPropertyProvider {
     companion object {
         private val uuid = uuid4()
         private val uuid2 = uuid4()
-        private const val name = "name"
-        private const val name2 = "name2"
+        private const val NAME = "name"
+        private const val NAME2 = "name2"
     }
 
     @Inject lateinit var userRolesController: UserRolesController
@@ -43,12 +43,10 @@ internal class UserRolesControllerTest : TestPropertyProvider {
             it.start()
         }
 
-    override fun getProperties(): MutableMap<String, String> {
-        return mutableMapOf(
-            "micronaut.server.port" to "0",
-            "blog.aws.endpoint" to localstack.getEndpointOverride(LocalStackContainer.Service.DYNAMODB).toString()
-        )
-    }
+    override fun getProperties(): MutableMap<String, String> = mutableMapOf(
+        "micronaut.server.port" to "0",
+        "blog.aws.endpoint" to localstack.getEndpointOverride(LocalStackContainer.Service.DYNAMODB).toString(),
+    )
 
     @BeforeAll
     fun init() {
@@ -58,10 +56,10 @@ internal class UserRolesControllerTest : TestPropertyProvider {
     @Test
     @Order(1)
     fun insert(): Unit = runBlocking {
-        with(userRolesController.insert(Json.encodeToString(UserRole.serializer(), UserRole(uuid, Clock.System.now(), name)))) {
+        with(userRolesController.insert(Json.encodeToString(UserRole.serializer(), UserRole(uuid, Clock.System.now(), NAME)))) {
             assert(this.status == HttpStatus.ACCEPTED)
         }
-        with(userRolesController.insert(Json.encodeToString(UserRole.serializer(), UserRole(uuid2, Clock.System.now(), name2)))) {
+        with(userRolesController.insert(Json.encodeToString(UserRole.serializer(), UserRole(uuid2, Clock.System.now(), NAME2)))) {
             assert(this.status == HttpStatus.ACCEPTED)
         }
     }
@@ -79,12 +77,12 @@ internal class UserRolesControllerTest : TestPropertyProvider {
     fun getItems() = runBlocking {
         with(userRolesController.get(uuid)!!) {
             with(Json.decodeFromString(UserRole.serializer(), this)) {
-                assertEquals(UserRolesControllerTest.name, name)
+                assertEquals(NAME, name)
             }
         }
         with(userRolesController.get(uuid2)!!) {
             with(Json.decodeFromString(UserRole.serializer(), this)) {
-                assertEquals(name2, name)
+                assertEquals(NAME2, name)
             }
         }
     }
@@ -102,12 +100,12 @@ internal class UserRolesControllerTest : TestPropertyProvider {
     @Test
     @Order(5)
     fun update() = runBlocking {
-        val userRole = UserRole(uuid2, Clock.System.now(), name)
+        val userRole = UserRole(uuid2, Clock.System.now(), NAME)
         userRolesController.update(Json.encodeToString(UserRole.serializer(), userRole))
 
         with(userRolesController.get(uuid2)!!) {
             with(Json.decodeFromString(UserRole.serializer(), this)) {
-                assertEquals(UserRolesControllerTest.name, name)
+                assertEquals(NAME, name)
             }
         }
     }
diff --git a/src/jvmTest/kotlin/com/github/ikovalyov/infrastructure/dynamodb/repository/ConfigurationRepositoryTest.kt b/src/jvmTest/kotlin/com/github/ikovalyov/infrastructure/dynamodb/repository/ConfigurationRepositoryTest.kt
index c3c651b5..b39f3526 100644
--- a/src/jvmTest/kotlin/com/github/ikovalyov/infrastructure/dynamodb/repository/ConfigurationRepositoryTest.kt
+++ b/src/jvmTest/kotlin/com/github/ikovalyov/infrastructure/dynamodb/repository/ConfigurationRepositoryTest.kt
@@ -14,8 +14,7 @@ import software.amazon.awssdk.services.dynamodb.DynamoDbAsyncClient
 @MicronautTest
 @TestInstance(Lifecycle.PER_CLASS)
 internal class ConfigurationRepositoryTest : TestPropertyProvider {
-    class MyGenericContainer(dockerImageName: String) :
-        GenericContainer<MyGenericContainer>(dockerImageName)
+    class MyGenericContainer(dockerImageName: String) : GenericContainer<MyGenericContainer>(dockerImageName)
 
     private val dynamodbContainer =
         MyGenericContainer("amazon/dynamodb-local:1.13.2")
diff --git a/src/jvmTest/kotlin/com/github/ikovalyov/infrastructure/dynamodb/repository/RecordsRepositoryTest.kt b/src/jvmTest/kotlin/com/github/ikovalyov/infrastructure/dynamodb/repository/RecordsRepositoryTest.kt
index 35d811bf..fbcb54ca 100644
--- a/src/jvmTest/kotlin/com/github/ikovalyov/infrastructure/dynamodb/repository/RecordsRepositoryTest.kt
+++ b/src/jvmTest/kotlin/com/github/ikovalyov/infrastructure/dynamodb/repository/RecordsRepositoryTest.kt
@@ -14,8 +14,7 @@ import software.amazon.awssdk.services.dynamodb.DynamoDbAsyncClient
 @MicronautTest
 @TestInstance(Lifecycle.PER_CLASS)
 internal class RecordsRepositoryTest : TestPropertyProvider {
-    class MyGenericContainer(dockerImageName: String) :
-        GenericContainer<MyGenericContainer>(dockerImageName)
+    class MyGenericContainer(dockerImageName: String) : GenericContainer<MyGenericContainer>(dockerImageName)
 
     private val dynamodbContainer =
         MyGenericContainer("amazon/dynamodb-local:1.13.2")
diff --git a/src/jvmTest/kotlin/com/github/ikovalyov/infrastructure/dynamodb/repository/TemplateRepositoryTest.kt b/src/jvmTest/kotlin/com/github/ikovalyov/infrastructure/dynamodb/repository/TemplateRepositoryTest.kt
index f6ad8360..bee961e9 100644
--- a/src/jvmTest/kotlin/com/github/ikovalyov/infrastructure/dynamodb/repository/TemplateRepositoryTest.kt
+++ b/src/jvmTest/kotlin/com/github/ikovalyov/infrastructure/dynamodb/repository/TemplateRepositoryTest.kt
@@ -14,8 +14,7 @@ import software.amazon.awssdk.services.dynamodb.DynamoDbAsyncClient
 @MicronautTest
 @TestInstance(Lifecycle.PER_CLASS)
 internal class TemplateRepositoryTest : TestPropertyProvider {
-    class MyGenericContainer(dockerImageName: String) :
-        GenericContainer<MyGenericContainer>(dockerImageName)
+    class MyGenericContainer(dockerImageName: String) : GenericContainer<MyGenericContainer>(dockerImageName)
 
     private val dynamodbContainer =
         MyGenericContainer("amazon/dynamodb-local:1.13.2")
diff --git a/src/jvmTest/kotlin/com/github/ikovalyov/infrastructure/dynamodb/repository/UserRolesRepositoryTest.kt b/src/jvmTest/kotlin/com/github/ikovalyov/infrastructure/dynamodb/repository/UserRolesRepositoryTest.kt
index 0f071920..64678337 100644
--- a/src/jvmTest/kotlin/com/github/ikovalyov/infrastructure/dynamodb/repository/UserRolesRepositoryTest.kt
+++ b/src/jvmTest/kotlin/com/github/ikovalyov/infrastructure/dynamodb/repository/UserRolesRepositoryTest.kt
@@ -14,8 +14,7 @@ import software.amazon.awssdk.services.dynamodb.DynamoDbAsyncClient
 @MicronautTest
 @TestInstance(Lifecycle.PER_CLASS)
 internal class UserRolesRepositoryTest : TestPropertyProvider {
-    class MyGenericContainer(dockerImageName: String) :
-        GenericContainer<MyGenericContainer>(dockerImageName)
+    class MyGenericContainer(dockerImageName: String) : GenericContainer<MyGenericContainer>(dockerImageName)
 
     private val dynamodbContainer =
         MyGenericContainer("amazon/dynamodb-local:1.13.2")