5 files changed, 39 insertions, 2 deletions
diff --git a/MediaBrowser.Model/Channels/ChannelQuery.cs b/MediaBrowser.Model/Channels/ChannelQuery.cs
index bd2accf65..a2f428869 100644
--- a/MediaBrowser.Model/Channels/ChannelQuery.cs
+++ b/MediaBrowser.Model/Channels/ChannelQuery.cs
@@ -43,9 +43,17 @@
         /// <value>The limit.</value>
         public int? Limit { get; set; }
 
+        /// <summary>
+        /// Gets or sets the content types.
+        /// </summary>
+        /// <value>The content types.</value>
+        public ChannelMediaContentType[] ContentTypes { get; set; }
+
         public AllChannelMediaQuery()
         {
             ChannelIds = new string[] { };
+
+            ContentTypes = new ChannelMediaContentType[] { };
         }
     }
 
diff --git a/MediaBrowser.Model/Entities/MediaStream.cs b/MediaBrowser.Model/Entities/MediaStream.cs
index 683cad253..6ae620908 100644
--- a/MediaBrowser.Model/Entities/MediaStream.cs
+++ b/MediaBrowser.Model/Entities/MediaStream.cs
@@ -1,7 +1,6 @@
-using System;
+using MediaBrowser.Model.Extensions;
 using System.Diagnostics;
 using System.Runtime.Serialization;
-using MediaBrowser.Model.Extensions;
 
 namespace MediaBrowser.Model.Entities
 {
diff --git a/MediaBrowser.Model/Library/UserViewQuery.cs b/MediaBrowser.Model/Library/UserViewQuery.cs
new file mode 100644
index 000000000..cceb22c84
--- /dev/null
+++ b/MediaBrowser.Model/Library/UserViewQuery.cs
@@ -0,0 +1,23 @@
+
+namespace MediaBrowser.Model.Library
+{
+    public class UserViewQuery
+    {
+        /// <summary>
+        /// Gets or sets the user identifier.
+        /// </summary>
+        /// <value>The user identifier.</value>
+        public string UserId { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether [include external content].
+        /// </summary>
+        /// <value><c>true</c> if [include external content]; otherwise, <c>false</c>.</value>
+        public bool IncludeExternalContent { get; set; }
+
+        public UserViewQuery()
+        {
+            IncludeExternalContent = true;
+        }
+    }
+}
diff --git a/MediaBrowser.Model/LiveTv/ProgramInfoDto.cs b/MediaBrowser.Model/LiveTv/ProgramInfoDto.cs
index 0a2873ef3..644af027d 100644
--- a/MediaBrowser.Model/LiveTv/ProgramInfoDto.cs
+++ b/MediaBrowser.Model/LiveTv/ProgramInfoDto.cs
@@ -28,6 +28,12 @@ namespace MediaBrowser.Model.LiveTv
         /// </summary>
         /// <value>The original primary image aspect ratio.</value>
         public double? OriginalPrimaryImageAspectRatio { get; set; }
+
+        /// <summary>
+        /// Gets or sets the type of the media.
+        /// </summary>
+        /// <value>The type of the media.</value>
+        public string MediaType { get; set; }
         
         /// <summary>
         /// Gets or sets the timer identifier.
diff --git a/MediaBrowser.Model/MediaBrowser.Model.csproj b/MediaBrowser.Model/MediaBrowser.Model.csproj
index 0441f91ea..99a5f6692 100644
--- a/MediaBrowser.Model/MediaBrowser.Model.csproj
+++ b/MediaBrowser.Model/MediaBrowser.Model.csproj
@@ -157,6 +157,7 @@
     <Compile Include="Globalization\LocalizatonOption.cs" />
     <Compile Include="IO\FileSystemEntryType.cs" />
     <Compile Include="Library\PlayAccess.cs" />
+    <Compile Include="Library\UserViewQuery.cs" />
     <Compile Include="LiveTv\BaseTimerInfoDto.cs" />
     <Compile Include="LiveTv\ChannelInfoDto.cs" />
     <Compile Include="LiveTv\LiveTvChannelQuery.cs" />