diff --git a/foundation/smart-value/src/commonMain/kotlin/org/timemates/remote/value/MappingSmartValue.kt b/foundation/smart-value/src/commonMain/kotlin/org/timemates/remote/value/MappingSmartValue.kt
new file mode 100644
index 0000000..85084d1
--- /dev/null
+++ b/foundation/smart-value/src/commonMain/kotlin/org/timemates/remote/value/MappingSmartValue.kt
@@ -0,0 +1,12 @@
+package org.timemates.remote.value
+
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.map
+
+internal class MappingSmartValue<T, R>(
+    source: SmartValue<T>,
+    mapper: suspend (T?) -> R?
+) : SmartValue<R> {
+    override val localValue: Flow<R?> = source.localValue.map(mapper)
+    override val remoteValue: Flow<R?> = source.remoteValue.map(mapper)
+}
\ No newline at end of file
diff --git a/foundation/smart-value/src/commonMain/kotlin/org/timemates/remote/value/SmartValue.kt b/foundation/smart-value/src/commonMain/kotlin/org/timemates/remote/value/SmartValue.kt
index 3128a58..2e8297c 100644
--- a/foundation/smart-value/src/commonMain/kotlin/org/timemates/remote/value/SmartValue.kt
+++ b/foundation/smart-value/src/commonMain/kotlin/org/timemates/remote/value/SmartValue.kt
@@ -63,4 +63,8 @@ public interface SmartValue<T> {
             )
         }
     }
+}
+
+public fun <T, R> SmartValue<T>.map(transform: suspend (T?) -> R?): SmartValue<R> {
+    return MappingSmartValue(this, transform)
 }
\ No newline at end of file