diff --git a/src/PepperDash.Essentials.Core/DeviceTypeInterfaces/ISelectableItems.cs b/src/PepperDash.Essentials.Core/DeviceTypeInterfaces/ISelectableItems.cs
index 0d3968df..9479099c 100644
--- a/src/PepperDash.Essentials.Core/DeviceTypeInterfaces/ISelectableItems.cs
+++ b/src/PepperDash.Essentials.Core/DeviceTypeInterfaces/ISelectableItems.cs
@@ -4,19 +4,24 @@ using System.Collections.Generic;
 
 namespace PepperDash.Essentials.Core.DeviceTypeInterfaces
 {
-    /// <summary>
-    /// Describes a collection of items that can be selected
-    /// </summary>
-    /// <typeparam name="TKey">type for the keys in the collection.  Probably a string or enum</typeparam>
-    public interface ISelectableItems<TKey>
+    public interface ISelectableItems<TKey, TValue> where TValue : ISelectableItem
     {
         event EventHandler ItemsUpdated;
         event EventHandler CurrentItemChanged;
 
         [JsonProperty("items")]
-        Dictionary<TKey, ISelectableItem> Items { get; set; }
+        Dictionary<TKey, TValue> Items { get; set; }
 
         [JsonProperty("currentItem")]
         TKey CurrentItem { get; set; }
+
+    }
+
+    /// <summary>
+    /// Describes a collection of items that can be selected
+    /// </summary>
+    /// <typeparam name="TKey">type for the keys in the collection.  Probably a string or enum</typeparam>
+    public interface ISelectableItems<TKey> : ISelectableItems<TKey, ISelectableItem>
+    {        
     }
 }
\ No newline at end of file
diff --git a/src/PepperDash.Essentials.Core/Lighting/Lighting Interfaces.cs b/src/PepperDash.Essentials.Core/Lighting/Lighting Interfaces.cs
index 1ff0508f..c762147c 100644
--- a/src/PepperDash.Essentials.Core/Lighting/Lighting Interfaces.cs	
+++ b/src/PepperDash.Essentials.Core/Lighting/Lighting Interfaces.cs	
@@ -18,7 +18,7 @@ namespace PepperDash.Essentials.Core.Lighting
 
     }
 
-    public interface ILightingScenesDynamic
+    public interface ILightingScenesDynamic : ILightingScenes
     {
         event EventHandler LightingScenesUpdated;
     }