diff --git a/enro-core/src/main/java/dev/enro/core/controller/repository/NavigationHostFactoryRepository.kt b/enro-core/src/main/java/dev/enro/core/controller/repository/NavigationHostFactoryRepository.kt
index 3f11b48f..d0529862 100644
--- a/enro-core/src/main/java/dev/enro/core/controller/repository/NavigationHostFactoryRepository.kt
+++ b/enro-core/src/main/java/dev/enro/core/controller/repository/NavigationHostFactoryRepository.kt
@@ -1,10 +1,14 @@
 package dev.enro.core.controller.repository
 
+import dev.enro.annotations.AdvancedEnroApi
 import dev.enro.core.NavigationContext
 import dev.enro.core.NavigationHostFactory
 import dev.enro.core.NavigationInstruction
 import dev.enro.core.controller.EnroDependencyScope
 
+// The following @OptIn shouldn't be required due to buildSrc/src/main/kotlin/configureAndroid.kt adding an -Xopt-in arg
+// to the Kotlin freeCompilerArgs, but for some reason, lint checks will fail if the @OptIn annotation is not explicitly added.
+@OptIn(AdvancedEnroApi::class)
 internal class NavigationHostFactoryRepository(
     private val dependencyScope: EnroDependencyScope
 ) {
diff --git a/enro-core/src/main/java/dev/enro/core/controller/usecase/AddModuleToController.kt b/enro-core/src/main/java/dev/enro/core/controller/usecase/AddModuleToController.kt
index 77ae9570..a2901dc2 100644
--- a/enro-core/src/main/java/dev/enro/core/controller/usecase/AddModuleToController.kt
+++ b/enro-core/src/main/java/dev/enro/core/controller/usecase/AddModuleToController.kt
@@ -1,8 +1,18 @@
 package dev.enro.core.controller.usecase
 
+import dev.enro.annotations.AdvancedEnroApi
 import dev.enro.core.controller.NavigationModule
-import dev.enro.core.controller.repository.*
+import dev.enro.core.controller.repository.ComposeEnvironmentRepository
+import dev.enro.core.controller.repository.ExecutorRepository
+import dev.enro.core.controller.repository.InstructionInterceptorRepository
+import dev.enro.core.controller.repository.NavigationAnimationRepository
+import dev.enro.core.controller.repository.NavigationBindingRepository
+import dev.enro.core.controller.repository.NavigationHostFactoryRepository
+import dev.enro.core.controller.repository.PluginRepository
 
+// The following @OptIn shouldn't be required due to buildSrc/src/main/kotlin/configureAndroid.kt adding an -Xopt-in arg
+// to the Kotlin freeCompilerArgs, but for some reason, lint checks will fail if the @OptIn annotation is not explicitly added.
+@OptIn(AdvancedEnroApi::class)
 internal class AddModuleToController(
     private val pluginRepository: PluginRepository,
     private val navigationBindingRepository: NavigationBindingRepository,
diff --git a/enro-core/src/main/java/dev/enro/core/controller/usecase/HostInstructionAs.kt b/enro-core/src/main/java/dev/enro/core/controller/usecase/HostInstructionAs.kt
index a1aeb288..e8d2b14d 100644
--- a/enro-core/src/main/java/dev/enro/core/controller/usecase/HostInstructionAs.kt
+++ b/enro-core/src/main/java/dev/enro/core/controller/usecase/HostInstructionAs.kt
@@ -1,10 +1,14 @@
 package dev.enro.core.controller.usecase
 
+import dev.enro.annotations.AdvancedEnroApi
 import dev.enro.core.NavigationContext
 import dev.enro.core.NavigationInstruction
 import dev.enro.core.controller.repository.NavigationBindingRepository
 import dev.enro.core.controller.repository.NavigationHostFactoryRepository
 
+// The following @OptIn shouldn't be required due to buildSrc/src/main/kotlin/configureAndroid.kt adding an -Xopt-in arg
+// to the Kotlin freeCompilerArgs, but for some reason, lint checks will fail if the @OptIn annotation is not explicitly added.
+@OptIn(AdvancedEnroApi::class)
 internal class HostInstructionAs(
     private val navigationHostFactoryRepository: NavigationHostFactoryRepository,
     private val navigationBindingRepository: NavigationBindingRepository,