diff --git a/CHANGELIST.md b/CHANGELIST.md
index b185315a..7e02e65a 100644
--- a/CHANGELIST.md
+++ b/CHANGELIST.md
@@ -12,6 +12,7 @@
 - Create and use main features for CLI and Check
 - Create and use base feature in Check
 - Create and use base feature in CLI
+- Assign inputs for interactive modes
 
 ### 3.4.2 (2025-09-30)
 
diff --git a/MPF.CLI/Features/InteractiveFeature.cs b/MPF.CLI/Features/InteractiveFeature.cs
index 4b1a6581..70c55165 100644
--- a/MPF.CLI/Features/InteractiveFeature.cs
+++ b/MPF.CLI/Features/InteractiveFeature.cs
@@ -29,6 +29,12 @@ namespace MPF.CLI.Features
         /// <inheritdoc/>
         public override bool ProcessArgs(string[] args, int index)
         {
+            // Cache all args as inputs
+            for (int i = 1; i < args.Length; i++)
+            {
+                Inputs.Add(args[i]);
+            }
+
             // Create return values
             CommandOptions = new Program.CommandOptions
             {
diff --git a/MPF.Check/Features/InteractiveFeature.cs b/MPF.Check/Features/InteractiveFeature.cs
index 0cf9c245..5b838c02 100644
--- a/MPF.Check/Features/InteractiveFeature.cs
+++ b/MPF.Check/Features/InteractiveFeature.cs
@@ -26,6 +26,12 @@ namespace MPF.Check.Features
         /// <inheritdoc/>
         public override bool ProcessArgs(string[] args, int index)
         {
+            // Cache all args as inputs
+            for (int i = 1; i < args.Length; i++)
+            {
+                Inputs.Add(args[i]);
+            }
+
             // Create return values
             CommandOptions = new Program.CommandOptions();
             System = null;