diff --git a/build.gradle.kts b/build.gradle.kts
index 0ebdc138..495d9a74 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
-    id("scientifik.mpp") version "0.1.4" apply false
-    id("scientifik.publish") version "0.1.4" apply false
+    id("scientifik.mpp") version "0.1.6" apply false
+    id("scientifik.publish") version "0.1.6" apply false
 }
 
 val dataforgeVersion by extra("0.1.4-dev-1")
diff --git a/dataforge-io/src/commonMain/kotlin/hep/dataforge/io/JsonMetaFormat.kt b/dataforge-io/src/commonMain/kotlin/hep/dataforge/io/JsonMetaFormat.kt
index 64b368e2..8b3bb1d6 100644
--- a/dataforge-io/src/commonMain/kotlin/hep/dataforge/io/JsonMetaFormat.kt
+++ b/dataforge-io/src/commonMain/kotlin/hep/dataforge/io/JsonMetaFormat.kt
@@ -54,7 +54,7 @@ fun Value.toJson(descriptor: ValueDescriptor? = null): JsonElement {
     }
 }
 
-//Use theese methods to customize JSON key mapping
+//Use these methods to customize JSON key mapping
 private fun NameToken.toJsonKey(descriptor: ItemDescriptor?) = toString()
 
 private fun NodeDescriptor?.getDescriptor(key: String) = this?.items?.get(key)
diff --git a/dataforge-io/src/commonMain/kotlin/hep/dataforge/io/MetaSerializer.kt b/dataforge-io/src/commonMain/kotlin/hep/dataforge/io/MetaSerializer.kt
index d72dc71d..5f644f47 100644
--- a/dataforge-io/src/commonMain/kotlin/hep/dataforge/io/MetaSerializer.kt
+++ b/dataforge-io/src/commonMain/kotlin/hep/dataforge/io/MetaSerializer.kt
@@ -24,7 +24,17 @@ object NameSerializer : KSerializer<Name> {
 }
 
 @Serializer(NameToken::class)
-object NameTokenSerializer: KSerializer<NameToken>
+object NameTokenSerializer : KSerializer<NameToken> {
+    override val descriptor: SerialDescriptor = StringDescriptor.withName("NameToken")
+
+    override fun deserialize(decoder: Decoder): NameToken {
+        return decoder.decodeString().toName().first()!!
+    }
+
+    override fun serialize(encoder: Encoder, obj: NameToken) {
+        encoder.encodeString(obj.toString())
+    }
+}
 
 /**
  * Serialized for meta
diff --git a/dataforge-workspace/src/commonMain/kotlin/hep/dataforge/workspace/SimpleWorkspace.kt b/dataforge-workspace/src/commonMain/kotlin/hep/dataforge/workspace/SimpleWorkspace.kt
index 68438440..abdb70e3 100644
--- a/dataforge-workspace/src/commonMain/kotlin/hep/dataforge/workspace/SimpleWorkspace.kt
+++ b/dataforge-workspace/src/commonMain/kotlin/hep/dataforge/workspace/SimpleWorkspace.kt
@@ -20,7 +20,7 @@ class SimpleWorkspace(
 ) : Workspace {
 
     override val tasks: Map<Name, Task<*>> by lazy {
-        context.content<Task<*>>(Task.TYPE) + tasks.associate { it.name.toName() to it }
+        context.content<Task<*>>(Task.TYPE) + tasks.associateBy { it.name.toName() }
     }
 
     companion object {