diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index d8d3993c..9f770f19 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -7,15 +7,6 @@
           <package name="io.ktor" alias="false" withSubpackages="true" />
         </value>
       </option>
-      <option name="PACKAGES_IMPORT_LAYOUT">
-        <value>
-          <package name="" alias="false" withSubpackages="true" />
-          <package name="java" alias="false" withSubpackages="true" />
-          <package name="javax" alias="false" withSubpackages="true" />
-          <package name="kotlin" alias="false" withSubpackages="true" />
-          <package name="" alias="true" withSubpackages="true" />
-        </value>
-      </option>
       <option name="NAME_COUNT_TO_USE_STAR_IMPORT" value="2147483647" />
       <option name="NAME_COUNT_TO_USE_STAR_IMPORT_FOR_MEMBERS" value="2147483647" />
       <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 61a9130c..fb7f4a8a 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="1.8" />
+    <bytecodeTargetLevel target="11" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 25daa0e7..dc743493 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -4,7 +4,7 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <option name="testRunner" value="PLATFORM" />
+        <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="modules">
@@ -20,7 +20,6 @@
           </set>
         </option>
         <option name="resolveModulePerSourceSet" value="false" />
-        <option name="useQualifiedModuleNames" value="true" />
       </GradleProjectSettings>
     </option>
   </component>
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
index 0dd4b354..6d4f6e02 100644
--- a/.idea/kotlinc.xml
+++ b/.idea/kotlinc.xml
@@ -3,4 +3,8 @@
   <component name="Kotlin2JvmCompilerArguments">
     <option name="jvmTarget" value="1.8" />
   </component>
+  <component name="KotlinCommonCompilerArguments">
+    <option name="apiVersion" value="1.5" />
+    <option name="languageVersion" value="1.5" />
+  </component>
 </project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index d5d35ec4..ef61796f 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/core/src/main/java/com/hoc/flowmvi/core/CollectIn.kt b/core/src/main/java/com/hoc/flowmvi/core/CollectIn.kt
new file mode 100644
index 00000000..da7e2952
--- /dev/null
+++ b/core/src/main/java/com/hoc/flowmvi/core/CollectIn.kt
@@ -0,0 +1,35 @@
+package com.hoc.flowmvi.core
+
+import android.util.Log
+import androidx.fragment.app.Fragment
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.LifecycleOwner
+import androidx.lifecycle.addRepeatingJob
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.collect
+import kotlin.coroutines.CoroutineContext
+import kotlin.coroutines.EmptyCoroutineContext
+
+inline fun <T> Flow<T>.collectIn(
+  owner: LifecycleOwner,
+  minActiveState: Lifecycle.State = Lifecycle.State.STARTED,
+  coroutineContext: CoroutineContext = EmptyCoroutineContext,
+  crossinline action: suspend (value: T) -> Unit,
+): Job = owner.addRepeatingJob(state = minActiveState, coroutineContext = coroutineContext) {
+  Log.d("collectIn", "Start collecting...")
+  collect { action(it) }
+}
+
+@Suppress("unused")
+inline fun <T> Flow<T>.collectIn(
+  fragment: Fragment,
+  minActiveState: Lifecycle.State = Lifecycle.State.STARTED,
+  coroutineContext: CoroutineContext = EmptyCoroutineContext,
+  crossinline action: suspend (value: T) -> Unit,
+): Job = collectIn(
+  fragment.viewLifecycleOwner,
+  minActiveState = minActiveState,
+  coroutineContext = coroutineContext,
+  action = action,
+)
diff --git a/feature-add/src/main/java/com/hoc/flowmvi/ui/add/AddActivity.kt b/feature-add/src/main/java/com/hoc/flowmvi/ui/add/AddActivity.kt
index 89f89272..6956eaa8 100644
--- a/feature-add/src/main/java/com/hoc/flowmvi/ui/add/AddActivity.kt
+++ b/feature-add/src/main/java/com/hoc/flowmvi/ui/add/AddActivity.kt
@@ -7,12 +7,11 @@ import android.util.Log
 import android.view.MenuItem
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.view.isInvisible
-import androidx.lifecycle.Lifecycle
-import androidx.lifecycle.flowWithLifecycle
 import androidx.lifecycle.lifecycleScope
 import androidx.transition.AutoTransition
 import androidx.transition.TransitionManager
 import com.hoc.flowmvi.core.clicks
+import com.hoc.flowmvi.core.collectIn
 import com.hoc.flowmvi.core.firstChange
 import com.hoc.flowmvi.core.navigator.IntentProviders
 import com.hoc.flowmvi.core.textChanges
@@ -53,15 +52,11 @@ class AddActivity : AppCompatActivity() {
   private fun bindVM(addVM: AddVM) {
     // observe view model
     addVM.viewState
-      .onEach { render(it) }
-      .flowWithLifecycle(lifecycle, Lifecycle.State.STARTED)
-      .launchIn(lifecycleScope)
+      .collectIn(this) { render(it) }
 
     // observe single event
     addVM.singleEvent
-      .onEach { handleSingleEvent(it) }
-      .flowWithLifecycle(lifecycle, Lifecycle.State.STARTED)
-      .launchIn(lifecycleScope)
+      .collectIn(this) { handleSingleEvent(it) }
 
     // pass view intent to view model
     intents()
diff --git a/feature-add/src/main/java/com/hoc/flowmvi/ui/add/AddVM.kt b/feature-add/src/main/java/com/hoc/flowmvi/ui/add/AddVM.kt
index d781e5a6..c27a91d9 100644
--- a/feature-add/src/main/java/com/hoc/flowmvi/ui/add/AddVM.kt
+++ b/feature-add/src/main/java/com/hoc/flowmvi/ui/add/AddVM.kt
@@ -19,6 +19,7 @@ import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.catch
 import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.filterIsInstance
 import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.flow.map
@@ -47,9 +48,9 @@ internal class AddVM(
 
   init {
     val initialVS = ViewState.initial(
-      email = savedStateHandle.get<String?>("email"),
-      firstName = savedStateHandle.get<String?>("first_name"),
-      lastName = savedStateHandle.get<String?>("last_name"),
+      email = savedStateHandle.get<String?>(EMAIL_KEY),
+      firstName = savedStateHandle.get<String?>(FIRST_NAME_KEY),
+      lastName = savedStateHandle.get<String?>(LAST_NAME_KEY),
     )
     Log.d("###", "[ADD_VM] initialVS: $initialVS")
 
@@ -85,6 +86,7 @@ internal class AddVM(
   private fun Flow<ViewIntent>.toPartialStateChangesFlow(): Flow<PartialStateChange> {
     val emailErrors = filterIsInstance<ViewIntent.EmailChanged>()
       .map { it.email }
+      .distinctUntilChanged()
       .map { validateEmail(it) to it }
       .shareIn(
         scope = viewModelScope,
@@ -93,6 +95,7 @@ internal class AddVM(
 
     val firstNameErrors = filterIsInstance<ViewIntent.FirstNameChanged>()
       .map { it.firstName }
+      .distinctUntilChanged()
       .map { validateFirstName(it) to it }
       .shareIn(
         scope = viewModelScope,
@@ -101,6 +104,7 @@ internal class AddVM(
 
     val lastNameErrors = filterIsInstance<ViewIntent.LastNameChanged>()
       .map { it.lastName }
+      .distinctUntilChanged()
       .map { validateLastName(it) to it }
       .shareIn(
         scope = viewModelScope,
@@ -151,15 +155,15 @@ internal class AddVM(
     val formValuesChanges = merge(
       emailErrors
         .map { it.second }
-        .onEach { savedStateHandle.set("email", it) }
+        .onEach { savedStateHandle.set(EMAIL_KEY, it) }
         .map { PartialStateChange.FormValueChange.EmailChanged(it) },
       firstNameErrors
         .map { it.second }
-        .onEach { savedStateHandle.set("first_name", it) }
+        .onEach { savedStateHandle.set(FIRST_NAME_KEY, it) }
         .map { PartialStateChange.FormValueChange.FirstNameChanged(it) },
       lastNameErrors
         .map { it.second }
-        .onEach { savedStateHandle.set("last_name", it) }
+        .onEach { savedStateHandle.set(LAST_NAME_KEY, it) }
         .map { PartialStateChange.FormValueChange.LastNameChanged(it) },
     )
 
@@ -178,6 +182,10 @@ internal class AddVM(
   }
 
   private companion object {
+    const val EMAIL_KEY = "email"
+    const val FIRST_NAME_KEY = "first_name"
+    const val LAST_NAME_KEY = "last_name"
+
     const val MIN_LENGTH_FIRST_NAME = 3
     const val MIN_LENGTH_LAST_NAME = 3
 
diff --git a/feature-main/src/main/java/com/hoc/flowmvi/ui/main/MainActivity.kt b/feature-main/src/main/java/com/hoc/flowmvi/ui/main/MainActivity.kt
index f2bef2ac..76b32306 100644
--- a/feature-main/src/main/java/com/hoc/flowmvi/ui/main/MainActivity.kt
+++ b/feature-main/src/main/java/com/hoc/flowmvi/ui/main/MainActivity.kt
@@ -6,8 +6,6 @@ import android.view.Menu
 import android.view.MenuItem
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.view.isVisible
-import androidx.lifecycle.Lifecycle
-import androidx.lifecycle.flowWithLifecycle
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.DividerItemDecoration
 import androidx.recyclerview.widget.ItemTouchHelper
@@ -15,6 +13,7 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.hoc.flowmvi.core.SwipeLeftToDeleteCallback
 import com.hoc.flowmvi.core.clicks
+import com.hoc.flowmvi.core.collectIn
 import com.hoc.flowmvi.core.navigator.Navigator
 import com.hoc.flowmvi.core.refreshes
 import com.hoc.flowmvi.core.safeOffer
@@ -86,15 +85,11 @@ class MainActivity : AppCompatActivity() {
   private fun bindVM(mainVM: MainVM) {
     // observe view model
     mainVM.viewState
-      .onEach { render(it) }
-      .flowWithLifecycle(lifecycle, Lifecycle.State.STARTED)
-      .launchIn(lifecycleScope)
+      .collectIn(this) { render(it) }
 
     // observe single event
     mainVM.singleEvent
-      .onEach { handleSingleEvent(it) }
-      .flowWithLifecycle(lifecycle, Lifecycle.State.STARTED)
-      .launchIn(lifecycleScope)
+      .collectIn(this) { handleSingleEvent(it) }
 
     // pass view intent to view model
     intents()