3 files changed, 40 insertions, 0 deletions
diff --git a/MediaBrowser.Model/Entities/Movies/BoxSet.cs b/MediaBrowser.Model/Entities/Movies/BoxSet.cs
new file mode 100644
index 0000000000..35097fd613
--- /dev/null
+++ b/MediaBrowser.Model/Entities/Movies/BoxSet.cs
@@ -0,0 +1,7 @@
+
+namespace MediaBrowser.Model.Entities.Movies
+{
+    public class BoxSet : Folder
+    {
+    }
+}
diff --git a/MediaBrowser.Model/Entities/Movies/Movie.cs b/MediaBrowser.Model/Entities/Movies/Movie.cs
new file mode 100644
index 0000000000..23203da94a
--- /dev/null
+++ b/MediaBrowser.Model/Entities/Movies/Movie.cs
@@ -0,0 +1,31 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace MediaBrowser.Model.Entities.Movies
+{
+    public class Movie : Video
+    {
+        public IEnumerable<Video> SpecialFeatures { get; set; }
+
+        /// <summary>
+        /// Finds an item by ID, recursively
+        /// </summary>
+        public override BaseItem FindItemById(Guid id)
+        {
+            var item = base.FindItemById(id);
+
+            if (item != null)
+            {
+                return item;
+            }
+
+            if (SpecialFeatures != null)
+            {
+                return SpecialFeatures.FirstOrDefault(i => i.Id == id);
+            }
+
+            return null;
+        }
+    }
+}
diff --git a/MediaBrowser.Model/MediaBrowser.Model.csproj b/MediaBrowser.Model/MediaBrowser.Model.csproj
index 8b51f6ec46..aeb75d7f18 100644
--- a/MediaBrowser.Model/MediaBrowser.Model.csproj
+++ b/MediaBrowser.Model/MediaBrowser.Model.csproj
@@ -50,6 +50,8 @@
     <Compile Include="Entities\IHasProviderIds.cs" />
     <Compile Include="Entities\ItemSpecialCounts.cs" />
     <Compile Include="Entities\MetadataProviders.cs" />
+    <Compile Include="Entities\Movies\BoxSet.cs" />
+    <Compile Include="Entities\Movies\Movie.cs" />
     <Compile Include="Entities\Person.cs" />
     <Compile Include="Entities\Studio.cs" />
     <Compile Include="Entities\Video.cs" />