3 files changed, 69 insertions, 9 deletions

diff --git a/MediaBrowser.Model/LiveTv/LiveTvOptions.cs b/MediaBrowser.Model/LiveTv/LiveTvOptions.cs
index 32a9c8d12..0cd5eda0c 100644
--- a/MediaBrowser.Model/LiveTv/LiveTvOptions.cs
+++ b/MediaBrowser.Model/LiveTv/LiveTvOptions.cs
@@ -3,5 +3,6 @@
     public class LiveTvOptions
     {
         public int? GuideDays { get; set; }
+        public bool EnableMovieProviders { get; set; }
     }
 }
\ No newline at end of file
diff --git a/MediaBrowser.Model/LiveTv/ProgramQuery.cs b/MediaBrowser.Model/LiveTv/ProgramQuery.cs
index 2d15a4c4b..bbd396c33 100644
--- a/MediaBrowser.Model/LiveTv/ProgramQuery.cs
+++ b/MediaBrowser.Model/LiveTv/ProgramQuery.cs
@@ -1,4 +1,5 @@
-using System;
+using MediaBrowser.Model.Entities;
+using System;
 
 namespace MediaBrowser.Model.LiveTv
 {
@@ -7,11 +8,18 @@ namespace MediaBrowser.Model.LiveTv
     /// </summary>
     public class ProgramQuery
     {
+        public ProgramQuery()
+        {
+            ChannelIds = new string[] { };
+            SortBy = new string[] { };
+            Genres = new string[] { };
+        }
+
         /// <summary>
-        /// Gets or sets the channel identifier.
+        /// Gets or sets the channel ids.
         /// </summary>
-        /// <value>The channel identifier.</value>
-        public string[] ChannelIdList { get; set; }
+        /// <value>The channel ids.</value>
+        public string[] ChannelIds { get; set; }
 
         /// <summary>
         /// Gets or sets the user identifier.
@@ -19,19 +27,64 @@ namespace MediaBrowser.Model.LiveTv
         /// <value>The user identifier.</value>
         public string UserId { get; set; }
 
+        /// <summary>
+        /// The earliest date for which a program starts to return
+        /// </summary>
         public DateTime? MinStartDate { get; set; }
 
+        /// <summary>
+        /// The latest date for which a program starts to return
+        /// </summary>
         public DateTime? MaxStartDate { get; set; }
 
+        /// <summary>
+        /// The earliest date for which a program ends to return
+        /// </summary>
         public DateTime? MinEndDate { get; set; }
 
+        /// <summary>
+        /// The latest date for which a program ends to return
+        /// </summary>
         public DateTime? MaxEndDate { get; set; }
 
+        /// <summary>
+        /// Used to specific whether to return movies or not
+        /// </summary>
+        /// <remarks>If set to null, all programs will be returned</remarks>
+        public bool? IsMovie { get; set; }
+
+        /// <summary>
+        /// Skips over a given number of items within the results. Use for paging.
+        /// </summary>
+        public int? StartIndex { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether this instance has aired.
+        /// </summary>
+        /// <value><c>null</c> if [has aired] contains no value, <c>true</c> if [has aired]; otherwise, <c>false</c>.</value>
         public bool? HasAired { get; set; }
 
-        public ProgramQuery()
-        {
-            ChannelIdList = new string[] { };
-        }
+        /// <summary>
+        /// The maximum number of items to return
+        /// </summary>
+        public int? Limit { get; set; }
+
+        /// <summary>
+        /// What to sort the results by
+        /// </summary>
+        /// <value>The sort by.</value>
+        public string[] SortBy { get; set; }
+
+        /// <summary>
+        /// The sort order to return results with
+        /// </summary>
+        /// <value>The sort order.</value>
+        public SortOrder? SortOrder { get; set; }
+
+        /// <summary>
+        /// Limit results to items containing specific genres
+        /// </summary>
+        /// <value>The genres.</value>
+        public string[] Genres { get; set; }
     }
-}
+}
\ No newline at end of file
diff --git a/MediaBrowser.Model/LiveTv/RecommendedProgramQuery.cs b/MediaBrowser.Model/LiveTv/RecommendedProgramQuery.cs
index 907902123..9ba8e0e5f 100644
--- a/MediaBrowser.Model/LiveTv/RecommendedProgramQuery.cs
+++ b/MediaBrowser.Model/LiveTv/RecommendedProgramQuery.cs
@@ -25,5 +25,11 @@
         /// </summary>
         /// <value>The limit.</value>
         public int? Limit { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether this instance is movie.
+        /// </summary>
+        /// <value><c>null</c> if [is movie] contains no value, <c>true</c> if [is movie]; otherwise, <c>false</c>.</value>
+        public bool? IsMovie { get; set; }
     }
 }
\ No newline at end of file