3 files changed, 90 insertions, 0 deletions
diff --git a/MediaBrowser.Model/Configuration/UserConfiguration.cs b/MediaBrowser.Model/Configuration/UserConfiguration.cs
index ba4726956..c306c7775 100644
--- a/MediaBrowser.Model/Configuration/UserConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/UserConfiguration.cs
@@ -68,6 +68,7 @@ namespace MediaBrowser.Model.Configuration
         public bool BlockUnratedBooks { get; set; }
 
         public bool EnableLiveTvManagement { get; set; }
+        public bool EnableLiveTvAccess { get; set; }
 
         public bool EnableMediaPlayback { get; set; }
         
@@ -82,6 +83,7 @@ namespace MediaBrowser.Model.Configuration
 
             EnableLiveTvManagement = true;
             EnableMediaPlayback = true;
+            EnableLiveTvAccess = true;
         }
     }
 }
diff --git a/MediaBrowser.Model/FileOrganization/FileOrganizationResult.cs b/MediaBrowser.Model/FileOrganization/FileOrganizationResult.cs
index d2d52f4aa..e01df6d94 100644
--- a/MediaBrowser.Model/FileOrganization/FileOrganizationResult.cs
+++ b/MediaBrowser.Model/FileOrganization/FileOrganizationResult.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 
 namespace MediaBrowser.Model.FileOrganization
 {
@@ -81,6 +82,17 @@ namespace MediaBrowser.Model.FileOrganization
         /// </summary>
         /// <value>The type.</value>
         public FileOrganizerType Type { get; set; }
+
+        /// <summary>
+        /// Gets or sets the duplicate paths.
+        /// </summary>
+        /// <value>The duplicate paths.</value>
+        public List<string> DuplicatePaths { get; set; }
+
+        public FileOrganizationResult()
+        {
+            DuplicatePaths = new List<string>();
+        }
     }
 
     public enum FileSortingStatus
diff --git a/MediaBrowser.Model/LiveTv/LiveTvServiceInfo.cs b/MediaBrowser.Model/LiveTv/LiveTvServiceInfo.cs
index 8597f6720..85f58be3b 100644
--- a/MediaBrowser.Model/LiveTv/LiveTvServiceInfo.cs
+++ b/MediaBrowser.Model/LiveTv/LiveTvServiceInfo.cs
@@ -43,6 +43,13 @@ namespace MediaBrowser.Model.LiveTv
         /// </summary>
         /// <value><c>true</c> if this instance has update available; otherwise, <c>false</c>.</value>
         public bool HasUpdateAvailable { get; set; }
+
+        public List<LiveTvTunerInfoDto> Tuners { get; set; }
+
+        public LiveTvServiceInfo()
+        {
+            Tuners = new List<LiveTvTunerInfoDto>();
+        }
     }
 
     public class GuideInfo
@@ -81,6 +88,12 @@ namespace MediaBrowser.Model.LiveTv
         public bool IsEnabled { get; set; }
 
         /// <summary>
+        /// Gets or sets the enabled users.
+        /// </summary>
+        /// <value>The enabled users.</value>
+        public List<string> EnabledUsers { get; set; }
+
+        /// <summary>
         /// Gets or sets the status.
         /// </summary>
         /// <value>The status.</value>
@@ -95,6 +108,69 @@ namespace MediaBrowser.Model.LiveTv
         public LiveTvInfo()
         {
             Services = new List<LiveTvServiceInfo>();
+            EnabledUsers = new List<string>();
+        }
+    }
+
+    public class LiveTvTunerInfoDto
+    {
+        /// <summary>
+        /// Gets or sets the type of the source.
+        /// </summary>
+        /// <value>The type of the source.</value>
+        public string SourceType { get; set; }
+
+        /// <summary>
+        /// Gets or sets the name.
+        /// </summary>
+        /// <value>The name.</value>
+        public string Name { get; set; }
+
+        /// <summary>
+        /// Gets or sets the identifier.
+        /// </summary>
+        /// <value>The identifier.</value>
+        public string Id { get; set; }
+
+        /// <summary>
+        /// Gets or sets the status.
+        /// </summary>
+        /// <value>The status.</value>
+        public LiveTvTunerStatus Status { get; set; }
+
+        /// <summary>
+        /// Gets or sets the channel identifier.
+        /// </summary>
+        /// <value>The channel identifier.</value>
+        public string ChannelId { get; set; }
+
+        /// <summary>
+        /// Gets or sets the name of the channel.
+        /// </summary>
+        /// <value>The name of the channel.</value>
+        public string ChannelName { get; set; }
+        
+        /// <summary>
+        /// Gets or sets the recording identifier.
+        /// </summary>
+        /// <value>The recording identifier.</value>
+        public string RecordingId { get; set; }
+
+        /// <summary>
+        /// Gets or sets the name of the program.
+        /// </summary>
+        /// <value>The name of the program.</value>
+        public string ProgramName { get; set; }
+
+        /// <summary>
+        /// Gets or sets the clients.
+        /// </summary>
+        /// <value>The clients.</value>
+        public List<string> Clients { get; set; }
+
+        public LiveTvTunerInfoDto()
+        {
+            Clients = new List<string>();
         }
     }