diff --git a/core-ui/src/main/java/com/hoc/flowmvi/core_ui/parcelable.kt b/core-ui/src/main/java/com/hoc/flowmvi/core_ui/parcelable.kt
index 0e8e3d88..3988a011 100644
--- a/core-ui/src/main/java/com/hoc/flowmvi/core_ui/parcelable.kt
+++ b/core-ui/src/main/java/com/hoc/flowmvi/core_ui/parcelable.kt
@@ -1,30 +1,23 @@
 package com.hoc.flowmvi.core_ui
 
 import android.content.Intent
-import android.os.Build
 import android.os.Bundle
 import android.os.Parcelable
+import androidx.core.content.IntentCompat
+import androidx.core.os.BundleCompat
 
 /**
- * https://stackoverflow.com/a/73311814/11191424
+ * Wrapper around [IntentCompat.getParcelableExtra] for type-safe parcelable retrieval.
+ *
+ * @see IntentCompat.getParcelableExtra
  */
 inline fun <reified T : Parcelable> Intent.parcelable(key: String): T? =
-  // TODO: Use `>`, because https://issuetracker.google.com/issues/240585930#comment6
-  if (Build.VERSION.SDK_INT > Build.VERSION_CODES.TIRAMISU) {
-    getParcelableExtra(key, T::class.java)
-  } else {
-    @Suppress("DEPRECATION")
-    getParcelableExtra(key)
-  }
+  IntentCompat.getParcelableExtra(this, key, T::class.java)
 
 /**
- * https://stackoverflow.com/a/73311814/11191424
+ * Wrapper around [BundleCompat.getParcelable] for type-safe parcelable retrieval.
+ *
+ * @see BundleCompat.getParcelable
  */
 inline fun <reified T : Parcelable> Bundle.parcelable(key: String): T? =
-  // TODO: Use `>`, because https://issuetracker.google.com/issues/240585930#comment6
-  if (Build.VERSION.SDK_INT > Build.VERSION_CODES.TIRAMISU) {
-    getParcelable(key, T::class.java)
-  } else {
-    @Suppress("DEPRECATION")
-    getParcelable(key)
-  }
+  BundleCompat.getParcelable(this, key, T::class.java)