8 files changed, 34 insertions, 5 deletions
diff --git a/MediaBrowser.Model/ApiClient/IConnectionManager.cs b/MediaBrowser.Model/ApiClient/IConnectionManager.cs
index 93aef7a7d..339522b01 100644
--- a/MediaBrowser.Model/ApiClient/IConnectionManager.cs
+++ b/MediaBrowser.Model/ApiClient/IConnectionManager.cs
@@ -43,8 +43,8 @@ namespace MediaBrowser.Model.ApiClient
         /// Gets the API client.
         /// </summary>
         /// <param name="item">The item.</param>
-        /// <returns>MediaBrowser.Model.ApiClient.IApiClient.</returns>
-        IApiClient GetApiClient(BaseItemDto item);
+        /// <returns>IApiClient.</returns>
+        IApiClient GetApiClient(IHasServerId item);
 
         /// <summary>
         /// Connects the specified cancellation token.
diff --git a/MediaBrowser.Model/Configuration/MetadataConfiguration.cs b/MediaBrowser.Model/Configuration/MetadataConfiguration.cs
index 082c61c97..d1658e5d6 100644
--- a/MediaBrowser.Model/Configuration/MetadataConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/MetadataConfiguration.cs
@@ -4,5 +4,10 @@ namespace MediaBrowser.Model.Configuration
     public class MetadataConfiguration
     {
         public bool UseFileCreationTimeForDateAdded { get; set; }
+
+        public MetadataConfiguration()
+        {
+            UseFileCreationTimeForDateAdded = true;
+        }
     }
 }
diff --git a/MediaBrowser.Model/Configuration/UserConfiguration.cs b/MediaBrowser.Model/Configuration/UserConfiguration.cs
index c162e389b..ab0cb83c8 100644
--- a/MediaBrowser.Model/Configuration/UserConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/UserConfiguration.cs
@@ -88,6 +88,8 @@ namespace MediaBrowser.Model.Configuration
 
         public AccessSchedule[] AccessSchedules { get; set; }
 
+        public bool EnableUserPreferenceAccess { get; set; }
+        
         /// <summary>
         /// Initializes a new instance of the <see cref="UserConfiguration" /> class.
         /// </summary>
@@ -112,6 +114,7 @@ namespace MediaBrowser.Model.Configuration
             SyncConnectImage = true;
             IncludeTrailersInSuggestions = true;
             EnableCinemaMode = true;
+            EnableUserPreferenceAccess = true;
 
             AccessSchedules = new AccessSchedule[] { };
         }
diff --git a/MediaBrowser.Model/Devices/LocalFileInfo.cs b/MediaBrowser.Model/Devices/LocalFileInfo.cs
index f7704e087..e7a78bf8b 100644
--- a/MediaBrowser.Model/Devices/LocalFileInfo.cs
+++ b/MediaBrowser.Model/Devices/LocalFileInfo.cs
@@ -4,7 +4,7 @@ namespace MediaBrowser.Model.Devices
     public class LocalFileInfo
     {
         public string Name { get; set; }
-        public string FullPath { get; set; }
+        public string Id { get; set; }
         public string Album { get; set; }
         public string MimeType { get; set; }
     }
diff --git a/MediaBrowser.Model/Dto/BaseItemDto.cs b/MediaBrowser.Model/Dto/BaseItemDto.cs
index e37334c6c..a9f13374b 100644
--- a/MediaBrowser.Model/Dto/BaseItemDto.cs
+++ b/MediaBrowser.Model/Dto/BaseItemDto.cs
@@ -16,7 +16,7 @@ namespace MediaBrowser.Model.Dto
     /// This holds information about a BaseItem in a format that is convenient for the client.
     /// </summary>
     [DebuggerDisplay("Name = {Name}, ID = {Id}, Type = {Type}")]
-    public class BaseItemDto : IHasProviderIds, IHasPropertyChangedEvent, IItemDto
+    public class BaseItemDto : IHasProviderIds, IHasPropertyChangedEvent, IItemDto, IHasServerId
     {
         /// <summary>
         /// Gets or sets the name.
@@ -25,6 +25,12 @@ namespace MediaBrowser.Model.Dto
         public string Name { get; set; }
 
         /// <summary>
+        /// Gets or sets the server identifier.
+        /// </summary>
+        /// <value>The server identifier.</value>
+        public string ServerId { get; set; }
+        
+        /// <summary>
         /// Gets or sets the id.
         /// </summary>
         /// <value>The id.</value>
diff --git a/MediaBrowser.Model/Dto/IHasServerId.cs b/MediaBrowser.Model/Dto/IHasServerId.cs
new file mode 100644
index 000000000..0515203da
--- /dev/null
+++ b/MediaBrowser.Model/Dto/IHasServerId.cs
@@ -0,0 +1,8 @@
+
+namespace MediaBrowser.Model.Dto
+{
+    public interface IHasServerId
+    {
+        string ServerId { get; }
+    }
+}
diff --git a/MediaBrowser.Model/Dto/UserDto.cs b/MediaBrowser.Model/Dto/UserDto.cs
index 007c634b6..793a7efd2 100644
--- a/MediaBrowser.Model/Dto/UserDto.cs
+++ b/MediaBrowser.Model/Dto/UserDto.cs
@@ -12,7 +12,7 @@ namespace MediaBrowser.Model.Dto
     /// Class UserDto
     /// </summary>
     [DebuggerDisplay("Name = {Name}, ID = {Id}, HasPassword = {HasPassword}")]
-    public class UserDto : IHasPropertyChangedEvent, IItemDto
+    public class UserDto : IHasPropertyChangedEvent, IItemDto, IHasServerId
     {
         /// <summary>
         /// Gets or sets the name.
@@ -21,6 +21,12 @@ namespace MediaBrowser.Model.Dto
         public string Name { get; set; }
 
         /// <summary>
+        /// Gets or sets the server identifier.
+        /// </summary>
+        /// <value>The server identifier.</value>
+        public string ServerId { get; set; }
+        
+        /// <summary>
         /// Gets or sets the name of the connect user.
         /// </summary>
         /// <value>The name of the connect user.</value>
diff --git a/MediaBrowser.Model/MediaBrowser.Model.csproj b/MediaBrowser.Model/MediaBrowser.Model.csproj
index 32f655ae7..549023303 100644
--- a/MediaBrowser.Model/MediaBrowser.Model.csproj
+++ b/MediaBrowser.Model/MediaBrowser.Model.csproj
@@ -121,6 +121,7 @@
     <Compile Include="Dlna\SubtitleDeliveryMethod.cs" />
     <Compile Include="Dlna\SubtitleStreamInfo.cs" />
     <Compile Include="Drawing\ImageOrientation.cs" />
+    <Compile Include="Dto\IHasServerId.cs" />
     <Compile Include="Dto\MediaSourceType.cs" />
     <Compile Include="Dto\StreamOptions.cs" />
     <Compile Include="Dto\VideoStreamOptions.cs" />