diff --git a/src/PepperDash.Essentials.Core/Routing/IMatrixRouting.cs b/src/PepperDash.Essentials.Core/Routing/IMatrixRouting.cs
index e53ea7ec..7bdd7453 100644
--- a/src/PepperDash.Essentials.Core/Routing/IMatrixRouting.cs
+++ b/src/PepperDash.Essentials.Core/Routing/IMatrixRouting.cs
@@ -2,7 +2,7 @@
 
 namespace PepperDash.Essentials.Core.Routing
 {
-    public interface IMatrixRouting<TInput, TOutput> where TInput : IRoutingInputSlot where TOutput : IRoutingOutputSlot
+    public interface IMatrixRouting<TInput, TOutput> where TInput : IRoutingInputSlot where TOutput : IRoutingOutputSlot<TInput>
     {
         Dictionary<string, TInput> InputSlots { get; }
         Dictionary<string, TOutput> OutputSlots { get; }
diff --git a/src/PepperDash.Essentials.Core/Routing/IRoutingOutputSlot.cs b/src/PepperDash.Essentials.Core/Routing/IRoutingOutputSlot.cs
index a9a4eea2..f8dff8be 100644
--- a/src/PepperDash.Essentials.Core/Routing/IRoutingOutputSlot.cs
+++ b/src/PepperDash.Essentials.Core/Routing/IRoutingOutputSlot.cs
@@ -3,19 +3,19 @@ using System.Collections.Generic;
 
 namespace PepperDash.Essentials.Core.Routing
 {
-    public interface IRoutingOutputSlot : IRoutingSlot
+    public interface IRoutingOutputSlot<TInput> : IRoutingSlot where TInput: IRoutingInputSlot
     {
         event EventHandler OutputSlotChanged;
 
         string RxDeviceKey { get; }
 
-        Dictionary<eRoutingSignalType, RoutingInputSlotBase> CurrentRoutes { get; }
+        Dictionary<eRoutingSignalType, TInput> CurrentRoutes { get; }
     }
 
-    public abstract class RoutingOutputSlotBase : IRoutingOutputSlot
+    public abstract class RoutingOutputSlotBase<TInput> : IRoutingOutputSlot<TInput> where TInput: IRoutingInputSlot
     {
         public abstract string RxDeviceKey { get; }
-        public abstract Dictionary<eRoutingSignalType, RoutingInputSlotBase> CurrentRoutes { get; }
+        public abstract Dictionary<eRoutingSignalType, TInput> CurrentRoutes { get; }
         public abstract int SlotNumber { get; }
         public abstract eRoutingSignalType SupportedSignalTypes { get; }
         public abstract string Name { get; }