diff --git a/docs/mvvm-state/scripts/pages.js b/docs/mvvm-state/scripts/pages.js
index 527fdad1..4595987c 100644
--- a/docs/mvvm-state/scripts/pages.js
+++ b/docs/mvvm-state/scripts/pages.js
@@ -1 +1 @@
-var pages = [{"name":"sealed class ResourceState<out T, out E>","description":"dev.icerock.moko.mvvm.ResourceState","location":"mvvm-state/dev.icerock.moko.mvvm/-resource-state/index.html","searchKeys":["ResourceState","sealed class ResourceState<out T, out E>"]},{"name":"class Empty<out T, out E> : ResourceState<T, E> ","description":"dev.icerock.moko.mvvm.ResourceState.Empty","location":"mvvm-state/dev.icerock.moko.mvvm/-resource-state/-empty/index.html","searchKeys":["Empty","class Empty<out T, out E> : ResourceState<T, E> "]},{"name":"fun Empty()","description":"dev.icerock.moko.mvvm.ResourceState.Empty.Empty","location":"mvvm-state/dev.icerock.moko.mvvm/-resource-state/-empty/-empty.html","searchKeys":["Empty","fun Empty()"]},{"name":"data class Failed<out T, out E>(error: E) : ResourceState<T, E> ","description":"dev.icerock.moko.mvvm.ResourceState.Failed","location":"mvvm-state/dev.icerock.moko.mvvm/-resource-state/-failed/index.html","searchKeys":["Failed","data class Failed<out T, out E>(error: E) : ResourceState<T, E> "]},{"name":"fun <out E> Failed(error: E)","description":"dev.icerock.moko.mvvm.ResourceState.Failed.Failed","location":"mvvm-state/dev.icerock.moko.mvvm/-resource-state/-failed/-failed.html","searchKeys":["Failed","fun <out E> Failed(error: E)"]},{"name":"operator fun component1(): E","description":"dev.icerock.moko.mvvm.ResourceState.Failed.component1","location":"mvvm-state/dev.icerock.moko.mvvm/-resource-state/-failed/component1.html","searchKeys":["component1","operator fun component1(): E"]},{"name":"operator fun component1(): T","description":"dev.icerock.moko.mvvm.ResourceState.Success.component1","location":"mvvm-state/dev.icerock.moko.mvvm/-resource-state/-success/component1.html","searchKeys":["component1","operator fun component1(): T"]},{"name":"fun copy(error: E): ResourceState.Failed<T, E>","description":"dev.icerock.moko.mvvm.ResourceState.Failed.copy","location":"mvvm-state/dev.icerock.moko.mvvm/-resource-state/-failed/copy.html","searchKeys":["copy","fun copy(error: E): ResourceState.Failed<T, E>"]},{"name":"fun copy(data: T): ResourceState.Success<T, E>","description":"dev.icerock.moko.mvvm.ResourceState.Success.copy","location":"mvvm-state/dev.icerock.moko.mvvm/-resource-state/-success/copy.html","searchKeys":["copy","fun copy(data: T): ResourceState.Success<T, E>"]},{"name":"val error: E","description":"dev.icerock.moko.mvvm.ResourceState.Failed.error","location":"mvvm-state/dev.icerock.moko.mvvm/-resource-state/-failed/error.html","searchKeys":["error","val error: E"]},{"name":"class Loading<out T, out E> : ResourceState<T, E> ","description":"dev.icerock.moko.mvvm.ResourceState.Loading","location":"mvvm-state/dev.icerock.moko.mvvm/-resource-state/-loading/index.html","searchKeys":["Loading","class Loading<out T, out E> : ResourceState<T, E> "]},{"name":"fun Loading()","description":"dev.icerock.moko.mvvm.ResourceState.Loading.Loading","location":"mvvm-state/dev.icerock.moko.mvvm/-resource-state/-loading/-loading.html","searchKeys":["Loading","fun Loading()"]},{"name":"data class Success<out T, out E>(data: T) : ResourceState<T, E> ","description":"dev.icerock.moko.mvvm.ResourceState.Success","location":"mvvm-state/dev.icerock.moko.mvvm/-resource-state/-success/index.html","searchKeys":["Success","data class Success<out T, out E>(data: T) : ResourceState<T, E> "]},{"name":"fun <out T> Success(data: T)","description":"dev.icerock.moko.mvvm.ResourceState.Success.Success","location":"mvvm-state/dev.icerock.moko.mvvm/-resource-state/-success/-success.html","searchKeys":["Success","fun <out T> Success(data: T)"]},{"name":"val data: T","description":"dev.icerock.moko.mvvm.ResourceState.Success.data","location":"mvvm-state/dev.icerock.moko.mvvm/-resource-state/-success/data.html","searchKeys":["data","val data: T"]},{"name":"fun <T, E> LiveData<ResourceState<T, E>>.data(): LiveData<T?>","description":"dev.icerock.moko.mvvm.livedata.data","location":"mvvm-state/dev.icerock.moko.mvvm.livedata/data.html","searchKeys":["data","fun <T, E> LiveData<ResourceState<T, E>>.data(): LiveData<T?>"]},{"name":"fun dataValue(): T?","description":"dev.icerock.moko.mvvm.ResourceState.dataValue","location":"mvvm-state/dev.icerock.moko.mvvm/-resource-state/data-value.html","searchKeys":["dataValue","fun dataValue(): T?"]},{"name":"fun <T, E> LiveData<ResourceState<T, E>>.dataValue(): T?","description":"dev.icerock.moko.mvvm.livedata.dataValue","location":"mvvm-state/dev.icerock.moko.mvvm.livedata/data-value.html","searchKeys":["dataValue","fun <T, E> LiveData<ResourceState<T, E>>.dataValue(): T?"]},{"name":"fun errorValue(): E?","description":"dev.icerock.moko.mvvm.ResourceState.errorValue","location":"mvvm-state/dev.icerock.moko.mvvm/-resource-state/error-value.html","searchKeys":["errorValue","fun errorValue(): E?"]},{"name":"fun <T, E> LiveData<ResourceState<T, E>>.errorValue(): E?","description":"dev.icerock.moko.mvvm.livedata.errorValue","location":"mvvm-state/dev.icerock.moko.mvvm.livedata/error-value.html","searchKeys":["errorValue","fun <T, E> LiveData<ResourceState<T, E>>.errorValue(): E?"]},{"name":"fun isEmpty(): Boolean","description":"dev.icerock.moko.mvvm.ResourceState.isEmpty","location":"mvvm-state/dev.icerock.moko.mvvm/-resource-state/is-empty.html","searchKeys":["isEmpty","fun isEmpty(): Boolean"]},{"name":"fun isFailed(): Boolean","description":"dev.icerock.moko.mvvm.ResourceState.isFailed","location":"mvvm-state/dev.icerock.moko.mvvm/-resource-state/is-failed.html","searchKeys":["isFailed","fun isFailed(): Boolean"]},{"name":"fun isLoading(): Boolean","description":"dev.icerock.moko.mvvm.ResourceState.isLoading","location":"mvvm-state/dev.icerock.moko.mvvm/-resource-state/is-loading.html","searchKeys":["isLoading","fun isLoading(): Boolean"]},{"name":"fun isSuccess(): Boolean","description":"dev.icerock.moko.mvvm.ResourceState.isSuccess","location":"mvvm-state/dev.icerock.moko.mvvm/-resource-state/is-success.html","searchKeys":["isSuccess","fun isSuccess(): Boolean"]},{"name":"fun <T1, E, T2, OT> LiveData<ResourceState<T1, E>>.concatData(liveData: LiveData<ResourceState<T2, E>>, function: (T1, T2) -> OT): LiveData<ResourceState<OT, E>>","description":"dev.icerock.moko.mvvm.livedata.concatData","location":"mvvm-state/dev.icerock.moko.mvvm.livedata/concat-data.html","searchKeys":["concatData","fun <T1, E, T2, OT> LiveData<ResourceState<T1, E>>.concatData(liveData: LiveData<ResourceState<T2, E>>, function: (T1, T2) -> OT): LiveData<ResourceState<OT, E>>"]},{"name":"fun <IT, E, OT> LiveData<ResourceState<IT, E>>.dataTransform(transform: LiveData<IT>.() -> LiveData<OT>): LiveData<ResourceState<OT, E>>","description":"dev.icerock.moko.mvvm.livedata.dataTransform","location":"mvvm-state/dev.icerock.moko.mvvm.livedata/data-transform.html","searchKeys":["dataTransform","fun <IT, E, OT> LiveData<ResourceState<IT, E>>.dataTransform(transform: LiveData<IT>.() -> LiveData<OT>): LiveData<ResourceState<OT, E>>"]},{"name":"fun <T, E> LiveData<ResourceState<T, E>>.emptyAsData(dataBuilder: () -> T): LiveData<ResourceState<T, E>>","description":"dev.icerock.moko.mvvm.livedata.emptyAsData","location":"mvvm-state/dev.icerock.moko.mvvm.livedata/empty-as-data.html","searchKeys":["emptyAsData","fun <T, E> LiveData<ResourceState<T, E>>.emptyAsData(dataBuilder: () -> T): LiveData<ResourceState<T, E>>"]},{"name":"fun <T, E> LiveData<ResourceState<T, E>>.emptyAsError(errorBuilder: () -> E): LiveData<ResourceState<T, E>>","description":"dev.icerock.moko.mvvm.livedata.emptyAsError","location":"mvvm-state/dev.icerock.moko.mvvm.livedata/empty-as-error.html","searchKeys":["emptyAsError","fun <T, E> LiveData<ResourceState<T, E>>.emptyAsError(errorBuilder: () -> E): LiveData<ResourceState<T, E>>"]},{"name":"fun <T, E> LiveData<ResourceState<T, E>>.emptyIf(emptyPredicate: (T) -> Boolean): LiveData<ResourceState<T, E>>","description":"dev.icerock.moko.mvvm.livedata.emptyIf","location":"mvvm-state/dev.icerock.moko.mvvm.livedata/empty-if.html","searchKeys":["emptyIf","fun <T, E> LiveData<ResourceState<T, E>>.emptyIf(emptyPredicate: (T) -> Boolean): LiveData<ResourceState<T, E>>"]},{"name":"fun <T, IE, OE> LiveData<ResourceState<T, IE>>.errorTransform(transform: LiveData<IE>.() -> LiveData<OE>): LiveData<ResourceState<T, OE>>","description":"dev.icerock.moko.mvvm.livedata.errorTransform","location":"mvvm-state/dev.icerock.moko.mvvm.livedata/error-transform.html","searchKeys":["errorTransform","fun <T, IE, OE> LiveData<ResourceState<T, IE>>.errorTransform(transform: LiveData<IE>.() -> LiveData<OE>): LiveData<ResourceState<T, OE>>"]},{"name":"inline fun <T, E> ResourceState<T, E>?.nullAsEmpty(): ResourceState<T, E>","description":"dev.icerock.moko.mvvm.nullAsEmpty","location":"mvvm-state/dev.icerock.moko.mvvm/null-as-empty.html","searchKeys":["nullAsEmpty","inline fun <T, E> ResourceState<T, E>?.nullAsEmpty(): ResourceState<T, E>"]},{"name":"inline fun <T, E> ResourceState<T, E>?.nullAsLoading(): ResourceState<T, E>","description":"dev.icerock.moko.mvvm.nullAsLoading","location":"mvvm-state/dev.icerock.moko.mvvm/null-as-loading.html","searchKeys":["nullAsLoading","inline fun <T, E> ResourceState<T, E>?.nullAsLoading(): ResourceState<T, E>"]}]
+var pages = [{"name":"sealed class ResourceState<out T, out E>","description":"dev.icerock.moko.mvvm.ResourceState","location":"mvvm-state/dev.icerock.moko.mvvm/-resource-state/index.html","searchKeys":["ResourceState","sealed class ResourceState<out T, out E>"]},{"name":"class Empty<out T, out E> : ResourceState<T, E> ","description":"dev.icerock.moko.mvvm.ResourceState.Empty","location":"mvvm-state/dev.icerock.moko.mvvm/-resource-state/-empty/index.html","searchKeys":["Empty","class Empty<out T, out E> : ResourceState<T, E> "]},{"name":"fun Empty()","description":"dev.icerock.moko.mvvm.ResourceState.Empty.Empty","location":"mvvm-state/dev.icerock.moko.mvvm/-resource-state/-empty/-empty.html","searchKeys":["Empty","fun Empty()"]},{"name":"data class Failed<out T, out E>(error: E) : ResourceState<T, E> ","description":"dev.icerock.moko.mvvm.ResourceState.Failed","location":"mvvm-state/dev.icerock.moko.mvvm/-resource-state/-failed/index.html","searchKeys":["Failed","data class Failed<out T, out E>(error: E) : ResourceState<T, E> "]},{"name":"fun <out E> Failed(error: E)","description":"dev.icerock.moko.mvvm.ResourceState.Failed.Failed","location":"mvvm-state/dev.icerock.moko.mvvm/-resource-state/-failed/-failed.html","searchKeys":["Failed","fun <out E> Failed(error: E)"]},{"name":"operator fun component1(): E","description":"dev.icerock.moko.mvvm.ResourceState.Failed.component1","location":"mvvm-state/dev.icerock.moko.mvvm/-resource-state/-failed/component1.html","searchKeys":["component1","operator fun component1(): E"]},{"name":"operator fun component1(): T","description":"dev.icerock.moko.mvvm.ResourceState.Success.component1","location":"mvvm-state/dev.icerock.moko.mvvm/-resource-state/-success/component1.html","searchKeys":["component1","operator fun component1(): T"]},{"name":"fun copy(error: E): ResourceState.Failed<TError>","description":"dev.icerock.moko.mvvm.ResourceState.Failed.copy","location":"mvvm-state/dev.icerock.moko.mvvm/-resource-state/-failed/copy.html","searchKeys":["copy","fun copy(error: E): ResourceState.Failed<T, E>"]},{"name":"fun copy(data: T): ResourceState.Success<T, E>","description":"dev.icerock.moko.mvvm.ResourceState.Success.copy","location":"mvvm-state/dev.icerock.moko.mvvm/-resource-state/-success/copy.html","searchKeys":["copy","fun copy(data: T): ResourceState.Success<T, E>"]},{"name":"val error: E","description":"dev.icerock.moko.mvvm.ResourceState.Failed.error","location":"mvvm-state/dev.icerock.moko.mvvm/-resource-state/-failed/error.html","searchKeys":["error","val error: E"]},{"name":"class Loading<out T, out E> : ResourceState<T, E> ","description":"dev.icerock.moko.mvvm.ResourceState.Loading","location":"mvvm-state/dev.icerock.moko.mvvm/-resource-state/-loading/index.html","searchKeys":["Loading","class Loading<out T, out E> : ResourceState<T, E> "]},{"name":"fun Loading()","description":"dev.icerock.moko.mvvm.ResourceState.Loading.Loading","location":"mvvm-state/dev.icerock.moko.mvvm/-resource-state/-loading/-loading.html","searchKeys":["Loading","fun Loading()"]},{"name":"data class Success<out T, out E>(data: T) : ResourceState<T, E> ","description":"dev.icerock.moko.mvvm.ResourceState.Success","location":"mvvm-state/dev.icerock.moko.mvvm/-resource-state/-success/index.html","searchKeys":["Success","data class Success<out T, out E>(data: T) : ResourceState<T, E> "]},{"name":"fun <out T> Success(data: T)","description":"dev.icerock.moko.mvvm.ResourceState.Success.Success","location":"mvvm-state/dev.icerock.moko.mvvm/-resource-state/-success/-success.html","searchKeys":["Success","fun <out T> Success(data: T)"]},{"name":"val data: T","description":"dev.icerock.moko.mvvm.ResourceState.Success.data","location":"mvvm-state/dev.icerock.moko.mvvm/-resource-state/-success/data.html","searchKeys":["data","val data: T"]},{"name":"fun <T, E> LiveData<ResourceState<T, E>>.data(): LiveData<T?>","description":"dev.icerock.moko.mvvm.livedata.data","location":"mvvm-state/dev.icerock.moko.mvvm.livedata/data.html","searchKeys":["data","fun <T, E> LiveData<ResourceState<T, E>>.data(): LiveData<T?>"]},{"name":"fun dataValue(): T?","description":"dev.icerock.moko.mvvm.ResourceState.dataValue","location":"mvvm-state/dev.icerock.moko.mvvm/-resource-state/data-value.html","searchKeys":["dataValue","fun dataValue(): T?"]},{"name":"fun <T, E> LiveData<ResourceState<T, E>>.dataValue(): T?","description":"dev.icerock.moko.mvvm.livedata.dataValue","location":"mvvm-state/dev.icerock.moko.mvvm.livedata/data-value.html","searchKeys":["dataValue","fun <T, E> LiveData<ResourceState<T, E>>.dataValue(): T?"]},{"name":"fun errorValue(): E?","description":"dev.icerock.moko.mvvm.ResourceState.errorValue","location":"mvvm-state/dev.icerock.moko.mvvm/-resource-state/error-value.html","searchKeys":["errorValue","fun errorValue(): E?"]},{"name":"fun <T, E> LiveData<ResourceState<T, E>>.errorValue(): E?","description":"dev.icerock.moko.mvvm.livedata.errorValue","location":"mvvm-state/dev.icerock.moko.mvvm.livedata/error-value.html","searchKeys":["errorValue","fun <T, E> LiveData<ResourceState<T, E>>.errorValue(): E?"]},{"name":"fun isEmpty(): Boolean","description":"dev.icerock.moko.mvvm.ResourceState.isEmpty","location":"mvvm-state/dev.icerock.moko.mvvm/-resource-state/is-empty.html","searchKeys":["isEmpty","fun isEmpty(): Boolean"]},{"name":"fun isFailed(): Boolean","description":"dev.icerock.moko.mvvm.ResourceState.isFailed","location":"mvvm-state/dev.icerock.moko.mvvm/-resource-state/is-failed.html","searchKeys":["isFailed","fun isFailed(): Boolean"]},{"name":"fun isLoading(): Boolean","description":"dev.icerock.moko.mvvm.ResourceState.isLoading","location":"mvvm-state/dev.icerock.moko.mvvm/-resource-state/is-loading.html","searchKeys":["isLoading","fun isLoading(): Boolean"]},{"name":"fun isSuccess(): Boolean","description":"dev.icerock.moko.mvvm.ResourceState.isSuccess","location":"mvvm-state/dev.icerock.moko.mvvm/-resource-state/is-success.html","searchKeys":["isSuccess","fun isSuccess(): Boolean"]},{"name":"fun <T1, E, T2, OT> LiveData<ResourceState<T1, E>>.concatData(liveData: LiveData<ResourceState<T2, E>>, function: (T1, T2) -> OT): LiveData<ResourceState<OT, E>>","description":"dev.icerock.moko.mvvm.livedata.concatData","location":"mvvm-state/dev.icerock.moko.mvvm.livedata/concat-data.html","searchKeys":["concatData","fun <T1, E, T2, OT> LiveData<ResourceState<T1, E>>.concatData(liveData: LiveData<ResourceState<T2, E>>, function: (T1, T2) -> OT): LiveData<ResourceState<OT, E>>"]},{"name":"fun <IT, E, OT> LiveData<ResourceState<IT, E>>.dataTransform(transform: LiveData<IT>.() -> LiveData<OT>): LiveData<ResourceState<OT, E>>","description":"dev.icerock.moko.mvvm.livedata.dataTransform","location":"mvvm-state/dev.icerock.moko.mvvm.livedata/data-transform.html","searchKeys":["dataTransform","fun <IT, E, OT> LiveData<ResourceState<IT, E>>.dataTransform(transform: LiveData<IT>.() -> LiveData<OT>): LiveData<ResourceState<OT, E>>"]},{"name":"fun <T, E> LiveData<ResourceState<T, E>>.emptyAsData(dataBuilder: () -> T): LiveData<ResourceState<T, E>>","description":"dev.icerock.moko.mvvm.livedata.emptyAsData","location":"mvvm-state/dev.icerock.moko.mvvm.livedata/empty-as-data.html","searchKeys":["emptyAsData","fun <T, E> LiveData<ResourceState<T, E>>.emptyAsData(dataBuilder: () -> T): LiveData<ResourceState<T, E>>"]},{"name":"fun <T, E> LiveData<ResourceState<T, E>>.emptyAsError(errorBuilder: () -> E): LiveData<ResourceState<T, E>>","description":"dev.icerock.moko.mvvm.livedata.emptyAsError","location":"mvvm-state/dev.icerock.moko.mvvm.livedata/empty-as-error.html","searchKeys":["emptyAsError","fun <T, E> LiveData<ResourceState<T, E>>.emptyAsError(errorBuilder: () -> E): LiveData<ResourceState<T, E>>"]},{"name":"fun <T, E> LiveData<ResourceState<T, E>>.emptyIf(emptyPredicate: (T) -> Boolean): LiveData<ResourceState<T, E>>","description":"dev.icerock.moko.mvvm.livedata.emptyIf","location":"mvvm-state/dev.icerock.moko.mvvm.livedata/empty-if.html","searchKeys":["emptyIf","fun <T, E> LiveData<ResourceState<T, E>>.emptyIf(emptyPredicate: (T) -> Boolean): LiveData<ResourceState<T, E>>"]},{"name":"fun <T, IE, OE> LiveData<ResourceState<T, IE>>.errorTransform(transform: LiveData<IE>.() -> LiveData<OE>): LiveData<ResourceState<T, OE>>","description":"dev.icerock.moko.mvvm.livedata.errorTransform","location":"mvvm-state/dev.icerock.moko.mvvm.livedata/error-transform.html","searchKeys":["errorTransform","fun <T, IE, OE> LiveData<ResourceState<T, IE>>.errorTransform(transform: LiveData<IE>.() -> LiveData<OE>): LiveData<ResourceState<T, OE>>"]},{"name":"inline fun <T, E> ResourceState<T, E>?.nullAsEmpty(): ResourceState<T, E>","description":"dev.icerock.moko.mvvm.nullAsEmpty","location":"mvvm-state/dev.icerock.moko.mvvm/null-as-empty.html","searchKeys":["nullAsEmpty","inline fun <T, E> ResourceState<T, E>?.nullAsEmpty(): ResourceState<T, E>"]},{"name":"inline fun <T, E> ResourceState<T, E>?.nullAsLoading(): ResourceState<T, E>","description":"dev.icerock.moko.mvvm.nullAsLoading","location":"mvvm-state/dev.icerock.moko.mvvm/null-as-loading.html","searchKeys":["nullAsLoading","inline fun <T, E> ResourceState<T, E>?.nullAsLoading(): ResourceState<T, E>"]}]
diff --git a/mvvm-state/api/mvvm-state.api b/mvvm-state/api/mvvm-state.api
index 8319bca9..c3748e43 100644
--- a/mvvm-state/api/mvvm-state.api
+++ b/mvvm-state/api/mvvm-state.api
@@ -8,7 +8,7 @@ public abstract class dev/icerock/moko/mvvm/ResourceState {
 }
 
 public final class dev/icerock/moko/mvvm/ResourceState$Empty : dev/icerock/moko/mvvm/ResourceState {
-	public fun <init> ()V
+	public static final field INSTANCE Ldev/icerock/moko/mvvm/ResourceState$Empty;
 }
 
 public final class dev/icerock/moko/mvvm/ResourceState$Failed : dev/icerock/moko/mvvm/ResourceState {
@@ -23,7 +23,7 @@ public final class dev/icerock/moko/mvvm/ResourceState$Failed : dev/icerock/moko
 }
 
 public final class dev/icerock/moko/mvvm/ResourceState$Loading : dev/icerock/moko/mvvm/ResourceState {
-	public fun <init> ()V
+	public static final field INSTANCE Ldev/icerock/moko/mvvm/ResourceState$Loading;
 }
 
 public final class dev/icerock/moko/mvvm/ResourceState$Success : dev/icerock/moko/mvvm/ResourceState {
diff --git a/mvvm-state/src/commonMain/kotlin/dev/icerock/moko/mvvm/ResourceState.kt b/mvvm-state/src/commonMain/kotlin/dev/icerock/moko/mvvm/ResourceState.kt
index a6a93278..11185d9b 100644
--- a/mvvm-state/src/commonMain/kotlin/dev/icerock/moko/mvvm/ResourceState.kt
+++ b/mvvm-state/src/commonMain/kotlin/dev/icerock/moko/mvvm/ResourceState.kt
@@ -4,18 +4,18 @@
 
 package dev.icerock.moko.mvvm
 
-sealed class ResourceState<out T, out E> {
-    data class Success<out T, out E>(val data: T) : ResourceState<T, E>()
-    data class Failed<out T, out E>(val error: E) : ResourceState<T, E>()
-    class Loading<out T, out E> : ResourceState<T, E>()
-    class Empty<out T, out E> : ResourceState<T, E>()
+sealed class ResourceState<out TData, out TError> {
+    data class Success<out TData>(val data: TData) : ResourceState<TData, Nothing>()
+    data class Failed<out TError>(val error: TError) : ResourceState<Nothing, TError>()
+    object Loading : ResourceState<Nothing, Nothing>()
+    object Empty : ResourceState<Nothing, Nothing>()
 
     fun isLoading(): Boolean = this is Loading
     fun isSuccess(): Boolean = this is Success
     fun isEmpty(): Boolean = this is Empty
     fun isFailed(): Boolean = this is Failed
 
-    fun dataValue(): T? = (this as? Success)?.data
+    fun dataValue(): TData? = (this as? Success)?.data
 
-    fun errorValue(): E? = (this as? Failed)?.error
+    fun errorValue(): TError? = (this as? Failed)?.error
 }
diff --git a/mvvm-state/src/commonMain/kotlin/dev/icerock/moko/mvvm/StateExt.kt b/mvvm-state/src/commonMain/kotlin/dev/icerock/moko/mvvm/StateExt.kt
index 1aecbeca..3459af2b 100644
--- a/mvvm-state/src/commonMain/kotlin/dev/icerock/moko/mvvm/StateExt.kt
+++ b/mvvm-state/src/commonMain/kotlin/dev/icerock/moko/mvvm/StateExt.kt
@@ -11,7 +11,7 @@ fun <T, E> T?.asState(whenNull: () -> ResourceState<T, E>): ResourceState<T, E>
     this?.asState() ?: whenNull()
 
 fun <T, E> List<T>.asState(): ResourceState<List<T>, E> = if (this.isEmpty()) {
-    ResourceState.Empty()
+    ResourceState.Empty
 } else {
     ResourceState.Success(this)
 }
@@ -20,7 +20,7 @@ fun <T, E> List<T>?.asState(whenNull: () -> ResourceState<List<T>, E>): Resource
     this?.asState() ?: whenNull()
 
 inline fun <reified T, reified E> ResourceState<T, E>?.nullAsEmpty(): ResourceState<T, E> =
-    this ?: ResourceState.Empty()
+    this ?: ResourceState.Empty
 
 inline fun <reified T, reified E> ResourceState<T, E>?.nullAsLoading(): ResourceState<T, E> =
-    this ?: ResourceState.Loading()
+    this ?: ResourceState.Loading
diff --git a/mvvm-state/src/commonMain/kotlin/dev/icerock/moko/mvvm/livedata/StateLiveDataConditions.kt b/mvvm-state/src/commonMain/kotlin/dev/icerock/moko/mvvm/livedata/StateLiveDataConditions.kt
index 664d31e6..667a18c2 100644
--- a/mvvm-state/src/commonMain/kotlin/dev/icerock/moko/mvvm/livedata/StateLiveDataConditions.kt
+++ b/mvvm-state/src/commonMain/kotlin/dev/icerock/moko/mvvm/livedata/StateLiveDataConditions.kt
@@ -17,23 +17,23 @@ fun <T, E> LiveData<ResourceState<T, E>>.isEmptyState(): LiveData<Boolean> = map
 fun <T, E, ST : ResourceState<T, E>, LD : LiveData<out ST>> List<LD>.isSuccessState(): LiveData<Boolean> =
     MediatorLiveData(false)
         .composition(this) { list ->
-            list.firstOrNull { it !is ResourceState.Success<*, *> } == null
+            list.firstOrNull { it !is ResourceState.Success<*> } == null
         }
 
 fun <T, E, ST : ResourceState<T, E>, LD : LiveData<out ST>> List<LD>.isLoadingState(): LiveData<Boolean> =
     MediatorLiveData(false)
         .composition(this) { list ->
-            list.firstOrNull { it is ResourceState.Loading<*, *> } != null
+            list.firstOrNull { it is ResourceState.Loading } != null
         }
 
 fun <T, E, ST : ResourceState<T, E>, LD : LiveData<out ST>> List<LD>.isErrorState(): LiveData<Boolean> =
     MediatorLiveData(false)
         .composition(this) { list ->
-            list.firstOrNull { it is ResourceState.Failed<*, *> } != null
+            list.firstOrNull { it is ResourceState.Failed<*> } != null
         }
 
 fun <T, E, ST : ResourceState<T, E>, LD : LiveData<out ST>> List<LD>.isEmptyState(): LiveData<Boolean> =
     MediatorLiveData(false)
         .composition(this) { list ->
-            list.firstOrNull { it is ResourceState.Empty<*, *> } != null
+            list.firstOrNull { it is ResourceState.Empty } != null
         }
diff --git a/mvvm-state/src/commonMain/kotlin/dev/icerock/moko/mvvm/livedata/StateLiveDataExt.kt b/mvvm-state/src/commonMain/kotlin/dev/icerock/moko/mvvm/livedata/StateLiveDataExt.kt
index 5fc6162e..a43a8c31 100644
--- a/mvvm-state/src/commonMain/kotlin/dev/icerock/moko/mvvm/livedata/StateLiveDataExt.kt
+++ b/mvvm-state/src/commonMain/kotlin/dev/icerock/moko/mvvm/livedata/StateLiveDataExt.kt
@@ -14,12 +14,12 @@ fun <T, E> LiveData<ResourceState<T, E>>.error(): LiveData<E?> = map { it.errorV
 
 fun <T, E> LiveData<ResourceState<T, E>>.errorValue(): E? = value.errorValue()
 
-fun <T, E, ST : ResourceState<T, E>, LD : LiveData<out ST>> List<LD>.error(): LiveData<E?> =
+fun <E, ST : ResourceState<Nothing, E>, LD : LiveData<out ST>> List<LD>.error(): LiveData<E?> =
     MediatorLiveData<E?>(null)
         .composition(this) { list ->
             @Suppress("UNCHECKED_CAST")
             val errorItem = list.firstOrNull {
-                (it is ResourceState.Failed<*, *>)
-            } as? ResourceState.Failed<T, E>
+                (it is ResourceState.Failed<*>)
+            } as? ResourceState.Failed<E>
             errorItem?.error
         }
diff --git a/mvvm-state/src/commonMain/kotlin/dev/icerock/moko/mvvm/livedata/StateLiveDataMerges.kt b/mvvm-state/src/commonMain/kotlin/dev/icerock/moko/mvvm/livedata/StateLiveDataMerges.kt
index c7c0c07a..21d06d40 100644
--- a/mvvm-state/src/commonMain/kotlin/dev/icerock/moko/mvvm/livedata/StateLiveDataMerges.kt
+++ b/mvvm-state/src/commonMain/kotlin/dev/icerock/moko/mvvm/livedata/StateLiveDataMerges.kt
@@ -12,17 +12,17 @@ fun <T1, E, T2, OT> LiveData<ResourceState<T1, E>>.concatData(
 ): LiveData<ResourceState<OT, E>> =
     mergeWith(liveData) { firstState, secondState ->
         val state: ResourceState<OT, E> = when {
-            (firstState is ResourceState.Loading || secondState is ResourceState.Loading) -> ResourceState.Loading()
+            (firstState is ResourceState.Loading || secondState is ResourceState.Loading) -> ResourceState.Loading
             (firstState is ResourceState.Failed) -> ResourceState.Failed(firstState.error)
             (secondState is ResourceState.Failed) -> ResourceState.Failed(secondState.error)
-            (firstState is ResourceState.Empty || secondState is ResourceState.Empty) -> ResourceState.Empty()
+            (firstState is ResourceState.Empty || secondState is ResourceState.Empty) -> ResourceState.Empty
             (firstState is ResourceState.Success && secondState is ResourceState.Success) -> ResourceState.Success(
                 function(
                     firstState.data,
                     secondState.data
                 )
             )
-            else -> ResourceState.Empty()
+            else -> ResourceState.Empty
         }
 
         state
diff --git a/mvvm-state/src/commonMain/kotlin/dev/icerock/moko/mvvm/livedata/StateLiveDataTransforms.kt b/mvvm-state/src/commonMain/kotlin/dev/icerock/moko/mvvm/livedata/StateLiveDataTransforms.kt
index 23ac05bf..aefcb64d 100644
--- a/mvvm-state/src/commonMain/kotlin/dev/icerock/moko/mvvm/livedata/StateLiveDataTransforms.kt
+++ b/mvvm-state/src/commonMain/kotlin/dev/icerock/moko/mvvm/livedata/StateLiveDataTransforms.kt
@@ -11,8 +11,8 @@ fun <IT, E, OT> LiveData<ResourceState<IT, E>>.dataTransform(transform: LiveData
     when (state) {
         is ResourceState.Success -> transform.invoke(MutableLiveData(state.data))
             .map { ResourceState.Success(it) }
-        is ResourceState.Loading -> MutableLiveData(ResourceState.Loading())
-        is ResourceState.Empty -> MutableLiveData(ResourceState.Empty())
+        is ResourceState.Loading -> MutableLiveData(ResourceState.Loading)
+        is ResourceState.Empty -> MutableLiveData(ResourceState.Empty)
         is ResourceState.Failed -> MutableLiveData(ResourceState.Failed(state.error))
     }
 }
@@ -21,10 +21,10 @@ fun <T, IE, OE> LiveData<ResourceState<T, IE>>.errorTransform(transform: LiveDat
         LiveData<ResourceState<T, OE>> = flatMap { state ->
     when (state) {
         is ResourceState.Success -> MutableLiveData(ResourceState.Success(state.data))
-        is ResourceState.Loading -> MutableLiveData(ResourceState.Loading())
-        is ResourceState.Empty -> MutableLiveData(ResourceState.Empty())
+        is ResourceState.Loading -> MutableLiveData(ResourceState.Loading)
+        is ResourceState.Empty -> MutableLiveData(ResourceState.Empty)
         is ResourceState.Failed -> transform.invoke(MutableLiveData(state.error))
-            .map { ResourceState.Failed<T, OE>(it) }
+            .map { ResourceState.Failed(it) }
     }
 }
 
@@ -47,7 +47,7 @@ fun <T, E> LiveData<ResourceState<T, E>>.emptyAsData(dataBuilder: () -> T):
 fun <T, E> LiveData<ResourceState<T, E>>.emptyIf(emptyPredicate: (T) -> Boolean):
         LiveData<ResourceState<T, E>> = map {
     when {
-        it is ResourceState.Success && emptyPredicate(it.data) -> ResourceState.Empty()
+        it is ResourceState.Success && emptyPredicate(it.data) -> ResourceState.Empty
         else -> it
     }
 }
diff --git a/mvvm-state/src/commonTest/kotlin/dev/icerock/moko/mvvm/livedata/LiveDataTest.kt b/mvvm-state/src/commonTest/kotlin/dev/icerock/moko/mvvm/livedata/LiveDataTest.kt
index 3a2f6061..dcb22101 100644
--- a/mvvm-state/src/commonTest/kotlin/dev/icerock/moko/mvvm/livedata/LiveDataTest.kt
+++ b/mvvm-state/src/commonTest/kotlin/dev/icerock/moko/mvvm/livedata/LiveDataTest.kt
@@ -61,7 +61,7 @@ class LiveDataTest {
     @Test
     fun `dataTransform + mergeWith test`() {
         val vmIsAuthorized = MutableLiveData(true)
-        val state: MutableLiveData<ResourceState<Int, Throwable>> = MutableLiveData(ResourceState.Empty())
+        val state: MutableLiveData<ResourceState<Int, Throwable>> = MutableLiveData(ResourceState.Empty)
         val isLoading: MutableLiveData<Boolean> = MutableLiveData<Boolean>(false)
 
         var dataTransformCounter = 0
@@ -91,7 +91,7 @@ class LiveDataTest {
         assertEquals(actual = mergeWithIsAuthorizedCounter, expected = 3)
         assertTrue { result.value.isEmpty() }
 
-        state.value = ResourceState.Loading()
+        state.value = ResourceState.Loading
 
         assertEquals(actual = dataTransformCounter, expected = 0)
         assertEquals(actual = mergeWithDataTransformCounter, expected = 0)