diff --git a/navigation-compose/build.gradle.kts b/navigation-compose/build.gradle.kts
index aa29171..e037982 100644
--- a/navigation-compose/build.gradle.kts
+++ b/navigation-compose/build.gradle.kts
@@ -35,24 +35,8 @@ kotlin {
                 api(project(":navigation-core"))
 
                 implementation(compose.runtime)
-            }
-        }
-        val jvmMain by getting {
-            dependencies {
-                implementation(compose.ui)
-                implementation(compose.material)
-            }
-        }
-        val androidMain by getting {
-            dependencies {
                 implementation(compose.ui)
-                implementation(compose.material)
-                implementation("androidx.activity:activity-compose:1.6.0")
-            }
-        }
-        val jsMain by getting {
-            dependencies {
-                implementation(compose.web.core)
+                implementation(compose.foundation)
             }
         }
     }
diff --git a/navigation-compose/src/androidMain/kotlin/com.chrynan.navigation.compose/AndroidNavContainer.kt b/navigation-compose/src/androidMain/kotlin/com.chrynan.navigation.compose/AndroidNavContainer.kt
deleted file mode 100644
index e971089..0000000
--- a/navigation-compose/src/androidMain/kotlin/com.chrynan.navigation.compose/AndroidNavContainer.kt
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.chrynan.navigation.compose
-
-import androidx.compose.foundation.layout.Box
-import androidx.compose.runtime.*
-import androidx.compose.ui.Modifier
-import com.chrynan.navigation.ExperimentalNavigationApi
-import com.chrynan.navigation.NavigationContext
-import com.chrynan.navigation.NavigationDestination
-import com.chrynan.navigation.Navigator
-
-@Suppress("unused")
-@Composable
-@ExperimentalNavigationApi
-fun <Destination : NavigationDestination, Context : NavigationContext<Destination>> NavContainer(
-    navigator: Navigator<Destination, Context>,
-    modifier: Modifier,
-    content: @Composable ComposeNavigationScope.(context: Context, destination: Destination) -> Unit
-) {
-
-    val context = navigator.state.currentContextAsState()
-    val destination = navigator.state.currentDestinationAsState()
-
-    Box(modifier = modifier) {
-        content(ComposeNavigationScope, context.value, destination.value)
-    }
-}
diff --git a/navigation-compose/src/commonMain/kotlin/com.chrynan.navigation.compose/NavContainer.kt b/navigation-compose/src/commonMain/kotlin/com.chrynan.navigation.compose/NavContainer.kt
index cafb8bc..b3b6300 100644
--- a/navigation-compose/src/commonMain/kotlin/com.chrynan.navigation.compose/NavContainer.kt
+++ b/navigation-compose/src/commonMain/kotlin/com.chrynan.navigation.compose/NavContainer.kt
@@ -1,6 +1,8 @@
 package com.chrynan.navigation.compose
 
+import androidx.compose.foundation.layout.Box
 import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
 import com.chrynan.navigation.ExperimentalNavigationApi
 import com.chrynan.navigation.NavigationContext
 import com.chrynan.navigation.NavigationDestination
@@ -28,3 +30,32 @@ fun <Destination : NavigationDestination, Context : NavigationContext<Destinatio
 
     content(ComposeNavigationScope, context.value, destination.value)
 }
+
+/**
+ * A [Composable] that listens to navigation context and destination changes from the provided [navigator] and calls
+ * the provided [content] [Composable] function with the latest values.
+ *
+ * Example usage:
+ * ```kotlin
+ * NavContainer(
+ *     navigator = navigator,
+ *     modifier = modifier
+ * ) { context, destination ->
+ *     Text("context = $context; destination = $destination")
+ * }
+ * ```
+ */
+@Composable
+@ExperimentalNavigationApi
+fun <Destination : NavigationDestination, Context : NavigationContext<Destination>> NavContainer(
+    navigator: Navigator<Destination, Context>,
+    modifier: Modifier,
+    content: @Composable ComposeNavigationScope.(context: Context, destination: Destination) -> Unit
+) {
+    val context = navigator.state.currentContextAsState()
+    val destination = navigator.state.currentDestinationAsState()
+
+    Box(modifier = modifier) {
+        content(ComposeNavigationScope, context.value, destination.value)
+    }
+}
diff --git a/navigation-compose/src/jvmMain/kotlin/com/chrynan/navigation/compose/JvmNavContainer.kt b/navigation-compose/src/jvmMain/kotlin/com/chrynan/navigation/compose/JvmNavContainer.kt
deleted file mode 100644
index c6dfabb..0000000
--- a/navigation-compose/src/jvmMain/kotlin/com/chrynan/navigation/compose/JvmNavContainer.kt
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.chrynan.navigation.compose
-
-import androidx.compose.foundation.layout.Box
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
-import com.chrynan.navigation.ExperimentalNavigationApi
-import com.chrynan.navigation.NavigationContext
-import com.chrynan.navigation.NavigationDestination
-import com.chrynan.navigation.Navigator
-
-@Suppress("unused")
-@Composable
-@ExperimentalNavigationApi
-fun <Destination : NavigationDestination, Context : NavigationContext<Destination>> NavContainer(
-    navigator: Navigator<Destination, Context>,
-    modifier: Modifier,
-    content: @Composable ComposeNavigationScope.(context: Context, destination: Destination) -> Unit
-) {
-    val context = navigator.state.currentContextAsState()
-    val destination = navigator.state.currentDestinationAsState()
-
-    Box(modifier = modifier) {
-        content(ComposeNavigationScope, context.value, destination.value)
-    }
-}