diff --git a/Emby.ApiClient/ConnectService.cs b/Emby.ApiClient/ConnectService.cs
deleted file mode 100644
index ec08df7..0000000
--- a/Emby.ApiClient/ConnectService.cs
+++ /dev/null
@@ -1,324 +0,0 @@
-using MediaBrowser.Model.ApiClient;
-using MediaBrowser.Model.Connect;
-using MediaBrowser.Model.Entities;
-using MediaBrowser.Model.Logging;
-using MediaBrowser.Model.Serialization;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-using Emby.ApiClient.Cryptography;
-using Emby.ApiClient.Net;
-
-namespace Emby.ApiClient
-{
-    public class ConnectService
-    {
-        internal IJsonSerializer JsonSerializer { get; set; }
-        private readonly ILogger _logger;
-        private readonly IAsyncHttpClient _httpClient;
-        private readonly ICryptographyProvider _cryptographyProvider;
-        private readonly string _appName;
-        private readonly string _appVersion;
-
-        public ConnectService(IJsonSerializer jsonSerializer, ILogger logger, IAsyncHttpClient httpClient, ICryptographyProvider cryptographyProvider, string appName, string appVersion)
-        {
-            JsonSerializer = jsonSerializer;
-            _logger = logger;
-            _httpClient = httpClient;
-            _cryptographyProvider = cryptographyProvider;
-            _appName = appName;
-            _appVersion = appVersion;
-        }
-
-        public static string GetConnectPasswordMd5(string password, ICryptographyProvider cryptographyProvider)
-        {
-            password = ConnectPassword.PerformPreHashFilter(password ?? string.Empty);
-
-            var bytes = Encoding.UTF8.GetBytes(password);
-
-            bytes = cryptographyProvider.CreateMD5(bytes);
-
-            var hash = BitConverter.ToString(bytes, 0, bytes.Length).Replace("-", string.Empty);
-
-            return hash;
-        }
-
-        public Task<ConnectAuthenticationResult> Authenticate(string username, string password)
-        {
-            var md5 = GetConnectPasswordMd5(password ?? string.Empty, _cryptographyProvider);
-
-            var args = new Dictionary<string, string>
-            {
-                {"nameOrEmail",username},
-                {"password",md5}
-            };
-
-            return PostAsync<ConnectAuthenticationResult>(GetConnectUrl("user/authenticate"), args);
-        }
-
-        public Task Logout(string accessToken)
-        {
-            if (string.IsNullOrWhiteSpace(accessToken))
-            {
-                throw new ArgumentNullException("accessToken");
-            }
-
-            var args = new Dictionary<string, string>
-            {
-            };
-
-            return PostAsync<EmptyRequestResult>(GetConnectUrl("user/logout"), args, accessToken);
-        }
-
-        public Task<PinCreationResult> CreatePin(string deviceId)
-        {
-            var args = new Dictionary<string, string>
-            {
-                {"deviceId",deviceId}
-            };
-
-            return PostAsync<PinCreationResult>(GetConnectUrl("pin"), args);
-        }
-
-        public async Task<PinStatusResult> GetPinStatus(PinCreationResult pin)
-        {
-            var dict = new QueryStringDictionary();
-
-            dict.Add("deviceId", pin.DeviceId);
-            dict.Add("pin", pin.Pin);
-
-            var url = GetConnectUrl("pin") + "?" + dict.GetQueryString();
-
-            var request = new HttpRequest
-            {
-                Method = "GET",
-                Url = url
-
-            };
-
-            AddAppInfo(request, _appName, _appVersion);
-
-            using (var stream = await _httpClient.SendAsync(request).ConfigureAwait(false))
-            {
-                return JsonSerializer.DeserializeFromStream<PinStatusResult>(stream);
-            }
-        }
-
-        public Task<PinExchangeResult> ExchangePin(PinCreationResult pin)
-        {
-            var args = new Dictionary<string, string>
-            {
-                {"deviceId",pin.DeviceId},
-                {"pin",pin.Pin}
-            };
-
-            return PostAsync<PinExchangeResult>(GetConnectUrl("pin/authenticate"), args);
-        }
-
-        private async Task<T> PostAsync<T>(string url, Dictionary<string, string> args, string userAccessToken = null)
-            where T : class
-        {
-            var request = new HttpRequest
-            {
-                Url = url,
-                Method = "POST"
-            };
-
-            request.SetPostData(args);
-
-            if (!string.IsNullOrEmpty(userAccessToken))
-            {
-                AddUserAccessToken(request, userAccessToken);
-            }
-
-            AddAppInfo(request, _appName, _appVersion);
-
-            using (var stream = await _httpClient.SendAsync(request).ConfigureAwait(false))
-            {
-                return JsonSerializer.DeserializeFromStream<T>(stream);
-            }
-        }
-
-        public async Task<ConnectUser> GetConnectUser(ConnectUserQuery query, string accessToken, CancellationToken cancellationToken = default(CancellationToken))
-        {
-            if (string.IsNullOrWhiteSpace(accessToken))
-            {
-                throw new ArgumentNullException("accessToken");
-            }
-
-            var dict = new QueryStringDictionary();
-
-            if (!string.IsNullOrWhiteSpace(query.Id))
-            {
-                dict.Add("id", query.Id);
-            }
-            else if (!string.IsNullOrWhiteSpace(query.NameOrEmail))
-            {
-                dict.Add("nameOrEmail", query.NameOrEmail);
-            }
-            else if (!string.IsNullOrWhiteSpace(query.Name))
-            {
-                dict.Add("name", query.Name);
-            }
-            else if (!string.IsNullOrWhiteSpace(query.Email))
-            {
-                dict.Add("email", query.Email);
-            }
-            else
-            {
-                throw new ArgumentException("Empty ConnectUserQuery supplied");
-            }
-
-            var url = GetConnectUrl("user") + "?" + dict.GetQueryString();
-
-            var request = new HttpRequest
-            {
-                Method = "GET",
-                Url = url,
-                CancellationToken = cancellationToken
-            };
-
-            AddUserAccessToken(request, accessToken);
-            AddAppInfo(request, _appName, _appVersion);
-
-            using (var stream = await _httpClient.SendAsync(request).ConfigureAwait(false))
-            {
-                return JsonSerializer.DeserializeFromStream<ConnectUser>(stream);
-            }
-        }
-
-        public async Task<ConnectUserServer[]> GetServers(string userId, string accessToken, CancellationToken cancellationToken = default(CancellationToken))
-        {
-            if (string.IsNullOrWhiteSpace(userId))
-            {
-                throw new ArgumentNullException("userId");
-            }
-            if (string.IsNullOrWhiteSpace(accessToken))
-            {
-                throw new ArgumentNullException("accessToken");
-            }
-
-            var dict = new QueryStringDictionary();
-
-            dict.Add("userId", userId);
-
-            var url = GetConnectUrl("servers") + "?" + dict.GetQueryString();
-
-            var request = new HttpRequest
-            {
-                Method = "GET",
-                Url = url,
-                CancellationToken = cancellationToken
-            };
-
-            AddUserAccessToken(request, accessToken);
-            AddAppInfo(request, _appName, _appVersion);
-
-            using (var stream = await _httpClient.SendAsync(request).ConfigureAwait(false))
-            {
-                using (var reader = new StreamReader(stream))
-                {
-                    var json = await reader.ReadToEndAsync().ConfigureAwait(false);
-
-                    _logger.Debug("Connect servers response: {0}", json);
-
-                    return JsonSerializer.DeserializeFromString<ConnectUserServer[]>(json);
-                }
-            }
-        }
-
-        private void AddUserAccessToken(HttpRequest request, string accessToken)
-        {
-            if (string.IsNullOrWhiteSpace(accessToken))
-            {
-                throw new ArgumentNullException("accessToken");
-            }
-            request.RequestHeaders["X-Connect-UserToken"] = accessToken;
-        }
-
-        private void AddAppInfo(HttpRequest request, string appName, string appVersion)
-        {
-            if (string.IsNullOrWhiteSpace(appName))
-            {
-                throw new ArgumentNullException("appName");
-            }
-            if (string.IsNullOrWhiteSpace(appVersion))
-            {
-                throw new ArgumentNullException("appVersion");
-            }
-            request.RequestHeaders["X-Application"] = appName + "/" + appVersion;
-        }
-
-        private string GetConnectUrl(string handler)
-        {
-            if (string.IsNullOrWhiteSpace(handler))
-            {
-                throw new ArgumentNullException("handler");
-            }
-            return "https://connect.emby.media/service/" + handler;
-        }
-
-        public async Task<ConnectSignupResponse> SignupForConnect(string email, string username, string password)
-        {
-            if (string.IsNullOrWhiteSpace(email))
-            {
-                throw new ArgumentNullException("email");
-            }
-            if (string.IsNullOrWhiteSpace(username))
-            {
-                throw new ArgumentNullException("username");
-            }
-            if (string.IsNullOrWhiteSpace(password))
-            {
-                throw new ArgumentNullException("password");
-            }
-            if (password.Length < 8)
-            {
-                throw new ArgumentException("password must be at least 8 characters");
-            }
-            var request = new HttpRequest
-            {
-                Url = GetConnectUrl("register"),
-                Method = "POST"
-            };
-
-            var dict = new QueryStringDictionary();
-
-            dict.Add("email", Uri.EscapeDataString(email));
-            dict.Add("userName", username);
-            dict.Add("password", password);
-            request.SetPostData(dict);
-
-            request.RequestHeaders["X-Connect-Token"] = "CONNECT-REGISTER";
-            AddAppInfo(request, _appName, _appVersion);
-
-            using (var response = await _httpClient.GetResponse(request, true).ConfigureAwait(false))
-            {
-                var responseObject = JsonSerializer.DeserializeFromStream<RawConnectResponse>(response.Content);
-
-                if (string.Equals(responseObject.Status, "SUCCESS", StringComparison.OrdinalIgnoreCase))
-                {
-                    return ConnectSignupResponse.Success;
-                }
-                if (string.Equals(responseObject.Status, "USERNAME_IN_USE", StringComparison.OrdinalIgnoreCase))
-                {
-                    return ConnectSignupResponse.UsernameInUser;
-                }
-                if (string.Equals(responseObject.Status, "EMAIL_IN_USE", StringComparison.OrdinalIgnoreCase))
-                {
-                    return ConnectSignupResponse.EmailInUse;
-                }
-                return ConnectSignupResponse.Failure;
-            }
-        }
-
-        private class RawConnectResponse
-        {
-            public string Status { get; set; }
-            public string Message { get; set; }
-        }
-    }
-}
diff --git a/Emby.ApiClient/ConnectionManager.cs b/Emby.ApiClient/ConnectionManager.cs
deleted file mode 100644
index cd5b2de..0000000
--- a/Emby.ApiClient/ConnectionManager.cs
+++ /dev/null
@@ -1,914 +0,0 @@
-using MediaBrowser.Model.ApiClient;
-using MediaBrowser.Model.Connect;
-using MediaBrowser.Model.Dto;
-using MediaBrowser.Model.Events;
-using MediaBrowser.Model.Logging;
-using MediaBrowser.Model.Serialization;
-using MediaBrowser.Model.Session;
-using MediaBrowser.Model.System;
-using MediaBrowser.Model.Users;
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-using Emby.ApiClient.Cryptography;
-using Emby.ApiClient.Data;
-using Emby.ApiClient.Model;
-using Emby.ApiClient.Net;
-
-namespace Emby.ApiClient
-{
-    public class ConnectionManager : IConnectionManager
-    {
-        public event EventHandler<GenericEventArgs<UserDto>> LocalUserSignIn;
-        public event EventHandler<GenericEventArgs<ConnectUser>> ConnectUserSignIn;
-        public event EventHandler<GenericEventArgs<IApiClient>> LocalUserSignOut;
-        public event EventHandler<EventArgs> ConnectUserSignOut;
-        public event EventHandler<EventArgs> RemoteLoggedOut;
-
-        public event EventHandler<GenericEventArgs<ConnectionResult>> Connected;
-
-        private readonly ICredentialProvider _credentialProvider;
-        private readonly INetworkConnection _networkConnectivity;
-        private readonly ILogger _logger;
-        private readonly IServerLocator _serverDiscovery;
-        private readonly IAsyncHttpClient _httpClient;
-        private readonly Func<IClientWebSocket> _webSocketFactory;
-        private readonly ICryptographyProvider _cryptographyProvider;
-        private readonly ILocalAssetManager _localAssetManager;
-
-        public Dictionary<string, IApiClient> ApiClients { get; private set; }
-
-        public string ApplicationName { get; private set; }
-        public string ApplicationVersion { get; private set; }
-        public IDevice Device { get; private set; }
-        public ClientCapabilities ClientCapabilities { get; private set; }
-
-        public IApiClient CurrentApiClient { get; private set; }
-
-        private readonly ConnectService _connectService;
-
-        public ConnectUser ConnectUser { get; private set; }
-
-        public ConnectionManager(ILogger logger,
-            ICredentialProvider credentialProvider,
-            INetworkConnection networkConnectivity,
-            IServerLocator serverDiscovery,
-            string applicationName,
-            string applicationVersion,
-            IDevice device,
-            ClientCapabilities clientCapabilities,
-            ICryptographyProvider cryptographyProvider,
-            Func<IClientWebSocket> webSocketFactory = null,
-            ILocalAssetManager localAssetManager = null)
-        {
-            _credentialProvider = credentialProvider;
-            _networkConnectivity = networkConnectivity;
-            _logger = logger;
-            _serverDiscovery = serverDiscovery;
-            _httpClient = AsyncHttpClientFactory.Create(logger);
-            ClientCapabilities = clientCapabilities;
-            _webSocketFactory = webSocketFactory;
-            _cryptographyProvider = cryptographyProvider;
-            _localAssetManager = localAssetManager;
-
-            Device = device;
-            ApplicationVersion = applicationVersion;
-            ApplicationName = applicationName;
-            ApiClients = new Dictionary<string, IApiClient>(StringComparer.OrdinalIgnoreCase);
-            SaveLocalCredentials = true;
-
-            var jsonSerializer = new NewtonsoftJsonSerializer();
-            _connectService = new ConnectService(jsonSerializer, _logger, _httpClient, _cryptographyProvider, applicationName, applicationVersion);
-        }
-
-        public IJsonSerializer JsonSerializer
-        {
-            get { return _connectService.JsonSerializer; }
-            set { _connectService.JsonSerializer = value; }
-        }
-
-        public bool SaveLocalCredentials { get; set; }
-
-        private IApiClient GetOrAddApiClient(ServerInfo server, ConnectionMode connectionMode)
-        {
-            IApiClient apiClient;
-
-            if (!ApiClients.TryGetValue(server.Id, out apiClient))
-            {
-                var address = server.GetAddress(connectionMode);
-
-                apiClient = new ApiClient(_logger, address, ApplicationName, Device, ApplicationVersion, _cryptographyProvider, _localAssetManager)
-                {
-                    JsonSerializer = JsonSerializer,
-                    OnAuthenticated = ApiClientOnAuthenticated
-                };
-
-                ApiClients[server.Id] = apiClient;
-            }
-
-            if (string.IsNullOrEmpty(server.AccessToken))
-            {
-                apiClient.ClearAuthenticationInfo();
-            }
-            else
-            {
-                apiClient.SetAuthenticationInfo(server.AccessToken, server.UserId);
-            }
-
-            return apiClient;
-        }
-
-        private Task ApiClientOnAuthenticated(IApiClient apiClient, AuthenticationResult result)
-        {
-            return OnAuthenticated(apiClient, result, new ConnectionOptions(), SaveLocalCredentials);
-        }
-
-        private async void AfterConnected(IApiClient apiClient, ConnectionOptions options)
-        {
-            if (options.ReportCapabilities)
-            {
-                try
-                {
-                    await apiClient.ReportCapabilities(ClientCapabilities).ConfigureAwait(false);
-                }
-                catch (Exception ex)
-                {
-                    _logger.ErrorException("Error reporting capabilities", ex);
-                }
-            }
-
-            if (options.EnableWebSocket)
-            {
-                if (_webSocketFactory != null)
-                {
-                    ((ApiClient)apiClient).OpenWebSocket(_webSocketFactory);
-                }
-            }
-        }
-
-        public async Task<List<ServerInfo>> GetAvailableServers(CancellationToken cancellationToken = default(CancellationToken))
-        {
-            var credentials = await _credentialProvider.GetServerCredentials().ConfigureAwait(false);
-
-            _logger.Debug("{0} servers in saved credentials", credentials.Servers.Count);
-
-            if (_networkConnectivity.GetNetworkStatus().GetIsAnyLocalNetworkAvailable())
-            {
-                foreach (var server in await FindServers(cancellationToken).ConfigureAwait(false))
-                {
-                    credentials.AddOrUpdateServer(server);
-                }
-            }
-
-            if (!string.IsNullOrWhiteSpace(credentials.ConnectAccessToken))
-            {
-                await EnsureConnectUser(credentials, cancellationToken).ConfigureAwait(false);
-
-                var connectServers = await GetConnectServers(credentials.ConnectUserId, credentials.ConnectAccessToken, cancellationToken)
-                            .ConfigureAwait(false);
-
-                foreach (var server in connectServers)
-                {
-                    credentials.AddOrUpdateServer(server);
-                }
-
-                // Remove old servers
-                var newServerList = credentials.Servers
-                    .Where(i => string.IsNullOrWhiteSpace(i.ExchangeToken) ||
-                        connectServers.Any(c => string.Equals(c.Id, i.Id, StringComparison.OrdinalIgnoreCase)));
-
-                credentials.Servers = newServerList.ToList();
-            }
-
-            await _credentialProvider.SaveServerCredentials(credentials).ConfigureAwait(false);
-
-            return credentials.Servers.OrderByDescending(i => i.DateLastAccessed).ToList();
-        }
-
-        private async Task<List<ServerInfo>> GetConnectServers(string userId, string accessToken, CancellationToken cancellationToken)
-        {
-            try
-            {
-                var servers = await _connectService.GetServers(userId, accessToken, cancellationToken).ConfigureAwait(false);
-
-                _logger.Debug("User has {0} connect servers", servers.Length);
-
-                return servers.Select(i => new ServerInfo
-                {
-                    ExchangeToken = i.AccessKey,
-                    Id = i.SystemId,
-                    Name = i.Name,
-                    RemoteAddress = i.Url,
-                    LocalAddress = i.LocalAddress,
-                    UserLinkType = string.Equals(i.UserType, "guest", StringComparison.OrdinalIgnoreCase) ? UserLinkType.Guest : UserLinkType.LinkedUser
-
-                }).ToList();
-            }
-            catch
-            {
-                return new List<ServerInfo>();
-            }
-        }
-
-        private async Task<List<ServerInfo>> FindServers(CancellationToken cancellationToken)
-        {
-            List<ServerDiscoveryInfo> servers;
-
-            try
-            {
-                servers = await _serverDiscovery.FindServers(1500, cancellationToken).ConfigureAwait(false);
-            }
-            catch (OperationCanceledException)
-            {
-                _logger.Debug("No servers found via local discovery.");
-
-                servers = new List<ServerDiscoveryInfo>();
-            }
-            catch (Exception ex)
-            {
-                _logger.ErrorException("Error discovering servers.", ex);
-
-                servers = new List<ServerDiscoveryInfo>();
-            }
-
-            return servers.Select(i => new ServerInfo
-            {
-                Id = i.Id,
-                LocalAddress = ConvertEndpointAddressToManualAddress(i) ?? i.Address,
-                Name = i.Name
-            })
-            .ToList();
-        }
-
-        private string ConvertEndpointAddressToManualAddress(ServerDiscoveryInfo info)
-        {
-            if (!string.IsNullOrWhiteSpace(info.Address) && !string.IsNullOrWhiteSpace(info.EndpointAddress))
-            {
-                var address = info.EndpointAddress.Split(':').First();
-
-                // Determine the port, if any
-                var parts = info.Address.Split(':');
-                if (parts.Length > 1)
-                {
-                    var portString = parts.Last();
-                    int port;
-                    if (int.TryParse(portString, NumberStyles.Any, CultureInfo.InvariantCulture, out port))
-                    {
-                        address += ":" + portString;
-                    }
-                }
-
-                return NormalizeAddress(address);
-            }
-
-            return null;
-        }
-
-        public async Task<ConnectionResult> Connect(CancellationToken cancellationToken = default(CancellationToken))
-        {
-            var servers = await GetAvailableServers(cancellationToken).ConfigureAwait(false);
-
-            return await Connect(servers, cancellationToken).ConfigureAwait(false);
-        }
-
-        /// <summary>
-        /// Loops through a list of servers and returns the first that is available for connection
-        /// </summary>
-        private async Task<ConnectionResult> Connect(List<ServerInfo> servers, CancellationToken cancellationToken)
-        {
-            servers = servers
-               .OrderByDescending(i => i.DateLastAccessed)
-               .ToList();
-
-            if (servers.Count == 1)
-            {
-                _logger.Debug("1 server in the list.");
-
-                var result = await Connect(servers[0], cancellationToken).ConfigureAwait(false);
-
-                if (result.State == ConnectionState.Unavailable)
-                {
-                    result.State = result.ConnectUser == null ?
-                        ConnectionState.ConnectSignIn :
-                        ConnectionState.ServerSelection;
-                }
-
-                return result;
-            }
-
-            var firstServer = servers.FirstOrDefault();
-            // See if we have any saved credentials and can auto sign in
-            if (firstServer != null && !string.IsNullOrEmpty(firstServer.AccessToken))
-            {
-                var result = await Connect(firstServer, cancellationToken).ConfigureAwait(false);
-
-                if (result.State == ConnectionState.SignedIn)
-                {
-                    return result;
-                }
-            }
-
-            var finalResult = new ConnectionResult
-            {
-                Servers = servers,
-                ConnectUser = ConnectUser
-            };
-
-            finalResult.State = servers.Count == 0 && finalResult.ConnectUser == null ?
-                ConnectionState.ConnectSignIn :
-                ConnectionState.ServerSelection;
-
-            return finalResult;
-        }
-
-        /// <summary>
-        /// Attempts to connect to a server
-        /// </summary>
-        public Task<ConnectionResult> Connect(ServerInfo server, CancellationToken cancellationToken = default(CancellationToken))
-        {
-            return Connect(server, new ConnectionOptions(), cancellationToken);
-        }
-
-        public async Task<ConnectionResult> Connect(ServerInfo server, ConnectionOptions options, CancellationToken cancellationToken = default(CancellationToken))
-        {
-            var result = new ConnectionResult
-            {
-                State = ConnectionState.Unavailable
-            };
-
-            PublicSystemInfo systemInfo = null;
-            var connectionMode = ConnectionMode.Manual;
-
-            var tests = new[] { ConnectionMode.Manual, ConnectionMode.Local, ConnectionMode.Remote }.ToList();
-
-            // If we've connected to the server before, try to optimize by starting with the last used connection mode
-            if (server.LastConnectionMode.HasValue)
-            {
-                tests.Remove(server.LastConnectionMode.Value);
-                tests.Insert(0, server.LastConnectionMode.Value);
-            }
-
-            var isLocalNetworkAvailable = _networkConnectivity.GetNetworkStatus().GetIsAnyLocalNetworkAvailable();
-
-            // Kick off wake on lan on a separate thread (if applicable)
-            var sendWakeOnLan = server.WakeOnLanInfos.Count > 0 && isLocalNetworkAvailable;
-
-            var wakeOnLanTask = sendWakeOnLan ?
-                Task.Run(() => WakeServer(server, cancellationToken), cancellationToken) :
-                Task.FromResult(true);
-
-            var wakeOnLanSendTime = DateTime.Now;
-
-            foreach (var mode in tests)
-            {
-                _logger.Debug("Attempting to connect to server {0}. ConnectionMode: {1}", server.Name, mode.ToString());
-
-                if (mode == ConnectionMode.Local)
-                {
-                    // Try connect locally if there's a local address,
-                    // and we're either on localhost or the device has a local connection
-                    if (!string.IsNullOrEmpty(server.LocalAddress) && isLocalNetworkAvailable)
-                    {
-                        // Try to connect to the local address
-                        systemInfo = await TryConnect(server.LocalAddress, 8000, cancellationToken).ConfigureAwait(false);
-                    }
-                }
-                else if (mode == ConnectionMode.Manual)
-                {
-                    // Try manual address if there is one, but only if it's different from the local/remote addresses
-                    if (!string.IsNullOrEmpty(server.ManualAddress)
-                        && !string.Equals(server.ManualAddress, server.LocalAddress, StringComparison.OrdinalIgnoreCase)
-                        && !string.Equals(server.ManualAddress, server.RemoteAddress, StringComparison.OrdinalIgnoreCase))
-                    {
-                        // Try to connect to the local address
-                        systemInfo = await TryConnect(server.ManualAddress, 15000, cancellationToken).ConfigureAwait(false);
-                    }
-                }
-                else if (mode == ConnectionMode.Remote)
-                {
-                    if (!string.IsNullOrEmpty(server.RemoteAddress))
-                    {
-                        systemInfo = await TryConnect(server.RemoteAddress, 15000, cancellationToken).ConfigureAwait(false);
-                    }
-                }
-
-                if (systemInfo != null)
-                {
-                    connectionMode = mode;
-                    break;
-                }
-            }
-
-            if (systemInfo == null && !string.IsNullOrEmpty(server.LocalAddress) && isLocalNetworkAvailable && sendWakeOnLan)
-            {
-                await wakeOnLanTask.ConfigureAwait(false);
-
-                // After wake on lan finishes, make sure at least 10 seconds have elapsed since the time it was first sent out
-                var waitTime = TimeSpan.FromSeconds(10).TotalMilliseconds -
-                               (DateTime.Now - wakeOnLanSendTime).TotalMilliseconds;
-
-                if (waitTime > 0)
-                {
-                    await Task.Delay(Convert.ToInt32(waitTime, CultureInfo.InvariantCulture), cancellationToken).ConfigureAwait(false);
-                }
-
-                systemInfo = await TryConnect(server.LocalAddress, 15000, cancellationToken).ConfigureAwait(false);
-            }
-
-            if (systemInfo != null)
-            {
-                await OnSuccessfulConnection(server, options, systemInfo, result, connectionMode, cancellationToken)
-                        .ConfigureAwait(false);
-            }
-
-            result.ConnectUser = ConnectUser;
-            return result;
-        }
-
-        private async Task OnSuccessfulConnection(ServerInfo server,
-            ConnectionOptions options,
-            PublicSystemInfo systemInfo,
-            ConnectionResult result,
-            ConnectionMode connectionMode,
-            CancellationToken cancellationToken)
-        {
-            server.ImportInfo(systemInfo);
-
-            var credentials = await _credentialProvider.GetServerCredentials().ConfigureAwait(false);
-
-            if (!string.IsNullOrWhiteSpace(credentials.ConnectAccessToken))
-            {
-                await EnsureConnectUser(credentials, cancellationToken).ConfigureAwait(false);
-
-                if (!string.IsNullOrWhiteSpace(server.ExchangeToken))
-                {
-                    await AddAuthenticationInfoFromConnect(server, connectionMode, credentials, cancellationToken).ConfigureAwait(false);
-                }
-            }
-
-            if (!string.IsNullOrWhiteSpace(server.AccessToken))
-            {
-                await ValidateAuthentication(server, connectionMode, options, cancellationToken).ConfigureAwait(false);
-            }
-
-            credentials.AddOrUpdateServer(server);
-
-            if (options.UpdateDateLastAccessed)
-            {
-                server.DateLastAccessed = DateTime.UtcNow;
-            }
-            server.LastConnectionMode = connectionMode;
-
-            await _credentialProvider.SaveServerCredentials(credentials).ConfigureAwait(false);
-
-            result.ApiClient = GetOrAddApiClient(server, connectionMode);
-            result.State = string.IsNullOrEmpty(server.AccessToken) ?
-                ConnectionState.ServerSignIn :
-                ConnectionState.SignedIn;
-
-            ((ApiClient)result.ApiClient).EnableAutomaticNetworking(server, connectionMode, _networkConnectivity);
-
-            if (result.State == ConnectionState.SignedIn)
-            {
-                AfterConnected(result.ApiClient, options);
-            }
-
-            CurrentApiClient = result.ApiClient;
-
-            result.Servers.Add(server);
-
-            if (Connected != null)
-            {
-                Connected(this, new GenericEventArgs<ConnectionResult>(result));
-            }
-        }
-
-        public Task<ConnectionResult> Connect(IApiClient apiClient, CancellationToken cancellationToken = default(CancellationToken))
-        {
-            var client = (ApiClient)apiClient;
-            return Connect(client.ServerInfo, cancellationToken);
-        }
-
-        private async Task AddAuthenticationInfoFromConnect(ServerInfo server,
-            ConnectionMode connectionMode,
-            ServerCredentials credentials,
-            CancellationToken cancellationToken)
-        {
-            if (string.IsNullOrWhiteSpace(credentials.ConnectUserId))
-            {
-                throw new ArgumentException("server");
-            }
-
-            if (string.IsNullOrWhiteSpace(server.ExchangeToken))
-            {
-                throw new ArgumentException("server");
-            }
-
-            _logger.Debug("Adding authentication info from Connect");
-
-            var url = server.GetAddress(connectionMode);
-
-            url += "/emby/Connect/Exchange?format=json&ConnectUserId=" + credentials.ConnectUserId;
-
-            var headers = new HttpHeaders();
-            headers.SetAccessToken(server.ExchangeToken);
-            headers["X-Emby-Authorization"] = "MediaBrowser Client=\"" + ApplicationName + "\", Device=\"" + Device.DeviceName + "\", DeviceId=\"" + Device.DeviceId + "\", Version=\"" + ApplicationVersion + "\"";
-
-            try
-            {
-                using (var stream = await _httpClient.SendAsync(new HttpRequest
-                {
-                    CancellationToken = cancellationToken,
-                    Method = "GET",
-                    RequestHeaders = headers,
-                    Url = url
-
-                }).ConfigureAwait(false))
-                {
-                    var auth = JsonSerializer.DeserializeFromStream<ConnectAuthenticationExchangeResult>(stream);
-
-                    server.UserId = auth.LocalUserId;
-                    server.AccessToken = auth.AccessToken;
-                }
-            }
-            catch (OperationCanceledException)
-            {
-                throw;
-            }
-            catch (Exception ex)
-            {
-                // Already logged at a lower level
-
-                server.UserId = null;
-                server.AccessToken = null;
-            }
-        }
-
-        private async Task EnsureConnectUser(ServerCredentials credentials, CancellationToken cancellationToken)
-        {
-            if (ConnectUser != null && string.Equals(ConnectUser.Id, credentials.ConnectUserId, StringComparison.Ordinal))
-            {
-                return;
-            }
-
-            ConnectUser = null;
-
-            if (!string.IsNullOrWhiteSpace(credentials.ConnectUserId) && !string.IsNullOrWhiteSpace(credentials.ConnectAccessToken))
-            {
-                try
-                {
-                    ConnectUser = await _connectService.GetConnectUser(new ConnectUserQuery
-                    {
-                        Id = credentials.ConnectUserId
-
-                    }, credentials.ConnectAccessToken, cancellationToken).ConfigureAwait(false);
-
-                    OnConnectUserSignIn(ConnectUser);
-                }
-                catch
-                {
-                    // Already logged at lower levels
-                }
-            }
-        }
-
-        private async Task ValidateAuthentication(ServerInfo server, ConnectionMode connectionMode, ConnectionOptions options, CancellationToken cancellationToken)
-        {
-            _logger.Debug("Validating saved authentication");
-
-            var url = server.GetAddress(connectionMode);
-
-            var headers = new HttpHeaders();
-            headers.SetAccessToken(server.AccessToken);
-
-            var request = new HttpRequest
-            {
-                CancellationToken = cancellationToken,
-                Method = "GET",
-                RequestHeaders = headers,
-                Url = url + "/emby/system/info?format=json"
-            };
-
-            try
-            {
-                using (var stream = await _httpClient.SendAsync(request).ConfigureAwait(false))
-                {
-                    var systemInfo = JsonSerializer.DeserializeFromStream<SystemInfo>(stream);
-
-                    server.ImportInfo(systemInfo);
-                }
-
-                if (!string.IsNullOrEmpty(server.UserId))
-                {
-                    request.Url = url + "/mediabrowser/users/" + server.UserId + "?format=json";
-
-                    using (var stream = await _httpClient.SendAsync(request).ConfigureAwait(false))
-                    {
-                        var localUser = JsonSerializer.DeserializeFromStream<UserDto>(stream);
-
-                        OnLocalUserSignIn(options, localUser);
-                    }
-                }
-            }
-            catch (OperationCanceledException)
-            {
-                throw;
-            }
-            catch (Exception ex)
-            {
-                // Already logged at a lower level
-
-                server.UserId = null;
-                server.AccessToken = null;
-            }
-        }
-
-        private async Task<PublicSystemInfo> TryConnect(string url, int timeout, CancellationToken cancellationToken)
-        {
-            url += "/emby/system/info/public?format=json";
-
-            try
-            {
-                using (var stream = await _httpClient.SendAsync(new HttpRequest
-                {
-                    Url = url,
-                    CancellationToken = cancellationToken,
-                    Timeout = timeout,
-                    Method = "GET"
-
-                }).ConfigureAwait(false))
-                {
-                    return JsonSerializer.DeserializeFromStream<PublicSystemInfo>(stream);
-                }
-            }
-            catch (OperationCanceledException)
-            {
-                throw;
-            }
-            catch (Exception ex)
-            {
-                // Already logged at a lower level
-
-                return null;
-            }
-        }
-
-        /// <summary>
-        /// Wakes all servers.
-        /// </summary>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        /// <returns>Task.</returns>
-        private async Task WakeAllServers(CancellationToken cancellationToken)
-        {
-            var credentials = await _credentialProvider.GetServerCredentials().ConfigureAwait(false);
-
-            foreach (var server in credentials.Servers.ToList())
-            {
-                await WakeServer(server, cancellationToken).ConfigureAwait(false);
-            }
-        }
-
-        /// <summary>
-        /// Wakes a server
-        /// </summary>
-        private async Task WakeServer(ServerInfo server, CancellationToken cancellationToken)
-        {
-            foreach (var info in server.WakeOnLanInfos)
-            {
-                await WakeServer(info, cancellationToken).ConfigureAwait(false);
-            }
-        }
-
-        /// <summary>
-        /// Wakes a device based on mac address
-        /// </summary>
-        private async Task WakeServer(WakeOnLanInfo info, CancellationToken cancellationToken)
-        {
-            try
-            {
-                await _networkConnectivity.SendWakeOnLan(info.MacAddress, info.Port, cancellationToken).ConfigureAwait(false);
-            }
-            catch (Exception ex)
-            {
-                _logger.ErrorException("Error sending wake on lan command", ex);
-            }
-        }
-
-        public void Dispose()
-        {
-            foreach (var client in ApiClients.Values.ToList())
-            {
-                client.Dispose();
-            }
-        }
-
-        public IApiClient GetApiClient(IHasServerId item)
-        {
-            return GetApiClient(item.ServerId);
-        }
-
-        public IApiClient GetApiClient(string serverId)
-        {
-            return ApiClients.Values.OfType<ApiClient>().FirstOrDefault(i => string.Equals(i.ServerInfo.Id, serverId, StringComparison.OrdinalIgnoreCase));
-        }
-
-        public async Task<ConnectionResult> Connect(string address, CancellationToken cancellationToken = default(CancellationToken))
-        {
-            address = NormalizeAddress(address);
-
-            var publicInfo = await TryConnect(address, 15000, cancellationToken).ConfigureAwait(false);
-
-            if (publicInfo == null)
-            {
-                return new ConnectionResult
-                {
-                    State = ConnectionState.Unavailable,
-                    ConnectUser = ConnectUser
-                };
-            }
-
-            var server = new ServerInfo
-            {
-                ManualAddress = address,
-                LastConnectionMode = ConnectionMode.Manual
-            };
-
-            server.ImportInfo(publicInfo);
-
-            return await Connect(server, cancellationToken).ConfigureAwait(false);
-        }
-
-        private string NormalizeAddress(string address)
-        {
-            if (string.IsNullOrEmpty(address))
-            {
-                throw new ArgumentNullException("address");
-            }
-
-            if (!address.StartsWith("http", StringComparison.OrdinalIgnoreCase))
-            {
-                address = "http://" + address;
-            }
-
-            return address;
-        }
-
-        private async Task OnAuthenticated(IApiClient apiClient,
-            AuthenticationResult result,
-            ConnectionOptions options,
-            bool saveCredentials)
-        {
-            var server = ((ApiClient)apiClient).ServerInfo;
-
-            var credentials = await _credentialProvider.GetServerCredentials().ConfigureAwait(false);
-
-            if (options.UpdateDateLastAccessed)
-            {
-                server.DateLastAccessed = DateTime.UtcNow;
-            }
-
-            if (saveCredentials)
-            {
-                server.UserId = result.User.Id;
-                server.AccessToken = result.AccessToken;
-            }
-            else
-            {
-                server.UserId = null;
-                server.AccessToken = null;
-            }
-
-            credentials.AddOrUpdateServer(server);
-            await _credentialProvider.SaveServerCredentials(credentials).ConfigureAwait(false);
-
-            AfterConnected(apiClient, options);
-
-            OnLocalUserSignIn(options, result.User);
-        }
-
-        private void OnLocalUserSignIn(ConnectionOptions options, UserDto user)
-        {
-            // TODO: Create a separate property for this
-            if (options.UpdateDateLastAccessed)
-            {
-                if (LocalUserSignIn != null)
-                {
-                    LocalUserSignIn(this, new GenericEventArgs<UserDto>(user));
-                }
-            }
-        }
-
-        private void OnLocalUserSignout(IApiClient apiClient)
-        {
-            if (LocalUserSignOut != null)
-            {
-                LocalUserSignOut(this, new GenericEventArgs<IApiClient>(apiClient));
-            }
-        }
-
-        private void OnConnectUserSignIn(ConnectUser user)
-        {
-            ConnectUser = user;
-
-            if (ConnectUserSignIn != null)
-            {
-                ConnectUserSignIn(this, new GenericEventArgs<ConnectUser>(ConnectUser));
-            }
-        }
-
-        public async Task Logout()
-        {
-            foreach (var client in ApiClients.Values.ToList())
-            {
-                if (!string.IsNullOrEmpty(client.AccessToken))
-                {
-                    await client.Logout().ConfigureAwait(false);
-                    OnLocalUserSignout(client);
-                }
-            }
-
-            var credentials = await _credentialProvider.GetServerCredentials().ConfigureAwait(false);
-
-            var servers = credentials.Servers
-                .Where(i => !i.UserLinkType.HasValue || i.UserLinkType.Value != UserLinkType.Guest)
-                .ToList();
-
-            foreach (var server in servers)
-            {
-                server.AccessToken = null;
-                server.UserId = null;
-                server.ExchangeToken = null;
-            }
-
-            credentials.Servers = servers;
-            credentials.ConnectAccessToken = null;
-            credentials.ConnectUserId = null;
-
-            await _credentialProvider.SaveServerCredentials(credentials).ConfigureAwait(false);
-
-            if (ConnectUser != null)
-            {
-                ConnectUser = null;
-
-                if (ConnectUserSignOut != null)
-                {
-                    ConnectUserSignOut(this, EventArgs.Empty);
-                }
-            }
-        }
-
-        public async Task LoginToConnect(string username, string password)
-        {
-            var result = await _connectService.Authenticate(username, password).ConfigureAwait(false);
-
-            var credentials = await _credentialProvider.GetServerCredentials().ConfigureAwait(false);
-
-            credentials.ConnectAccessToken = result.AccessToken;
-            credentials.ConnectUserId = result.User.Id;
-
-            await _credentialProvider.SaveServerCredentials(credentials).ConfigureAwait(false);
-
-            OnConnectUserSignIn(result.User);
-        }
-
-        public Task<PinCreationResult> CreatePin()
-        {
-            return _connectService.CreatePin(Device.DeviceId);
-        }
-
-        public Task<PinStatusResult> GetPinStatus(PinCreationResult pin)
-        {
-            return _connectService.GetPinStatus(pin);
-        }
-
-        public async Task ExchangePin(PinCreationResult pin)
-        {
-            var result = await _connectService.ExchangePin(pin);
-
-            var credentials = await _credentialProvider.GetServerCredentials().ConfigureAwait(false);
-
-            credentials.ConnectAccessToken = result.AccessToken;
-            credentials.ConnectUserId = result.UserId;
-
-            await EnsureConnectUser(credentials, CancellationToken.None).ConfigureAwait(false);
-
-            await _credentialProvider.SaveServerCredentials(credentials).ConfigureAwait(false);
-        }
-
-        public async Task<ServerInfo> GetServerInfo(string id)
-        {
-            var credentials = await _credentialProvider.GetServerCredentials().ConfigureAwait(false);
-
-            return credentials.Servers.FirstOrDefault(i => string.Equals(i.Id, id, StringComparison.OrdinalIgnoreCase));
-        }
-
-        public Task<ConnectSignupResponse> SignupForConnect(string email, string username, string password, CancellationToken cancellationToken)
-        {
-            return _connectService.SignupForConnect(email, username, password);
-        }
-    }
-}
diff --git a/Emby.ApiClient/Cryptography/CryptographyProvider.cs b/Emby.ApiClient/Cryptography/CryptographyProvider.cs
deleted file mode 100644
index d3afb2a..0000000
--- a/Emby.ApiClient/Cryptography/CryptographyProvider.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using System.Security.Cryptography;
-
-namespace Emby.ApiClient.Cryptography
-{
-    public class CryptographyProvider : ICryptographyProvider
-    {
-        public byte[] CreateSha1(byte[] value)
-        {
-            using (var provider = SHA1.Create())
-            {
-                return provider.ComputeHash(value);
-            }
-        }
-
-        public byte[] CreateMD5(byte[] value)
-        {
-            using (var provider = MD5.Create())
-            {
-                return provider.ComputeHash(value);
-            }
-        }
-    }
-}
diff --git a/Emby.ApiClient/Cryptography/ICryptographyProvider.cs b/Emby.ApiClient/Cryptography/ICryptographyProvider.cs
deleted file mode 100644
index 282aadf..0000000
--- a/Emby.ApiClient/Cryptography/ICryptographyProvider.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-
-namespace Emby.ApiClient.Cryptography
-{
-    public interface ICryptographyProvider
-    {
-        byte[] CreateSha1(byte[] value);
-        byte[] CreateMD5(byte[] value);
-    }
-}
diff --git a/Emby.ApiClient/Data/IFileRepository.cs b/Emby.ApiClient/Data/IFileRepository.cs
deleted file mode 100644
index f3c4f0a..0000000
--- a/Emby.ApiClient/Data/IFileRepository.cs
+++ /dev/null
@@ -1,92 +0,0 @@
-using MediaBrowser.Model.Sync;
-using System.Collections.Generic;
-using System.IO;
-using System.Threading.Tasks;
-
-namespace Emby.ApiClient.Data
-{
-    public interface IFileRepository
-    {
-        /// <summary>
-        /// Gets the file system entries.
-        /// </summary>
-        /// <param name="path">The path.</param>
-        /// <returns>Task&lt;List&lt;DeviceFileInfo&gt;&gt;.</returns>
-        Task<List<DeviceFileInfo>> GetFileSystemEntries(string path);
-
-        /// <summary>
-        /// Saves the file.
-        /// </summary>
-        /// <param name="stream">The stream.</param>
-        /// <param name="path">The path.</param>
-        /// <returns>Task.</returns>
-        Task SaveFile(Stream stream, string path);
-
-#if WINDOWS_UWP
-        /// <summary>
-        /// Saves the file.
-        /// </summary>
-        /// <param name="file">The file.</param>
-        /// <param name="path">The path.</param>
-        /// <returns>Task.</returns>
-        Task SaveFile(Windows.Storage.IStorageFile file, string path);
-#endif
-
-        /// <summary>
-        /// Deletes the file.
-        /// </summary>
-        /// <param name="path">The path.</param>
-        /// <returns>Task.</returns>
-        Task DeleteFile(string path);
-
-        /// <summary>
-        /// Deletes the directory.
-        /// </summary>
-        /// <param name="path">The path.</param>
-        /// <returns>Task.</returns>
-        Task DeleteFolder(string path);
-
-        /// <summary>
-        /// Strips invalid characters from a given name
-        /// </summary>
-        /// <param name="name">The name.</param>
-        /// <returns>System.String.</returns>
-        string GetValidFileName(string name);
-
-        /// <summary>
-        /// Files the exists.
-        /// </summary>
-        /// <param name="path">The path.</param>
-        /// <returns>Task&lt;System.Boolean&gt;.</returns>
-        Task<bool> FileExists(string path);
-
-        /// <summary>
-        /// Gets the full local path.
-        /// </summary>
-        /// <param name="path">The path.</param>
-        /// <returns>System.String.</returns>
-        string GetFullLocalPath(IEnumerable<string> path);
-
-        /// <summary>
-        /// Gets the parent directory path.
-        /// </summary>
-        /// <param name="path">The path.</param>
-        /// <returns>System.String.</returns>
-        string GetParentDirectoryPath(string path);
-
-        /// <summary>
-        /// Gets the file stream.
-        /// </summary>
-        /// <param name="path">The path.</param>
-        /// <returns>Task&lt;Stream&gt;.</returns>
-        Task<Stream> GetFileStream(string path);
-#if WINDOWS_UWP
-        /// <summary>
-        /// Gets the file.
-        /// </summary>
-        /// <param name="path">The path.</param>
-        /// <returns>Task&lt;File&gt;.</returns>
-        Task<Windows.Storage.IStorageFile> GetFile(string path);
-#endif
-    }
-}
diff --git a/Emby.ApiClient/Data/IImageRepository.cs b/Emby.ApiClient/Data/IImageRepository.cs
deleted file mode 100644
index 4b324e6..0000000
--- a/Emby.ApiClient/Data/IImageRepository.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-using System.IO;
-using System.Threading.Tasks;
-
-namespace Emby.ApiClient.Data
-{
-    public interface IImageRepository
-    {
-        /// <summary>
-        /// Saves the image.
-        /// </summary>
-        /// <param name="itemId">The item identifier.</param>
-        /// <param name="imageId">The image identifier.</param>
-        /// <param name="stream">The stream.</param>
-        /// <returns>Task.</returns>
-        Task SaveImage(string itemId, string imageId, Stream stream);
-        /// <summary>
-        /// Gets the image.
-        /// </summary>
-        /// <param name="itemId">The item identifier.</param>
-        /// <param name="imageId">The image identifier.</param>
-        /// <returns>Task&lt;Stream&gt;.</returns>
-        Task<Stream> GetImage(string itemId, string imageId);
-        /// <summary>
-        /// Deletes the image.
-        /// </summary>
-        /// <param name="itemId">The item identifier.</param>
-        /// <param name="imageId">The image identifier.</param>
-        /// <returns>Task.</returns>
-        Task DeleteImage(string itemId, string imageId);
-        /// <summary>
-        /// Determines whether the specified item identifier has image.
-        /// </summary>
-        /// <param name="itemId">The item identifier.</param>
-        /// <param name="imageId">The image identifier.</param>
-        Task<bool> HasImage(string itemId, string imageId);
-        /// <summary>
-        /// Deletes the images.
-        /// </summary>
-        /// <param name="itemId">The item identifier.</param>
-        /// <returns>Task.</returns>
-        Task DeleteImages(string itemId);
-    }
-}
diff --git a/Emby.ApiClient/Data/IItemRepository.cs b/Emby.ApiClient/Data/IItemRepository.cs
deleted file mode 100644
index a3c4932..0000000
--- a/Emby.ApiClient/Data/IItemRepository.cs
+++ /dev/null
@@ -1,85 +0,0 @@
-using MediaBrowser.Model.Sync;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-
-namespace Emby.ApiClient.Data
-{
-    /// <summary>
-    /// Interface IItemRepository
-    /// </summary>
-    public interface IItemRepository
-    {
-        /// <summary>
-        /// Adds the or update.
-        /// </summary>
-        /// <param name="item">The item.</param>
-        /// <returns>Task.</returns>
-        Task AddOrUpdate(LocalItem item);
-
-        /// <summary>
-        /// Gets the item.
-        /// </summary>
-        /// <param name="id">The identifier.</param>
-        /// <returns>Task&lt;BaseItemDto&gt;.</returns>
-        Task<LocalItem> Get(string id);
-
-        /// <summary>
-        /// Deletes the specified identifier.
-        /// </summary>
-        /// <param name="id">The identifier.</param>
-        /// <returns>Task.</returns>
-        Task Delete(string id);
-
-        /// <summary>
-        /// Gets the server item ids.
-        /// </summary>
-        /// <param name="serverId">The server identifier.</param>
-        /// <returns>Task&lt;List&lt;System.String&gt;&gt;.</returns>
-        Task<List<string>> GetServerItemIds(string serverId);
-
-        /// <summary>
-        /// Queries all items for a server Id and returns a list of unique item types.
-        /// </summary>
-        /// <param name="serverId">The server identifier.</param>
-        /// <param name="userId">The user identifier.</param>
-        /// <returns>Task&lt;List&lt;System.String&gt;&gt;.</returns>
-        Task<List<string>> GetItemTypes(string serverId, string userId);
-
-        /// <summary>
-        /// Gets the items.
-        /// </summary>
-        /// <param name="query">The query.</param>
-        /// <returns>Task&lt;List&lt;LocalItem&gt;&gt;.</returns>
-        Task<List<LocalItem>> GetItems(LocalItemQuery query);
-
-        /// <summary>
-        /// Gets a list of unique AlbumArtist values
-        /// </summary>
-        /// <param name="serverId">The server identifier.</param>
-        /// <param name="userId">The user identifier.</param>
-        /// <returns>Task&lt;List&lt;System.String&gt;&gt;.</returns>
-        Task<List<LocalItemInfo>> GetAlbumArtists(string serverId, string userId);
-
-        /// <summary>
-        /// Gets a list of unique series, by id
-        /// Name = Album property
-        /// Id = SeriesId property
-        /// PrimaryImageTag = SeriesPrimaryImageTag
-        /// </summary>
-        /// <param name="serverId">The server identifier.</param>
-        /// <param name="userId">The user identifier.</param>
-        /// <returns>Task&lt;List&lt;LocalItemInfo&gt;&gt;.</returns>
-        Task<List<LocalItemInfo>> GetTvSeries(string serverId, string userId);
-
-        /// <summary>
-        /// Gets a list of unique photo albums, by Id
-        /// Name = Album property
-        /// Id = AlbumId property
-        /// PrimaryImageTag = AlbumPrimaryImageTag
-        /// </summary>
-        /// <param name="serverId">The server identifier.</param>
-        /// <param name="userId">The user identifier.</param>
-        /// <returns>Task&lt;List&lt;LocalItemInfo&gt;&gt;.</returns>
-        Task<List<LocalItemInfo>> GetPhotoAlbums(string serverId, string userId);
-    }
-}
diff --git a/Emby.ApiClient/Data/ILocalAssetManager.cs b/Emby.ApiClient/Data/ILocalAssetManager.cs
deleted file mode 100644
index 70da563..0000000
--- a/Emby.ApiClient/Data/ILocalAssetManager.cs
+++ /dev/null
@@ -1,237 +0,0 @@
-using MediaBrowser.Model.ApiClient;
-using MediaBrowser.Model.Dlna;
-using MediaBrowser.Model.Dto;
-using MediaBrowser.Model.Sync;
-using MediaBrowser.Model.Users;
-using System.Collections.Generic;
-using System.IO;
-using System.Threading.Tasks;
-using Emby.ApiClient.Model;
-
-namespace Emby.ApiClient.Data
-{
-    public interface ILocalAssetManager
-    {
-        /// <summary>
-        /// Records the user action.
-        /// </summary>
-        /// <param name="action">The action.</param>
-        /// <returns>Task.</returns>
-        Task RecordUserAction(UserAction action);
-
-        /// <summary>
-        /// Deletes the specified action.
-        /// </summary>
-        /// <param name="action">The action.</param>
-        /// <returns>Task.</returns>
-        Task Delete(UserAction action);
-
-        /// <summary>
-        /// Deletes the specified item.
-        /// </summary>
-        /// <param name="item">The item.</param>
-        /// <returns>Task.</returns>
-        Task Delete(LocalItem item);
-
-        /// <summary>
-        /// Gets all user actions by serverId
-        /// </summary>
-        /// <param name="serverId"></param>
-        /// <returns></returns>
-        Task<IEnumerable<UserAction>> GetUserActions(string serverId);
-
-        /// <summary>
-        /// Adds the or update.
-        /// </summary>
-        /// <param name="item">The item.</param>
-        /// <returns>Task.</returns>
-        Task AddOrUpdate(LocalItem item);
-
-        /// <summary>
-        /// Gets the files.
-        /// </summary>
-        /// <param name="item">The item.</param>
-        /// <returns>Task&lt;List&lt;ItemFileInfo&gt;&gt;.</returns>
-        Task<List<ItemFileInfo>> GetFiles(LocalItem item);
-
-        /// <summary>
-        /// Deletes the specified file.
-        /// </summary>
-        /// <param name="path">The path.</param>
-        /// <returns>Task.</returns>
-        Task DeleteFile(string path);
-
-        /// <summary>
-        /// Saves the subtitles.
-        /// </summary>
-        /// <param name="stream">The stream.</param>
-        /// <param name="format">The format.</param>
-        /// <param name="item">The item.</param>
-        /// <param name="language">The language.</param>
-        /// <param name="isForced">if set to <c>true</c> [is forced].</param>
-        /// <returns>Task&lt;System.String&gt;.</returns>
-        Task<string> SaveSubtitles(Stream stream,
-            string format,
-            LocalItem item,
-            string language,
-            bool isForced);
-
-        /// <summary>
-        /// Saves the media.
-        /// </summary>
-        /// <param name="stream">The stream.</param>
-        /// <param name="localItem">The local item.</param>
-        /// <param name="server">The server.</param>
-        /// <returns>Task.</returns>
-        Task SaveMedia(Stream stream, LocalItem localItem, ServerInfo server);
-#if WINDOWS_UWP
-        /// <summary>
-        /// Saves the media.
-        /// </summary>
-        /// <param name="file">The file.</param>
-        /// <param name="localItem">The local item.</param>
-        /// <param name="server">The server.</param>
-        /// <returns>Task.</returns>
-        Task SaveMedia(Windows.Storage.IStorageFile file, LocalItem localItem, ServerInfo server);
-#endif
-        /// <summary>
-        /// Creates the local item.
-        /// </summary>
-        /// <param name="libraryItem">The library item.</param>
-        /// <param name="server">The server.</param>
-        /// <param name="syncJobItemId">The synchronize job item identifier.</param>
-        /// <param name="originalFileName">Name of the original file.</param>
-        /// <returns>LocalItem.</returns>
-        LocalItem CreateLocalItem(BaseItemDto libraryItem, ServerInfo server, string syncJobItemId, string originalFileName);
-        /// <summary>
-        /// Gets the local item.
-        /// </summary>
-        /// <param name="localId">The local identifier.</param>
-        /// <returns>Task&lt;LocalItem&gt;.</returns>
-        Task<LocalItem> GetLocalItem(string localId);
-        /// <summary>
-        /// Gets the local item.
-        /// </summary>
-        /// <param name="serverId">The server identifier.</param>
-        /// <param name="itemId">The item identifier.</param>
-        /// <returns>Task&lt;LocalItem&gt;.</returns>
-        Task<LocalItem> GetLocalItem(string serverId, string itemId);
-        /// <summary>
-        /// Files the exists.
-        /// </summary>
-        /// <param name="path">The path.</param>
-        /// <returns>Task&lt;System.Boolean&gt;.</returns>
-        Task<bool> FileExists(string path);
-        /// <summary>
-        /// Gets the server item ids.
-        /// </summary>
-        /// <param name="serverId">The server identifier.</param>
-        /// <returns>Task&lt;List&lt;System.String&gt;&gt;.</returns>
-        Task<List<string>> GetServerItemIds(string serverId);
-        /// <summary>
-        /// Gets the file stream.
-        /// </summary>
-        /// <param name="info">The information.</param>
-        /// <returns>Task&lt;Stream&gt;.</returns>
-        Task<Stream> GetFileStream(StreamInfo info);
-        /// <summary>
-        /// Gets the file stream.
-        /// </summary>
-        /// <param name="path">The path.</param>
-        /// <returns>Task&lt;Stream&gt;.</returns>
-        Task<Stream> GetFileStream(string path);
-        /// <summary>
-        /// Saves the offline user.
-        /// </summary>
-        /// <param name="user">The user.</param>
-        /// <returns>Task.</returns>
-        Task SaveOfflineUser(UserDto user);
-        /// <summary>
-        /// Deletes the offline user.
-        /// </summary>
-        /// <param name="id">The identifier.</param>
-        /// <returns>Task.</returns>
-        Task DeleteOfflineUser(string id);
-        /// <summary>
-        /// Saves the user image.
-        /// </summary>
-        /// <param name="user">The user.</param>
-        /// <param name="stream">The stream.</param>
-        /// <returns>Task.</returns>
-        Task SaveImage(UserDto user, Stream stream);
-        /// <summary>
-        /// Gets the user image.
-        /// </summary>
-        /// <param name="user">The user.</param>
-        /// <returns>Task&lt;Stream&gt;.</returns>
-        Task<Stream> GetImage(UserDto user);
-        /// <summary>
-        /// Deletes the user image.
-        /// </summary>
-        /// <param name="user">The user.</param>
-        /// <returns>Task.</returns>
-        Task DeleteImage(UserDto user);
-        /// <summary>
-        /// Determines whether the specified user has image.
-        /// </summary>
-        /// <param name="user">The user.</param>
-        Task<bool> HasImage(UserDto user);
-        /// <summary>
-        /// Saves the item image.
-        /// </summary>
-        /// <param name="serverId">The server identifier.</param>
-        /// <param name="itemId">The item identifier.</param>
-        /// <param name="imageId">The image identifier.</param>
-        /// <param name="stream">The stream.</param>
-        /// <returns>Task.</returns>
-        Task SaveImage(string serverId, string itemId, string imageId, Stream stream);
-        /// <summary>
-        /// Determines whether the specified server identifier has image.
-        /// </summary>
-        /// <param name="serverId">The server identifier.</param>
-        /// <param name="itemId">The item identifier.</param>
-        /// <param name="imageId">The image identifier.</param>
-        Task<bool> HasImage(string serverId, string itemId, string imageId);
-        /// <summary>
-        /// Gets the image.
-        /// </summary>
-        /// <param name="serverId">The server identifier.</param>
-        /// <param name="itemId">The item identifier.</param>
-        /// <param name="imageId">The image identifier.</param>
-        /// <returns>Task&lt;Stream&gt;.</returns>
-        Task<Stream> GetImage(string serverId, string itemId, string imageId);
-        /// <summary>
-        /// Determines whether the specified item has image.
-        /// </summary>
-        /// <param name="item">The item.</param>
-        /// <param name="imageId">The image identifier.</param>
-        Task<bool> HasImage(BaseItemDto item, string imageId);
-        /// <summary>
-        /// Gets the image.
-        /// </summary>
-        /// <param name="item">The item.</param>
-        /// <param name="imageId">The image identifier.</param>
-        /// <returns>Task&lt;Stream&gt;.</returns>
-        Task<Stream> GetImage(BaseItemDto item, string imageId);
-        /// <summary>
-        /// Gets the views.
-        /// </summary>
-        /// <param name="serverId">The server identifier.</param>
-        /// <param name="userId">The user identifier.</param>
-        /// <returns>Task&lt;List&lt;BaseItemDto&gt;&gt;.</returns>
-        Task<List<BaseItemDto>> GetViews(string serverId, string userId);
-        /// <summary>
-        /// Gets the items.
-        /// </summary>
-        /// <param name="user">The user.</param>
-        /// <param name="parentItem">The parent item.</param>
-        /// <returns>Task&lt;List&lt;BaseItemDto&gt;&gt;.</returns>
-        Task<List<BaseItemDto>> GetItems(UserDto user, BaseItemDto parentItem);
-        /// <summary>
-        /// Gets the user.
-        /// </summary>
-        /// <param name="id">The identifier.</param>
-        /// <returns>Task&lt;UserDto&gt;.</returns>
-        Task<UserDto> GetUser(string id);
-    }
-}
\ No newline at end of file
diff --git a/Emby.ApiClient/Data/IUserActionRepository.cs b/Emby.ApiClient/Data/IUserActionRepository.cs
deleted file mode 100644
index 2948d1e..0000000
--- a/Emby.ApiClient/Data/IUserActionRepository.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-using MediaBrowser.Model.Users;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-
-namespace Emby.ApiClient.Data
-{
-    public interface IUserActionRepository
-    {
-        /// <summary>
-        /// Creates the specified action.
-        /// </summary>
-        /// <param name="action">The action.</param>
-        /// <returns>Task.</returns>
-        Task Create(UserAction action);
-
-        /// <summary>
-        /// Deletes the specified action.
-        /// </summary>
-        /// <param name="action">The action.</param>
-        /// <returns>Task.</returns>
-        Task Delete(UserAction action);
-
-        /// <summary>
-        /// Gets all user actions by serverId
-        /// </summary>
-        /// <param name="serverId"></param>
-        /// <returns></returns>
-        Task<IEnumerable<UserAction>> Get(string serverId);
-    }
-}
diff --git a/Emby.ApiClient/Data/IUserRepository.cs b/Emby.ApiClient/Data/IUserRepository.cs
deleted file mode 100644
index b1dbbc0..0000000
--- a/Emby.ApiClient/Data/IUserRepository.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-using MediaBrowser.Model.Dto;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-
-namespace Emby.ApiClient.Data
-{
-    public interface IUserRepository
-    {
-        /// <summary>
-        /// Adds the or update.
-        /// </summary>
-        /// <param name="id">The identifier.</param>
-        /// <param name="user">The user.</param>
-        /// <returns>Task.</returns>
-        Task AddOrUpdate(string id, UserDto user);
-        /// <summary>
-        /// Deletes the specified identifier.
-        /// </summary>
-        /// <param name="id">The identifier.</param>
-        /// <returns>Task.</returns>
-        Task Delete(string id);
-        /// <summary>
-        /// Gets the specified identifier.
-        /// </summary>
-        /// <param name="id">The identifier.</param>
-        /// <returns>Task&lt;UserDto&gt;.</returns>
-        Task<UserDto> Get(string id);
-        /// <summary>
-        /// Gets all.
-        /// </summary>
-        /// <returns>Task&lt;List&lt;UserDto&gt;&gt;.</returns>
-        Task<List<UserDto>> GetAll();
-    }
-}
diff --git a/Emby.ApiClient/Data/LocalAssetManager.cs b/Emby.ApiClient/Data/LocalAssetManager.cs
deleted file mode 100644
index 9515f29..0000000
--- a/Emby.ApiClient/Data/LocalAssetManager.cs
+++ /dev/null
@@ -1,695 +0,0 @@
-using MediaBrowser.Model.ApiClient;
-using MediaBrowser.Model.Dlna;
-using MediaBrowser.Model.Dto;
-using MediaBrowser.Model.Entities;
-using MediaBrowser.Model.Logging;
-using MediaBrowser.Model.MediaInfo;
-using MediaBrowser.Model.Sync;
-using MediaBrowser.Model.Users;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Emby.ApiClient.Cryptography;
-using Emby.ApiClient.Model;
-
-namespace Emby.ApiClient.Data
-{
-    public class LocalAssetManager : ILocalAssetManager
-    {
-        private readonly IUserActionRepository _userActionRepository;
-        private readonly IItemRepository _itemRepository;
-        private readonly IFileRepository _fileRepository;
-        private readonly ICryptographyProvider _cryptographyProvider;
-        private readonly ILogger _logger;
-        private readonly IUserRepository _userRepository;
-        private readonly IImageRepository _imageRepository;
-
-        public LocalAssetManager(IUserActionRepository userActionRepository, IItemRepository itemRepository, IFileRepository fileRepository, ICryptographyProvider cryptographyProvider, ILogger logger, IUserRepository userRepository, IImageRepository iImageRepository)
-        {
-            _userActionRepository = userActionRepository;
-            _itemRepository = itemRepository;
-            _fileRepository = fileRepository;
-            _cryptographyProvider = cryptographyProvider;
-            _logger = logger;
-            _userRepository = userRepository;
-            _imageRepository = iImageRepository;
-        }
-
-        /// <summary>
-        /// Records the user action.
-        /// </summary>
-        /// <param name="action">The action.</param>
-        /// <returns>Task.</returns>
-        public Task RecordUserAction(UserAction action)
-        {
-            action.Id = Guid.NewGuid().ToString("N");
-
-            return _userActionRepository.Create(action);
-        }
-
-        /// <summary>
-        /// Deletes the specified action.
-        /// </summary>
-        /// <param name="action">The action.</param>
-        /// <returns>Task.</returns>
-        public Task Delete(UserAction action)
-        {
-            return _userActionRepository.Delete(action);
-        }
-
-        /// <summary>
-        /// Deletes the specified item.
-        /// </summary>
-        /// <param name="item">The item.</param>
-        /// <returns>Task.</returns>
-        public Task Delete(LocalItem item)
-        {
-            return _itemRepository.Delete(item.Id);
-        }
-
-        /// <summary>
-        /// Gets all user actions by serverId
-        /// </summary>
-        /// <param name="serverId"></param>
-        /// <returns></returns>
-        public Task<IEnumerable<UserAction>> GetUserActions(string serverId)
-        {
-            return _userActionRepository.Get(serverId);
-        }
-
-        /// <summary>
-        /// Adds the or update.
-        /// </summary>
-        /// <param name="item">The item.</param>
-        /// <returns>Task.</returns>
-        public Task AddOrUpdate(LocalItem item)
-        {
-            return _itemRepository.AddOrUpdate(item);
-        }
-
-        /// <summary>
-        /// Gets the files.
-        /// </summary>
-        /// <param name="item">The item.</param>
-        /// <returns>Task&lt;List&lt;ItemFileInfo&gt;&gt;.</returns>
-        public async Task<List<ItemFileInfo>> GetFiles(LocalItem item)
-        {
-            var path = item.LocalPath;
-            path = _fileRepository.GetParentDirectoryPath(path);
-
-            var list = await _fileRepository.GetFileSystemEntries(path).ConfigureAwait(false);
-
-            var itemFiles = new List<ItemFileInfo>();
-
-            var name = Path.GetFileNameWithoutExtension(item.LocalPath);
-
-            foreach (var file in list.Where(f => f.Name.Contains(name)))
-            {
-                var itemFile = new ItemFileInfo
-                {
-                    Path = file.Path,
-                    Name = file.Name
-                };
-
-                if (IsSubtitleFile(file.Name))
-                {
-                    itemFile.Type = ItemFileType.Subtitles;
-                }
-                else if (!IsImageFile(file.Name))
-                {
-                    itemFile.Type = ItemFileType.Media;
-                }
-
-                itemFiles.Add(itemFile);
-            }
-
-            return itemFiles;
-        }
-
-        private static readonly string[] SupportedImageExtensions = { ".png", ".jpg", ".jpeg", ".webp" };
-        private bool IsImageFile(string path)
-        {
-            var ext = Path.GetExtension(path) ?? string.Empty;
-
-            return SupportedImageExtensions.Contains(ext, StringComparer.OrdinalIgnoreCase);
-        }
-
-        private static readonly string[] SupportedSubtitleExtensions = { ".srt", ".vtt" };
-        private bool IsSubtitleFile(string path)
-        {
-            var ext = Path.GetExtension(path) ?? string.Empty;
-
-            return SupportedSubtitleExtensions.Contains(ext, StringComparer.OrdinalIgnoreCase);
-        }
-
-        /// <summary>
-        /// Deletes the specified file.
-        /// </summary>
-        /// <param name="path">The path.</param>
-        /// <returns>Task.</returns>
-        public Task DeleteFile(string path)
-        {
-            return _fileRepository.DeleteFile(path);
-        }
-
-        public async Task<string> SaveSubtitles(Stream stream,
-            string format,
-            LocalItem item,
-            string language,
-            bool isForced)
-        {
-            var path = item.LocalPath;
-
-            var filename = GetSubtitleSaveFileName(item, language, isForced) + "." + format.ToLower();
-
-            var parentPath = _fileRepository.GetParentDirectoryPath(path);
-
-            path = Path.Combine(parentPath, filename);
-
-            await _fileRepository.SaveFile(stream, path);
-
-            return path;
-        }
-
-        private string GetSubtitleSaveFileName(LocalItem item, string language, bool isForced)
-        {
-            var path = item.LocalPath;
-
-            var name = Path.GetFileNameWithoutExtension(path);
-
-            if (!string.IsNullOrWhiteSpace(language))
-            {
-                name += "." + language.ToLower();
-            }
-
-            if (isForced)
-            {
-                name += ".foreign";
-            }
-
-            return name;
-        }
-
-        public Task SaveMedia(Stream stream, LocalItem localItem, ServerInfo server)
-        {
-            _logger.Debug("Saving media to " + localItem.LocalPath);
-            return _fileRepository.SaveFile(stream, localItem.LocalPath);
-        }
-
-#if WINDOWS_UWP
-        public Task SaveMedia(Windows.Storage.IStorageFile file, LocalItem localItem, ServerInfo server)
-        {
-            _logger.Debug("Saving media to " + localItem.LocalPath);
-            return _fileRepository.SaveFile(file, localItem.LocalPath);
-        }
-#endif
-
-        private List<string> GetDirectoryPath(BaseItemDto item, ServerInfo server)
-        {
-            var parts = new List<string>
-            {
-                server.Name
-            };
-
-            if (item.IsType("episode"))
-            {
-                parts.Add("TV");
-                parts.Add(item.SeriesName);
-
-                if (!string.IsNullOrWhiteSpace(item.SeasonName))
-                {
-                    parts.Add(item.SeasonName);
-                }
-            }
-            else if (string.Equals(item.MediaType, "video", StringComparison.OrdinalIgnoreCase))
-            {
-                parts.Add("Videos");
-                parts.Add(item.Name);
-            }
-            else if (string.Equals(item.MediaType, "audio", StringComparison.OrdinalIgnoreCase))
-            {
-                parts.Add("Music");
-
-                if (!string.IsNullOrWhiteSpace(item.AlbumArtist))
-                {
-                    parts.Add(item.AlbumArtist);
-                }
-
-                if (!string.IsNullOrWhiteSpace(item.Album))
-                {
-                    parts.Add(item.Album);
-                }
-            }
-            else if (string.Equals(item.MediaType, MediaType.Photo, StringComparison.OrdinalIgnoreCase))
-            {
-                parts.Add("Photos");
-
-                if (!string.IsNullOrWhiteSpace(item.Album))
-                {
-                    parts.Add(item.Album);
-                }
-            }
-
-            return parts.Select(_fileRepository.GetValidFileName).ToList();
-        }
-
-        public LocalItem CreateLocalItem(BaseItemDto libraryItem, ServerInfo server, string syncJobItemId, string originalFileName)
-        {
-            var path = GetDirectoryPath(libraryItem, server);
-            path.Add(GetLocalFileName(libraryItem, originalFileName));
-
-            var localPath = _fileRepository.GetFullLocalPath(path);
-
-            foreach (var mediaSource in libraryItem.MediaSources)
-            {
-                mediaSource.Path = localPath;
-                mediaSource.Protocol = MediaProtocol.File;
-            }
-
-            return new LocalItem
-            {
-                Item = libraryItem,
-                ItemId = libraryItem.Id,
-                ServerId = server.Id,
-                LocalPath = localPath,
-                Id = GetLocalId(server.Id, libraryItem.Id),
-                SyncJobItemId = syncJobItemId
-            };
-        }
-
-        private string GetLocalFileName(BaseItemDto item, string originalFileName)
-        {
-            var filename = originalFileName;
-
-            if (string.IsNullOrEmpty(filename))
-            {
-                filename = item.Name;
-            }
-
-            return _fileRepository.GetValidFileName(filename);
-        }
-
-        private string GetLocalId(string serverId, string itemId)
-        {
-            var bytes = Encoding.UTF8.GetBytes(serverId + itemId);
-            bytes = _cryptographyProvider.CreateMD5(bytes);
-            return BitConverter.ToString(bytes, 0, bytes.Length).Replace("-", string.Empty);
-        }
-
-        public Task<LocalItem> GetLocalItem(string localId)
-        {
-            return _itemRepository.Get(localId);
-        }
-
-        public Task<LocalItem> GetLocalItem(string serverId, string itemId)
-        {
-            return GetLocalItem(GetLocalId(serverId, itemId));
-        }
-
-        public Task<bool> FileExists(string path)
-        {
-            return _fileRepository.FileExists(path);
-        }
-
-        public Task<List<string>> GetServerItemIds(string serverId)
-        {
-            return _itemRepository.GetServerItemIds(serverId);
-        }
-
-        public Task<Stream> GetFileStream(StreamInfo info)
-        {
-            return GetFileStream(info.ToUrl(null, null));
-        }
-
-        public Task<Stream> GetFileStream(string path)
-        {
-            return _fileRepository.GetFileStream(path);
-        }
-
-        public Task SaveOfflineUser(UserDto user)
-        {
-            return _userRepository.AddOrUpdate(user.Id, user);
-        }
-
-        public Task DeleteOfflineUser(string id)
-        {
-            return _userRepository.Delete(id);
-        }
-
-        public async Task SaveImage(UserDto user, Stream stream)
-        {
-            await DeleteImage(user).ConfigureAwait(false);
-
-            await _imageRepository.SaveImage(GetImageRepositoryId(user.ServerId, user.Id), user.PrimaryImageTag, stream).ConfigureAwait(false);
-        }
-
-        public Task<Stream> GetImage(UserDto user)
-        {
-            return _imageRepository.GetImage(user.Id, user.PrimaryImageTag);
-        }
-
-        public Task<UserDto> GetUser(string id)
-        {
-            return _userRepository.Get(id);
-        }
-
-        public Task DeleteImage(UserDto user)
-        {
-            return _imageRepository.DeleteImages(GetImageRepositoryId(user.ServerId, user.Id));
-        }
-
-        public Task<bool> HasImage(UserDto user)
-        {
-            return _imageRepository.HasImage(GetImageRepositoryId(user.ServerId, user.Id), user.PrimaryImageTag);
-        }
-
-        public Task SaveImage(string serverId, string itemId, string imageId, Stream stream)
-        {
-            return _imageRepository.SaveImage(GetImageRepositoryId(serverId, itemId), imageId, stream);
-        }
-
-        public Task<bool> HasImage(string serverId, string itemId, string imageId)
-        {
-            return _imageRepository.HasImage(GetImageRepositoryId(serverId, itemId), imageId);
-        }
-
-        public Task<Stream> GetImage(string serverId, string itemId, string imageId)
-        {
-            return _imageRepository.GetImage(GetImageRepositoryId(serverId, itemId), imageId);
-        }
-
-        private string GetImageRepositoryId(string serverId, string itemId)
-        {
-            return GetLocalId(serverId, itemId);
-        }
-
-        public Task<bool> HasImage(BaseItemDto item, string imageId)
-        {
-            return _imageRepository.HasImage(GetImageRepositoryId(item.ServerId, item.Id), imageId);
-        }
-
-        public Task<Stream> GetImage(BaseItemDto item, string imageId)
-        {
-            return _imageRepository.GetImage(GetImageRepositoryId(item.ServerId, item.Id), imageId);
-        }
-
-        public async Task<List<BaseItemDto>> GetViews(string serverId, string userId)
-        {
-            var list = new List<BaseItemDto>();
-
-            var types = await _itemRepository.GetItemTypes(serverId, userId).ConfigureAwait(false);
-
-            if (types.Contains("Audio", StringComparer.OrdinalIgnoreCase))
-            {
-                list.Add(new BaseItemDto
-                {
-                    Name = "Music",
-                    ServerId = serverId,
-                    Id = "MusicView",
-                    Type = "MusicView",
-                    CollectionType = CollectionType.Music
-                });
-            }
-
-            if (types.Contains("Photo", StringComparer.OrdinalIgnoreCase))
-            {
-                list.Add(new BaseItemDto
-                {
-                    Name = "Photos",
-                    ServerId = serverId,
-                    Id = "PhotosView",
-                    Type = "PhotosView",
-                    CollectionType = CollectionType.Photos
-                });
-            }
-
-            if (types.Contains("Episode", StringComparer.OrdinalIgnoreCase))
-            {
-                list.Add(new BaseItemDto
-                {
-                    Name = "TV",
-                    ServerId = serverId,
-                    Id = "TVView",
-                    Type = "TVView",
-                    CollectionType = CollectionType.TvShows
-                });
-            }
-
-            if (types.Contains("Video", StringComparer.OrdinalIgnoreCase) ||
-                types.Contains("Movie", StringComparer.OrdinalIgnoreCase) ||
-                types.Contains("MusicVideo", StringComparer.OrdinalIgnoreCase))
-            {
-                list.Add(new BaseItemDto
-                {
-                    Name = "Videos",
-                    ServerId = serverId,
-                    Id = "VideosView",
-                    Type = "VideosView",
-                    CollectionType = CollectionType.HomeVideos
-                });
-            }
-
-            return list;
-        }
-
-        public Task<List<BaseItemDto>> GetItems(UserDto user, BaseItemDto parentItem)
-        {
-            if (string.Equals(parentItem.Type, "MusicView"))
-            {
-                return GetMusicArtists(user, parentItem);
-            }
-            if (string.Equals(parentItem.Type, "MusicArtist"))
-            {
-                return GetMusicAlbums(user, parentItem);
-            }
-            if (string.Equals(parentItem.Type, "MusicAlbum"))
-            {
-                return GetAlbumSongs(user, parentItem);
-            }
-            if (string.Equals(parentItem.Type, "PhotosView"))
-            {
-                return GetPhotoAlbums(user, parentItem);
-            }
-            if (string.Equals(parentItem.Type, "PhotoAlbum"))
-            {
-                return GetPhotos(user, parentItem);
-            }
-            if (string.Equals(parentItem.Type, "VideosView"))
-            {
-                return GetVideos(user, parentItem);
-            }
-            if (string.Equals(parentItem.Type, "TVView"))
-            {
-                return GetTvSeries(user, parentItem);
-            }
-            if (string.Equals(parentItem.Type, "Series"))
-            {
-                return GetTvEpisodes(user, parentItem);
-            }
-
-            return Task.FromResult(new List<BaseItemDto>());
-        }
-
-        private async Task<List<BaseItemDto>> GetMusicArtists(UserDto user, BaseItemDto parentItem)
-        {
-            var artists = await _itemRepository.GetAlbumArtists(user.ServerId, user.Id).ConfigureAwait(false);
-
-            return artists
-                .OrderBy(i => i.Name)
-                .Select(i =>
-                {
-                    var item = new BaseItemDto
-                    {
-                        Name = i.Name,
-                        Id = i.Id,
-                        Type = "MusicArtist",
-                        ServerId = i.ServerId,
-                        ImageTags = new Dictionary<ImageType, string>()
-                    };
-
-                    if (!string.IsNullOrWhiteSpace(i.PrimaryImageTag))
-                    {
-                        item.ImageTags[ImageType.Primary] = i.PrimaryImageTag;
-                    }
-
-                    return item;
-                })
-                .ToList();
-        }
-
-        private async Task<List<BaseItemDto>> GetMusicAlbums(UserDto user, BaseItemDto parentItem)
-        {
-            var items = await _itemRepository.GetItems(new LocalItemQuery
-            {
-                AlbumArtistId = parentItem.Id,
-                ServerId = user.ServerId,
-                Type = "Audio"
-            });
-
-            var dict = new Dictionary<string, List<BaseItemDto>>();
-
-            foreach (var item in FilterByUserAccess(items, user))
-            {
-                if (!string.IsNullOrWhiteSpace(item.Item.AlbumId))
-                {
-                    List<BaseItemDto> subItems;
-                    if (!dict.TryGetValue(item.Item.AlbumId, out subItems))
-                    {
-                        subItems = new List<BaseItemDto>();
-                        dict[item.Item.AlbumId] = subItems;
-                    }
-                    subItems.Add(item.Item);
-                }
-            }
-
-            return dict
-                .OrderBy(i => i.Value[0].Album)
-                .Select(i => new BaseItemDto
-                {
-                    Name = i.Value[0].Album,
-                    Id = i.Key,
-                    Type = "MusicAlbum",
-                    ServerId = user.ServerId,
-                    SongCount = i.Value.Count,
-                    ChildCount = i.Value.Count,
-                    AlbumPrimaryImageTag = i.Value[0].AlbumPrimaryImageTag,
-                    Genres = i.Value.SelectMany(m => m.Genres).Distinct(StringComparer.OrdinalIgnoreCase).OrderBy(m => m).ToList(),
-                    Artists = i.Value.SelectMany(m => m.Artists).Distinct(StringComparer.OrdinalIgnoreCase).OrderBy(m => m).ToArray()
-                })
-                .ToList();
-        }
-
-        private async Task<List<BaseItemDto>> GetAlbumSongs(UserDto user, BaseItemDto parentItem)
-        {
-            var items = await _itemRepository.GetItems(new LocalItemQuery
-            {
-                AlbumId = parentItem.Id,
-                ServerId = user.ServerId,
-                MediaType = "Audio"
-            });
-
-            return FilterByUserAccess(items, user)
-                .Select(i => i.Item)
-                .OrderBy(i => i.SortName)
-                .ToList();
-        }
-
-        private async Task<List<BaseItemDto>> GetPhotoAlbums(UserDto user, BaseItemDto parentItem)
-        {
-            var albums = await _itemRepository.GetPhotoAlbums(user.ServerId, user.Id).ConfigureAwait(false);
-
-            return albums
-                .OrderBy(i => i.Name)
-                .Select(i =>
-                {
-                    var item = new BaseItemDto
-                    {
-                        Name = i.Name,
-                        Id = i.Id,
-                        Type = "PhotoAlbum",
-                        ServerId = i.ServerId,
-                        ImageTags = new Dictionary<ImageType, string>()
-                    };
-
-                    if (!string.IsNullOrWhiteSpace(i.PrimaryImageTag))
-                    {
-                        item.ImageTags[ImageType.Primary] = i.PrimaryImageTag;
-                    }
-
-                    return item;
-                })
-                .ToList();
-        }
-
-        private async Task<List<BaseItemDto>> GetPhotos(UserDto user, BaseItemDto parentItem)
-        {
-            var items = await _itemRepository.GetItems(new LocalItemQuery
-            {
-                AlbumId = parentItem.Id,
-                ServerId = user.ServerId,
-                MediaType = "Photo"
-            });
-
-            return FilterByUserAccess(items, user)
-                .Select(i => i.Item)
-                .OrderBy(i => i.SortName)
-                .ToList();
-        }
-
-        private async Task<List<BaseItemDto>> GetTvSeries(UserDto user, BaseItemDto parentItem)
-        {
-            var shows = await _itemRepository.GetTvSeries(user.ServerId, user.Id).ConfigureAwait(false);
-
-            return shows
-                .OrderBy(i => i.Name)
-                .Select(i =>
-                {
-                    var item = new BaseItemDto
-                    {
-                        Name = i.Name,
-                        Id = i.Id,
-                        Type = "Series",
-                        ServerId = i.ServerId,
-                        ImageTags = new Dictionary<ImageType, string>()
-                    };
-
-                    if (!string.IsNullOrWhiteSpace(i.PrimaryImageTag))
-                    {
-                        item.ImageTags[ImageType.Primary] = i.PrimaryImageTag;
-                    }
-
-                    return item;
-                })
-                .ToList();
-        }
-
-        private async Task<List<BaseItemDto>> GetTvEpisodes(UserDto user, BaseItemDto parentItem)
-        {
-            var items = await _itemRepository.GetItems(new LocalItemQuery
-            {
-                SeriesId = parentItem.Id,
-                ServerId = user.ServerId,
-                MediaType = "Video",
-                Type = "Episode"
-            });
-
-            return FilterByUserAccess(items, user)
-                .Select(i => i.Item)
-                .OrderBy(i => i.SortName)
-                .ToList();
-        }
-
-        private async Task<List<BaseItemDto>> GetVideos(UserDto user, BaseItemDto parentItem)
-        {
-            var items = await _itemRepository.GetItems(new LocalItemQuery
-            {
-                ServerId = user.ServerId,
-                MediaType = "Video",
-                ExcludeTypes = new[] { "Episode" }
-            });
-
-            return FilterByUserAccess(items, user)
-                .Select(i => i.Item)
-                .OrderBy(i => i.SortName)
-                .ToList();
-        }
-
-        private IEnumerable<LocalItem> FilterByUserAccess(IEnumerable<LocalItem> items, UserDto user)
-        {
-            return items.Where(i =>
-            {
-                var result = i.UserIdsWithAccess.Contains(user.Id, StringComparer.OrdinalIgnoreCase);
-
-                if (!result)
-                {
-                    _logger.Debug("Offline item {0} is blocked from user {1}", i.Item.Name, user.Name);
-                }
-
-                return result;
-            });
-        }
-    }
-}
diff --git a/Emby.ApiClient/Device.cs b/Emby.ApiClient/Device.cs
deleted file mode 100644
index aa4d7c7..0000000
--- a/Emby.ApiClient/Device.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using MediaBrowser.Model.ApiClient;
-using MediaBrowser.Model.Devices;
-using Microsoft.Win32;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Threading;
-using System.Threading.Tasks;
-using Emby.ApiClient.Model;
-
-namespace Emby.ApiClient
-{
-    public class Device : IDevice
-    {
-        public string DeviceName { get; set; }
-        public string DeviceId { get; set; }
-
-        public virtual async Task<IEnumerable<LocalFileInfo>> GetLocalPhotos()
-        {
-            return new List<LocalFileInfo>();
-        }
-
-        public virtual async Task<IEnumerable<LocalFileInfo>> GetLocalVideos()
-        {
-            return new List<LocalFileInfo>();
-        }
-
-        public Task UploadFile(LocalFileInfo file, IApiClient apiClient, CancellationToken cancellationToken = default(CancellationToken))
-        {
-            return apiClient.UploadFile(File.OpenRead(file.Id), file, cancellationToken);
-        }
-    }
-}
diff --git a/Emby.ApiClient/Emby.ApiClient.csproj b/Emby.ApiClient/Emby.ApiClient.csproj
deleted file mode 100644
index 5cfe03f..0000000
--- a/Emby.ApiClient/Emby.ApiClient.csproj
+++ /dev/null
@@ -1,24 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net46</TargetFrameworks>
-    <AssemblyVersion>1.1.1.0</AssemblyVersion>
-    <FileVersion>1.1.1.0</FileVersion>
-    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <PackageId>MediaBrowser.ApiClient</PackageId>
-    <Version>3.1.1</Version>
-    <Authors>Emby</Authors>
-    <Company>Emby</Company>
-    <Description>Api libraries for connecting to Emby Server.</Description>
-    <PackageIconUrl>http://www.mb3admin.com/images/mb3icons1-1.png</PackageIconUrl>
-    <PackageProjectUrl>https://github.com/MediaBrowser/Emby.ApiClient</PackageProjectUrl>
-    <RepositoryUrl>https://github.com/MediaBrowser/Emby.ApiClient</RepositoryUrl>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="mediabrowser.common" Version="3.3.10" />
-    <PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
-    <PackageReference Include="WebSocket4Net" Version="0.15.2" />
-  </ItemGroup>
-
-</Project>
diff --git a/Emby.ApiClient/Model/ConnectionMode.cs b/Emby.ApiClient/Model/ConnectionMode.cs
deleted file mode 100644
index f2abdf9..0000000
--- a/Emby.ApiClient/Model/ConnectionMode.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-namespace Emby.ApiClient.Model
-{
-    public enum ConnectionMode
-    {
-        Local = 1,
-        Remote = 2,
-        Manual = 3
-    }
-}
\ No newline at end of file
diff --git a/Emby.ApiClient/Model/IDevice.cs b/Emby.ApiClient/Model/IDevice.cs
deleted file mode 100644
index 59b82bd..0000000
--- a/Emby.ApiClient/Model/IDevice.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-using MediaBrowser.Model.Devices;
-using System;
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace Emby.ApiClient.Model
-{
-    public interface IDevice
-    {
-        /// <summary>
-        /// Gets the name of the device.
-        /// </summary>
-        /// <value>The name of the device.</value>
-        string DeviceName { get; }
-        /// <summary>
-        /// Gets the device identifier.
-        /// </summary>
-        /// <value>The device identifier.</value>
-        string DeviceId { get; }
-        /// <summary>
-        /// Gets the local images.
-        /// </summary>
-        /// <returns>IEnumerable&lt;LocalFileInfo&gt;.</returns>
-        Task<IEnumerable<LocalFileInfo>> GetLocalPhotos();
-        /// <summary>
-        /// Gets the local videos.
-        /// </summary>
-        /// <returns>IEnumerable&lt;LocalFileInfo&gt;.</returns>
-        Task<IEnumerable<LocalFileInfo>> GetLocalVideos();
-        /// <summary>
-        /// Uploads the file.
-        /// </summary>
-        /// <param name="file">The file.</param>
-        /// <param name="apiClient">The API client.</param>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        /// <returns>Task.</returns>
-        Task UploadFile(LocalFileInfo file, IApiClient apiClient, CancellationToken cancellationToken = default(CancellationToken));
-    }
-}
diff --git a/Emby.ApiClient/Model/ServerInfo.cs b/Emby.ApiClient/Model/ServerInfo.cs
deleted file mode 100644
index 60c4a47..0000000
--- a/Emby.ApiClient/Model/ServerInfo.cs
+++ /dev/null
@@ -1,77 +0,0 @@
-using MediaBrowser.Model.Connect;
-using MediaBrowser.Model.Extensions;
-using MediaBrowser.Model.System;
-using System;
-using System.Collections.Generic;
-using MediaBrowser.Model.ApiClient;
-
-namespace Emby.ApiClient.Model
-{
-    public class ServerInfo
-    {
-        public String Name { get; set; }
-        public String Id { get; set; }
-        public String ConnectServerId { get; set; }
-        public String LocalAddress { get; set; }
-        public String RemoteAddress { get; set; }
-        public String ManualAddress { get; set; }
-        public String UserId { get; set; }
-        public String AccessToken { get; set; }
-        public List<WakeOnLanInfo> WakeOnLanInfos { get; set; }
-        public DateTime DateLastAccessed { get; set; }
-        public String ExchangeToken { get; set; }
-        public UserLinkType? UserLinkType { get; set; }
-        public ConnectionMode? LastConnectionMode { get; set; }
-
-        public ServerInfo()
-        {
-            WakeOnLanInfos = new List<WakeOnLanInfo>();
-        }
-
-        public void ImportInfo(PublicSystemInfo systemInfo)
-        {
-            Name = systemInfo.ServerName;
-            Id = systemInfo.Id;
-
-            if (!string.IsNullOrEmpty(systemInfo.LocalAddress))
-            {
-                LocalAddress = systemInfo.LocalAddress;
-            }
-
-            if (!string.IsNullOrEmpty(systemInfo.WanAddress))
-            {
-                RemoteAddress = systemInfo.WanAddress;
-            }
-
-            var fullSystemInfo = systemInfo as SystemInfo;
-
-            if (fullSystemInfo != null)
-            {
-                WakeOnLanInfos = new List<WakeOnLanInfo>();
-
-                if (!string.IsNullOrEmpty(fullSystemInfo.MacAddress))
-                {
-                    WakeOnLanInfos.Add(new WakeOnLanInfo
-                    {
-                        MacAddress = fullSystemInfo.MacAddress
-                    });
-                }
-            }
-        }
-
-        public string GetAddress(ConnectionMode mode)
-        {
-            switch (mode)
-            {
-                case ConnectionMode.Local:
-                    return LocalAddress;
-                case ConnectionMode.Manual:
-                    return ManualAddress;
-                case ConnectionMode.Remote:
-                    return RemoteAddress;
-                default:
-                    throw new ArgumentException("Unexpected ConnectionMode");
-            }
-        }
-    }
-}
diff --git a/Emby.ApiClient/Net/INetworkConnection.cs b/Emby.ApiClient/Net/INetworkConnection.cs
deleted file mode 100644
index fda6e3e..0000000
--- a/Emby.ApiClient/Net/INetworkConnection.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-using MediaBrowser.Model.ApiClient;
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-using Emby.ApiClient.Model;
-
-namespace Emby.ApiClient.Net
-{
-    public interface INetworkConnection
-    {
-        /// <summary>
-        /// Occurs when [network changed].
-        /// </summary>
-        event EventHandler<EventArgs> NetworkChanged;
-
-        /// <summary>
-        /// Sends the wake on lan.
-        /// </summary>
-        /// <param name="macAddress">The mac address.</param>
-        /// <param name="ipAddress">The ip address.</param>
-        /// <param name="port">The port.</param>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        /// <returns>Task.</returns>
-        Task SendWakeOnLan(string macAddress, string ipAddress, int port, CancellationToken cancellationToken = default(CancellationToken));
-
-        /// <summary>
-        /// Sends the wake on lan.
-        /// </summary>
-        /// <param name="macAddress">The mac address.</param>
-        /// <param name="port">The port.</param>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        /// <returns>Task.</returns>
-        Task SendWakeOnLan(string macAddress, int port, CancellationToken cancellationToken = default(CancellationToken));
-
-        /// <summary>
-        /// Gets the network status.
-        /// </summary>
-        /// <returns>NetworkStatus.</returns>
-        NetworkStatus GetNetworkStatus();
-
-#if WINDOWS_UWP
-        bool HasUnmeteredConnection();
-#endif
-    }
-}
diff --git a/Emby.ApiClient/Sync/ContentUploader.cs b/Emby.ApiClient/Sync/ContentUploader.cs
deleted file mode 100644
index 291bc62..0000000
--- a/Emby.ApiClient/Sync/ContentUploader.cs
+++ /dev/null
@@ -1,66 +0,0 @@
-using MediaBrowser.Model.ApiClient;
-using MediaBrowser.Model.Logging;
-using System;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using Emby.ApiClient.Model;
-
-namespace Emby.ApiClient.Sync
-{
-    public class ContentUploader
-    {
-        private readonly IApiClient _apiClient;
-        private readonly ILogger _logger;
-
-        public ContentUploader(IApiClient apiClient, ILogger logger)
-        {
-            _apiClient = apiClient;
-            _logger = logger;
-        }
-
-        public async Task UploadImages(IProgress<double> progress, CancellationToken cancellationToken = default(CancellationToken))
-        {
-            var device = _apiClient.Device;
-
-            var deviceId = device.DeviceId;
-
-            var history = await _apiClient.GetContentUploadHistory(deviceId).ConfigureAwait(false);
-
-            var files = (await device.GetLocalPhotos().ConfigureAwait(false))
-                .ToList();
-
-            files.AddRange((await device.GetLocalVideos().ConfigureAwait(false)));
-
-            files = files
-                .Where(i => !history.FilesUploaded.Any(f => string.Equals(f.Id, i.Id, StringComparison.OrdinalIgnoreCase)))
-                .ToList();
-
-            var numComplete = 0;
-
-            foreach (var file in files)
-            {
-                cancellationToken.ThrowIfCancellationRequested();
-
-                _logger.Debug("Uploading {0}", file.Id);
-
-                try
-                {
-                    await device.UploadFile(file, _apiClient, cancellationToken);
-                }
-                catch (Exception ex)
-                {
-                    _logger.ErrorException("Error uploading file", ex);
-                }
-
-                numComplete++;
-                double percent = numComplete;
-                percent /= files.Count;
-
-                progress.Report(100 * percent);
-            }
-
-            progress.Report(100);
-        }
-    }
-}
diff --git a/Emby.ApiClient/Sync/DoubleProgress.cs b/Emby.ApiClient/Sync/DoubleProgress.cs
deleted file mode 100644
index 8dae0a5..0000000
--- a/Emby.ApiClient/Sync/DoubleProgress.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace Emby.ApiClient.Sync
-{
-    public class DoubleProgress : Progress<double>, IDisposable
-    {
-        /// <summary>
-        /// The _actions
-        /// </summary>
-        private readonly List<Action<double>> _actions = new List<Action<double>>();
-
-        /// <summary>
-        /// Registers the action.
-        /// </summary>
-        /// <param name="action">The action.</param>
-        public void RegisterAction(Action<double> action)
-        {
-            _actions.Add(action);
-
-            ProgressChanged -= ActionableProgress_ProgressChanged;
-            ProgressChanged += ActionableProgress_ProgressChanged;
-        }
-
-        /// <summary>
-        /// Actionables the progress_ progress changed.
-        /// </summary>
-        /// <param name="sender">The sender.</param>
-        /// <param name="e">The e.</param>
-        void ActionableProgress_ProgressChanged(object sender, double e)
-        {
-            foreach (var action in _actions)
-            {
-                action(e);
-            }
-        }
-
-        /// <summary>
-        /// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources.
-        /// </summary>
-        public void Dispose()
-        {
-            Dispose(true);
-        }
-
-        /// <summary>
-        /// Releases unmanaged and - optionally - managed resources.
-        /// </summary>
-        /// <param name="disposing"><c>true</c> to release both managed and unmanaged resources; <c>false</c> to release only unmanaged resources.</param>
-        protected virtual void Dispose(bool disposing)
-        {
-            if (disposing)
-            {
-                ProgressChanged -= ActionableProgress_ProgressChanged;
-                _actions.Clear();
-            }
-        }
-    }
-}
diff --git a/Emby.ApiClient/Sync/FileTransferManager.cs b/Emby.ApiClient/Sync/FileTransferManager.cs
deleted file mode 100644
index 456da8c..0000000
--- a/Emby.ApiClient/Sync/FileTransferManager.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-using MediaBrowser.Model.ApiClient;
-using MediaBrowser.Model.Logging;
-using MediaBrowser.Model.Sync;
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-using Emby.ApiClient.Data;
-using Emby.ApiClient.Model;
-
-namespace Emby.ApiClient.Sync
-{
-    class FileTransferManager : IFileTransferManager
-    {
-        private readonly ILocalAssetManager _localAssetManager;
-        private readonly ILogger _logger;
-
-        internal FileTransferManager(ILocalAssetManager localAssetManager, ILogger logger)
-        {
-            _localAssetManager = localAssetManager;
-            _logger = logger;
-        }
-
-        public async Task GetItemFileAsync(IApiClient apiClient,
-                                      ServerInfo server,
-                                      LocalItem item,
-                                      string syncJobItemId,
-                                      IProgress<double> transferProgress,
-                                      CancellationToken cancellationToken = default(CancellationToken))
-        {
-            _logger.Debug("Downloading media with Id {0} to local repository", item.Item.Id);
-
-            using (var stream = await apiClient.GetSyncJobItemFile(syncJobItemId, cancellationToken).ConfigureAwait(false))
-            {
-                await _localAssetManager.SaveMedia(stream, item, server).ConfigureAwait(false);
-            }
-            transferProgress.Report(100);
-        }
-    }
-}
diff --git a/Emby.ApiClient/Sync/IFileTransferManager.cs b/Emby.ApiClient/Sync/IFileTransferManager.cs
deleted file mode 100644
index 1f8072d..0000000
--- a/Emby.ApiClient/Sync/IFileTransferManager.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using System;
-using System.Threading;
-using Emby.ApiClient.Model;
-using MediaBrowser.Model.Sync;
-
-namespace Emby.ApiClient.Sync
-{
-    public interface IFileTransferManager
-    {
-        System.Threading.Tasks.Task GetItemFileAsync(IApiClient apiClient, ServerInfo server, LocalItem item, string syncJobItemId, IProgress<double> transferProgress, System.Threading.CancellationToken cancellationToken = default(CancellationToken));
-    }
-}
diff --git a/Emby.ApiClient/Sync/IMediaSync.cs b/Emby.ApiClient/Sync/IMediaSync.cs
deleted file mode 100644
index 11b475a..0000000
--- a/Emby.ApiClient/Sync/IMediaSync.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-using Emby.ApiClient.Model;
-using MediaBrowser.Model.ApiClient;
-
-namespace Emby.ApiClient.Sync
-{
-    public interface IMediaSync
-    {
-        Task Sync(IApiClient apiClient,
-            ServerInfo serverInfo,
-            IProgress<double> progress,
-            CancellationToken cancellationToken = default(CancellationToken));
-    }
-}
\ No newline at end of file
diff --git a/Emby.ApiClient/Sync/IMultiServerSync.cs b/Emby.ApiClient/Sync/IMultiServerSync.cs
deleted file mode 100644
index a0f5acf..0000000
--- a/Emby.ApiClient/Sync/IMultiServerSync.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace Emby.ApiClient.Sync
-{
-    public interface IMultiServerSync
-    {
-        Task Sync(IProgress<double> progress, 
-            List<string> cameraUploadServers,
-            bool syncOnlyOnLocalNetwork,
-            CancellationToken cancellationToken = default(CancellationToken));
-    }
-}
\ No newline at end of file
diff --git a/Emby.ApiClient/Sync/IServerSync.cs b/Emby.ApiClient/Sync/IServerSync.cs
deleted file mode 100644
index b59cd04..0000000
--- a/Emby.ApiClient/Sync/IServerSync.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-using Emby.ApiClient.Model;
-using MediaBrowser.Model.ApiClient;
-
-namespace Emby.ApiClient.Sync
-{
-    public interface IServerSync
-    {
-        Task Sync(ServerInfo server, bool enableCameraUpload, IProgress<double> progress, CancellationToken cancellationToken = default(CancellationToken));
-    }
-}
\ No newline at end of file
diff --git a/Emby.ApiClient/Sync/MediaSync.cs b/Emby.ApiClient/Sync/MediaSync.cs
deleted file mode 100644
index 5917c7e..0000000
--- a/Emby.ApiClient/Sync/MediaSync.cs
+++ /dev/null
@@ -1,329 +0,0 @@
-using MediaBrowser.Model.ApiClient;
-using MediaBrowser.Model.Dto;
-using MediaBrowser.Model.Entities;
-using MediaBrowser.Model.Logging;
-using MediaBrowser.Model.Sync;
-using System;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using Emby.ApiClient.Data;
-using Emby.ApiClient.Model;
-
-namespace Emby.ApiClient.Sync
-{
-    public class MediaSync : IMediaSync
-    {
-        private readonly IFileTransferManager _fileTransferManager;
-        private readonly ILocalAssetManager _localAssetManager;
-        private readonly ILogger _logger;
-
-        public MediaSync(ILocalAssetManager localAssetManager, ILogger logger, IFileTransferManager fileTransferManager)
-        {
-            _localAssetManager = localAssetManager;
-            _logger = logger;
-            _fileTransferManager = fileTransferManager;
-        }
-
-        public async Task Sync(IApiClient apiClient,
-            ServerInfo serverInfo,
-            IProgress<double> progress,
-            CancellationToken cancellationToken = default(CancellationToken))
-        {
-            _logger.Debug("Beginning media sync process with server Id: {0}", serverInfo.Id);
-
-            // First report actions to the server that occurred while offline
-            await ReportOfflineActions(apiClient, serverInfo, cancellationToken).ConfigureAwait(false);
-            progress.Report(1);
-
-            await SyncData(apiClient, serverInfo, cancellationToken).ConfigureAwait(false);
-            progress.Report(3);
-
-            var innerProgress = new DoubleProgress();
-            innerProgress.RegisterAction(pct =>
-            {
-                var totalProgress = pct * .97;
-                totalProgress += 1;
-                progress.Report(totalProgress);
-            });
-
-            await GetNewMedia(apiClient, serverInfo, innerProgress, cancellationToken);
-            progress.Report(100);
-
-            // Do the data sync twice so the server knows what was removed from the device
-            await SyncData(apiClient, serverInfo, cancellationToken).ConfigureAwait(false);
-        }
-
-        private async Task GetNewMedia(IApiClient apiClient,
-            ServerInfo server,
-            IProgress<double> progress,
-            CancellationToken cancellationToken)
-        {
-            var jobItems = await apiClient.GetReadySyncItems(apiClient.DeviceId).ConfigureAwait(false);
-
-            var numComplete = 0;
-            double startingPercent = 0;
-            double percentPerItem = 1;
-            if (jobItems.Count > 0)
-            {
-                percentPerItem /= jobItems.Count;
-            }
-
-            foreach (var jobItem in jobItems)
-            {
-                cancellationToken.ThrowIfCancellationRequested();
-
-                var currentPercent = startingPercent;
-                var innerProgress = new DoubleProgress();
-                innerProgress.RegisterAction(pct =>
-                {
-                    var totalProgress = pct * percentPerItem;
-                    totalProgress += currentPercent;
-                    progress.Report(totalProgress);
-                });
-
-                try
-                {
-                    await GetItem(apiClient, server, jobItem, innerProgress, cancellationToken).ConfigureAwait(false);
-                }
-                catch (Exception ex)
-                {
-                    _logger.ErrorException("Error syncing new media", ex);
-                }
-
-                numComplete++;
-                startingPercent = numComplete;
-                startingPercent /= jobItems.Count;
-                startingPercent *= 100;
-                progress.Report(startingPercent);
-            }
-        }
-
-        private async Task GetItem(IApiClient apiClient,
-            ServerInfo server,
-            SyncedItem jobItem,
-            IProgress<double> progress,
-            CancellationToken cancellationToken)
-        {
-            var libraryItem = jobItem.Item;
-
-            var localItem = _localAssetManager.CreateLocalItem(libraryItem, server, jobItem.SyncJobItemId, jobItem.OriginalFileName);
-
-            // Create db record
-            await _localAssetManager.AddOrUpdate(localItem).ConfigureAwait(false);
-
-            var fileTransferProgress = new DoubleProgress();
-            fileTransferProgress.RegisterAction(pct => progress.Report(pct * .92));
-
-            // Download item file
-            await _fileTransferManager.GetItemFileAsync(apiClient, server, localItem, jobItem.SyncJobItemId, fileTransferProgress, cancellationToken).ConfigureAwait(false);
-            progress.Report(92);
-
-            // Download images
-            await GetItemImages(apiClient, localItem, cancellationToken).ConfigureAwait(false);
-            progress.Report(95);
-
-            // Download subtitles
-            await GetItemSubtitles(apiClient, jobItem, localItem, cancellationToken).ConfigureAwait(false);
-            progress.Report(99);
-
-            // Let the server know it was successfully downloaded
-            await apiClient.ReportSyncJobItemTransferred(jobItem.SyncJobItemId).ConfigureAwait(false);
-            progress.Report(100);
-        }
-
-        public bool HasPrimaryImage(BaseItemDto item)
-        {
-            return item.ImageTags != null && item.ImageTags.ContainsKey(ImageType.Primary);
-        }
-
-        private async Task GetItemImages(IApiClient apiClient,
-            LocalItem item,
-            CancellationToken cancellationToken)
-        {
-            var libraryItem = item.Item;
-
-            if (HasPrimaryImage(libraryItem))
-            {
-                await DownloadImage(apiClient, item.ServerId, libraryItem.Id, libraryItem.ImageTags[ImageType.Primary], ImageType.Primary, cancellationToken)
-                        .ConfigureAwait(false);
-            }
-
-            // Container images
-
-            // Series Primary
-            if (!string.IsNullOrWhiteSpace(libraryItem.SeriesPrimaryImageTag))
-            {
-                await DownloadImage(apiClient, item.ServerId, libraryItem.SeriesId, libraryItem.SeriesPrimaryImageTag, ImageType.Primary, cancellationToken)
-                        .ConfigureAwait(false);
-            }
-
-            // Series Thumb
-            if (!string.IsNullOrWhiteSpace(libraryItem.SeriesThumbImageTag))
-            {
-                await DownloadImage(apiClient, item.ServerId, libraryItem.SeriesId, libraryItem.SeriesThumbImageTag, ImageType.Thumb, cancellationToken)
-                        .ConfigureAwait(false);
-            }
-
-            // Album Primary
-            if (!string.IsNullOrWhiteSpace(libraryItem.AlbumPrimaryImageTag))
-            {
-                await DownloadImage(apiClient, item.ServerId, libraryItem.AlbumId, libraryItem.AlbumPrimaryImageTag, ImageType.Primary, cancellationToken)
-                        .ConfigureAwait(false);
-            }
-        }
-
-        private async Task DownloadImage(IApiClient apiClient,
-            string serverId,
-            string itemId,
-            string imageTag,
-            ImageType imageType,
-            CancellationToken cancellationToken)
-        {
-            var hasImage = await _localAssetManager.HasImage(serverId, itemId, imageTag).ConfigureAwait(false);
-
-            if (hasImage)
-            {
-                return;
-            }
-
-            var url = apiClient.GetImageUrl(itemId, new ImageOptions
-            {
-                ImageType = imageType,
-                Tag = imageTag
-            });
-
-            using (var response = await apiClient.GetResponse(url, cancellationToken).ConfigureAwait(false))
-            {
-                await _localAssetManager.SaveImage(serverId, itemId, imageTag, response.Content).ConfigureAwait(false);
-            }
-        }
-
-        private async Task GetItemSubtitles(IApiClient apiClient,
-            SyncedItem jobItem,
-            LocalItem item,
-            CancellationToken cancellationToken)
-        {
-            var hasDownloads = false;
-
-            var mediaSource = jobItem.Item.MediaSources.FirstOrDefault();
-
-            if (mediaSource == null)
-            {
-                _logger.Error("Cannot download subtitles because video has no media source info.");
-                return;
-            }
-
-            foreach (var file in jobItem.AdditionalFiles.Where(i => i.Type == ItemFileType.Subtitles))
-            {
-                var subtitleStream = mediaSource.MediaStreams.FirstOrDefault(i => i.Type == MediaStreamType.Subtitle && i.Index == file.Index);
-
-                if (subtitleStream != null)
-                {
-                    using (var response = await apiClient.GetSyncJobItemAdditionalFile(jobItem.SyncJobItemId, file.Name, cancellationToken).ConfigureAwait(false))
-                    {
-                        var path = await _localAssetManager.SaveSubtitles(response, subtitleStream.Codec, item, subtitleStream.Language, subtitleStream.IsForced).ConfigureAwait(false);
-
-                        subtitleStream.Path = path;
-
-                        var files = item.AdditionalFiles.ToList();
-                        files.Add(path);
-                        item.AdditionalFiles = files.ToArray();
-                    }
-
-                    hasDownloads = true;
-                }
-                else
-                {
-                    _logger.Error("Cannot download subtitles because matching stream info wasn't found.");
-                }
-            }
-
-            // Save the changes to the item
-            if (hasDownloads)
-            {
-                await _localAssetManager.AddOrUpdate(item).ConfigureAwait(false);
-            }
-        }
-
-        private async Task SyncData(IApiClient apiClient,
-            ServerInfo serverInfo,
-            CancellationToken cancellationToken)
-        {
-            _logger.Debug("Beginning SyncData with server {0}", serverInfo.Name);
-            
-            var localIds = await _localAssetManager.GetServerItemIds(serverInfo.Id).ConfigureAwait(false);
-
-            var result = await apiClient.SyncData(new SyncDataRequest
-            {
-                TargetId = apiClient.DeviceId,
-                LocalItemIds = localIds.ToArray()
-
-            }).ConfigureAwait(false);
-
-            cancellationToken.ThrowIfCancellationRequested();
-
-            foreach (var itemIdToRemove in result.ItemIdsToRemove)
-            {
-                try
-                {
-                    await RemoveItem(serverInfo.Id, itemIdToRemove).ConfigureAwait(false);
-                }
-                catch (Exception ex)
-                {
-                    _logger.ErrorException("Error deleting item from device. Id: {0}", ex, itemIdToRemove);
-                }
-            }
-        }
-
-        private async Task ReportOfflineActions(IApiClient apiClient,
-            ServerInfo serverInfo,
-            CancellationToken cancellationToken)
-        {
-            var actions = await _localAssetManager.GetUserActions(serverInfo.Id).ConfigureAwait(false);
-
-            cancellationToken.ThrowIfCancellationRequested();
-
-            var actionList = actions
-                .OrderBy(i => i.Date)
-                .ToList();
-
-            _logger.Debug("Reporting {0} offline actions to server {1}",
-                actionList.Count,
-                serverInfo.Id);
-
-            if (actionList.Count > 0)
-            {
-                await apiClient.ReportOfflineActions(actionList).ConfigureAwait(false);
-            }
-
-            foreach (var action in actionList)
-            {
-                await _localAssetManager.Delete(action).ConfigureAwait(false);
-            }
-        }
-
-        private async Task RemoveItem(string serverId, string itemId)
-        {
-            _logger.Debug("Removing item. ServerId: {0}, ItemId: {1}", serverId, itemId);
-            var localItem = await _localAssetManager.GetLocalItem(serverId, itemId);
-
-            if (localItem == null)
-            {
-                return;
-            }
-
-            var additionalFiles = localItem.AdditionalFiles.ToList();
-            var localPath = localItem.LocalPath;
-
-            await _localAssetManager.Delete(localItem).ConfigureAwait(false);
-
-            foreach (var file in additionalFiles)
-            {
-                await _localAssetManager.DeleteFile(file).ConfigureAwait(false);
-            }
-
-            await _localAssetManager.DeleteFile(localPath).ConfigureAwait(false);
-        }
-    }
-}
diff --git a/Emby.ApiClient/Sync/MultiServerSync.cs b/Emby.ApiClient/Sync/MultiServerSync.cs
deleted file mode 100644
index 00f446c..0000000
--- a/Emby.ApiClient/Sync/MultiServerSync.cs
+++ /dev/null
@@ -1,108 +0,0 @@
-using MediaBrowser.Model.ApiClient;
-using MediaBrowser.Model.Logging;
-using System;
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
-using System.Linq;
-using Emby.ApiClient.Data;
-using Emby.ApiClient.Model;
-
-namespace Emby.ApiClient.Sync
-{
-    public class MultiServerSync : IMultiServerSync
-    {
-        private readonly IConnectionManager _connectionManager;
-        private readonly ILogger _logger;
-        private readonly ILocalAssetManager _localAssetManager;
-        private readonly IFileTransferManager _fileTransferManager;
-
-        public MultiServerSync(IConnectionManager connectionManager, ILogger logger, ILocalAssetManager userActionAssetManager, IFileTransferManager fileTransferManager)
-        {
-            _connectionManager = connectionManager;
-            _logger = logger;
-            _localAssetManager = userActionAssetManager;
-            _fileTransferManager = fileTransferManager;
-        }
-
-        public async Task Sync(IProgress<double> progress,
-            List<string> cameraUploadServers, 
-            bool syncOnlyOnLocalNetwork,
-            CancellationToken cancellationToken = default(CancellationToken))
-        {
-            var servers = await _connectionManager.GetAvailableServers(cancellationToken).ConfigureAwait(false);
-
-            await Sync(servers, cameraUploadServers, syncOnlyOnLocalNetwork, progress, cancellationToken).ConfigureAwait(false);
-        }
-
-        private async Task Sync(List<ServerInfo> servers, List<string> cameraUploadServers, bool syncOnlyOnLocalNetwork, IProgress<double> progress, CancellationToken cancellationToken = default(CancellationToken))
-        {
-            var numComplete = 0;
-            double startingPercent = 0;
-            double percentPerServer = 1;
-            if (servers.Count > 0)
-            {
-                percentPerServer /= servers.Count;
-            }
-
-            _logger.Debug("Beginning MultiServerSync with {0} servers", servers.Count);
-
-            foreach (var server in servers)
-            {
-                cancellationToken.ThrowIfCancellationRequested();
-
-                var currentPercent = startingPercent;
-                var serverProgress = new DoubleProgress();
-                serverProgress.RegisterAction(pct =>
-                {
-                    var totalProgress = pct * percentPerServer;
-                    totalProgress += currentPercent;
-                    progress.Report(totalProgress);
-                });
-
-                // Grab the latest info from the connection manager about that server
-                var serverInfo = await _connectionManager.GetServerInfo(server.Id).ConfigureAwait(false);
-
-                if (serverInfo == null)
-                {
-                    serverInfo = server;
-                }
-
-                if (syncOnlyOnLocalNetwork)
-                {
-                    var result = await _connectionManager.Connect(server, new ConnectionOptions
-                    {
-                        EnableWebSocket = false,
-                        ReportCapabilities = false,
-                        UpdateDateLastAccessed = false
-
-                    }, cancellationToken).ConfigureAwait(false);
-
-                    var apiClient = result.ApiClient;
-
-                    var endpointInfo = await apiClient.GetEndPointInfo(cancellationToken).ConfigureAwait(false);
-
-                    _logger.Debug("Server: {0}, Id: {1}, IsInNetwork:{2}", server.Name, server.Id, endpointInfo.IsInNetwork);
-
-                    if (!endpointInfo.IsInNetwork)
-                    {
-                        continue;
-                    }
-                }
-
-                var enableCameraUpload = cameraUploadServers.Contains(serverInfo.Id, StringComparer.OrdinalIgnoreCase);
-
-                await new ServerSync(_connectionManager, _logger, _localAssetManager, _fileTransferManager, _connectionManager.ClientCapabilities)
-                    .Sync(serverInfo, enableCameraUpload, serverProgress, cancellationToken).ConfigureAwait(false);
-
-                numComplete++;
-                startingPercent = numComplete;
-                startingPercent /= servers.Count;
-                startingPercent *= 100;
-                progress.Report(startingPercent);
-            }
-
-            progress.Report(100);
-        }
-    }
-}
diff --git a/Emby.ApiClient/Sync/ServerSync.cs b/Emby.ApiClient/Sync/ServerSync.cs
deleted file mode 100644
index 57f1a80..0000000
--- a/Emby.ApiClient/Sync/ServerSync.cs
+++ /dev/null
@@ -1,115 +0,0 @@
-using MediaBrowser.Model.ApiClient;
-using MediaBrowser.Model.Logging;
-using MediaBrowser.Model.Session;
-using System;
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
-using Emby.ApiClient.Data;
-using Emby.ApiClient.Model;
-
-namespace Emby.ApiClient.Sync
-{
-    public class ServerSync : IServerSync
-    {
-        private readonly IConnectionManager _connectionManager;
-        private readonly IFileTransferManager _fileTransferManager;
-        private readonly ILogger _logger;
-        private readonly ILocalAssetManager _localAssetManager;
-
-        private readonly ClientCapabilities _clientCapabilities;
-        private static readonly Dictionary<string, SemaphoreSlim> SemaphoreLocks = new Dictionary<string, SemaphoreSlim>(StringComparer.OrdinalIgnoreCase);
-
-        public ServerSync(IConnectionManager connectionManager, ILogger logger, ILocalAssetManager localAssetManager, IFileTransferManager fileTransferManager, ClientCapabilities clientCapabilities)
-        {
-            _connectionManager = connectionManager;
-            _fileTransferManager = fileTransferManager;
-            _clientCapabilities = clientCapabilities;
-            _logger = logger;
-            _localAssetManager = localAssetManager;
-        }
-
-        public async Task Sync(ServerInfo server, bool enableCameraUpload, IProgress<double> progress, CancellationToken cancellationToken = default(CancellationToken))
-        {
-            var semaphore = GetLock(server.Id);
-
-            await semaphore.WaitAsync(cancellationToken).ConfigureAwait(false);
-
-            try
-            {
-                await SyncInternal(server, enableCameraUpload, progress, cancellationToken).ConfigureAwait(false);
-            }
-            finally
-            {
-                semaphore.Release();
-            }
-        }
-
-        private static SemaphoreSlim GetLock(string serverId)
-        {
-            SemaphoreSlim semaphore;
-
-            if (SemaphoreLocks.TryGetValue(serverId, out semaphore))
-            {
-                return semaphore;
-            }
-
-            semaphore = new SemaphoreSlim(1, 1);
-            SemaphoreLocks[serverId] = semaphore;
-
-            return semaphore;
-        }
-
-        private async Task SyncInternal(ServerInfo server, bool enableCameraUpload, IProgress<double> progress, CancellationToken cancellationToken)
-        {
-            _logger.Debug("Beginning ServerSync with server {0}, Id {1}", server.Name, server.Id);
-            
-            if (string.IsNullOrWhiteSpace(server.AccessToken) && string.IsNullOrWhiteSpace(server.ExchangeToken))
-            {
-                _logger.Info("Skipping sync process for server " + server.Name + ". No server authentication information available.");
-                progress.Report(100);
-                return;
-            }
-
-            // Don't need these here
-            var result = await _connectionManager.Connect(server, new ConnectionOptions
-            {
-                EnableWebSocket = false,
-                ReportCapabilities = false,
-                UpdateDateLastAccessed = false
-
-            }, cancellationToken).ConfigureAwait(false);
-
-            if (result.State == ConnectionState.SignedIn)
-            {
-                await SyncInternal(server, result.ApiClient, enableCameraUpload, progress, cancellationToken).ConfigureAwait(false);
-                progress.Report(100);
-            }
-            else
-            {
-                _logger.Info("Skipping sync process for server " + server.Name + ". ConnectionManager returned a state of {0}", result.State.ToString());
-                progress.Report(100);
-            }
-        }
-
-        private async Task SyncInternal(ServerInfo server, IApiClient apiClient, bool enableCameraUpload, IProgress<double> progress, CancellationToken cancellationToken)
-        {
-            const double cameraUploadTotalPercentage = .25;
-
-            var uploadProgress = new DoubleProgress();
-            uploadProgress.RegisterAction(p => progress.Report(p * cameraUploadTotalPercentage));
-
-            if (enableCameraUpload)
-            {
-                await new ContentUploader(apiClient, _logger)
-                    .UploadImages(uploadProgress, cancellationToken).ConfigureAwait(false);
-            }
-
-            var syncProgress = new DoubleProgress();
-            syncProgress.RegisterAction(p => progress.Report((cameraUploadTotalPercentage * 100) + (p * (1 - cameraUploadTotalPercentage))));
-
-            await new MediaSync(_localAssetManager, _logger, _fileTransferManager)
-                .Sync(apiClient, server, uploadProgress, cancellationToken).ConfigureAwait(false);
-        }
-    }
-}
diff --git a/Emby.ApiClient.sln b/Jellyfin.ApiClient.sln
similarity index 85%
rename from Emby.ApiClient.sln
rename to Jellyfin.ApiClient.sln
index e985465..d25cb44 100644
--- a/Emby.ApiClient.sln
+++ b/Jellyfin.ApiClient.sln
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.26730.3
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Emby.ApiClient", "Emby.ApiClient\Emby.ApiClient.csproj", "{78198B43-83EF-4B5B-ADBC-443E54FF7E8E}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Jellyfin.ApiClient", "Jellyfin.ApiClient\Jellyfin.ApiClient.csproj", "{78198B43-83EF-4B5B-ADBC-443E54FF7E8E}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/Emby.ApiClient/ApiClient.cs b/Jellyfin.ApiClient/ApiClient.cs
similarity index 71%
rename from Emby.ApiClient/ApiClient.cs
rename to Jellyfin.ApiClient/ApiClient.cs
index 4911df1..3f4a87d 100644
--- a/Emby.ApiClient/ApiClient.cs
+++ b/Jellyfin.ApiClient/ApiClient.cs
@@ -1,4 +1,9 @@
-using MediaBrowser.Model.ApiClient;
+using Jellyfin.ApiClient.Model;
+using Jellyfin.ApiClient.Model.Dto;
+using Jellyfin.ApiClient.Model.Notifications;
+using Jellyfin.ApiClient.Model.Querying;
+using Jellyfin.ApiClient.Net;
+using MediaBrowser.Controller.Authentication;
 using MediaBrowser.Model.Channels;
 using MediaBrowser.Model.Configuration;
 using MediaBrowser.Model.Devices;
@@ -7,34 +12,28 @@
 using MediaBrowser.Model.Events;
 using MediaBrowser.Model.Globalization;
 using MediaBrowser.Model.LiveTv;
-using MediaBrowser.Model.Logging;
 using MediaBrowser.Model.MediaInfo;
 using MediaBrowser.Model.Net;
-using MediaBrowser.Model.Notifications;
 using MediaBrowser.Model.Playlists;
 using MediaBrowser.Model.Plugins;
 using MediaBrowser.Model.Querying;
 using MediaBrowser.Model.Search;
 using MediaBrowser.Model.Session;
-using MediaBrowser.Model.Sync;
 using MediaBrowser.Model.System;
 using MediaBrowser.Model.Tasks;
-using MediaBrowser.Model.Users;
+using Microsoft.Extensions.Logging;
 using System;
 using System.Collections.Generic;
+using System.Collections.Specialized;
 using System.Globalization;
 using System.IO;
 using System.Linq;
 using System.Net;
-using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
-using Emby.ApiClient.Cryptography;
-using Emby.ApiClient.Data;
-using Emby.ApiClient.Model;
-using Emby.ApiClient.Net;
+using System.Web;
 
-namespace Emby.ApiClient
+namespace Jellyfin.ApiClient
 {
     /// <summary>
     /// Provides api methods centered around an HttpClient
@@ -42,7 +41,7 @@ namespace Emby.ApiClient
     public partial class ApiClient : BaseApiClient, IApiClient
     {
         public event EventHandler<GenericEventArgs<RemoteLogoutReason>> RemoteLoggedOut;
-        public event EventHandler<GenericEventArgs<AuthenticationResult>> Authenticated;
+        public event EventHandler<GenericEventArgs<AuthenticationResult>> OnAuthenticated;
 
         /// <summary>
         /// Gets the HTTP client.
@@ -50,24 +49,18 @@ public partial class ApiClient : BaseApiClient, IApiClient
         /// <value>The HTTP client.</value>
         protected IAsyncHttpClient HttpClient { get; private set; }
 
-        private readonly ICryptographyProvider _cryptographyProvider;
-        private readonly ILocalAssetManager _localAssetManager = null;
-
         /// <summary>
         /// Initializes a new instance of the <see cref="ApiClient" /> class.
         /// </summary>
         /// <param name="logger">The logger.</param>
         /// <param name="serverAddress">The server address.</param>
         /// <param name="accessToken">The access token.</param>
-        /// <param name="cryptographyProvider">The cryptography provider.</param>
         public ApiClient(ILogger logger,
-            string serverAddress,
-            string accessToken,
-            ICryptographyProvider cryptographyProvider)
+            Uri serverAddress,
+            string accessToken)
             : base(logger, new NewtonsoftJsonSerializer(), serverAddress, accessToken)
         {
             CreateHttpClient(logger);
-            _cryptographyProvider = cryptographyProvider;
 
             ResetHttpHeaders();
         }
@@ -80,70 +73,40 @@ public ApiClient(ILogger logger,
         /// <param name="clientName">Name of the client.</param>
         /// <param name="device">The device.</param>
         /// <param name="applicationVersion">The application version.</param>
-        /// <param name="cryptographyProvider">The cryptography provider.</param>
         public ApiClient(ILogger logger,
-            string serverAddress,
+            Uri serverAddress,
             string clientName,
             IDevice device,
-            string applicationVersion,
-            ICryptographyProvider cryptographyProvider)
+            string applicationVersion)
             : base(logger, new NewtonsoftJsonSerializer(), serverAddress, clientName, device, applicationVersion)
         {
             CreateHttpClient(logger);
-            _cryptographyProvider = cryptographyProvider;
 
             ResetHttpHeaders();
         }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ApiClient" /> class.
-        /// </summary>
-        /// <param name="logger">The logger.</param>
-        /// <param name="serverAddress">The server address.</param>
-        /// <param name="clientName">Name of the client.</param>
-        /// <param name="device">The device.</param>
-        /// <param name="applicationVersion">The application version.</param>
-        /// <param name="cryptographyProvider">The cryptography provider.</param>
-        /// <param name="localAssetManager">The local asset manager.</param>
-        public ApiClient(ILogger logger,
-            string serverAddress,
-            string clientName,
-            IDevice device,
-            string applicationVersion,
-            ICryptographyProvider cryptographyProvider,
-            ILocalAssetManager localAssetManager)
-            : this(logger, serverAddress, clientName, device, applicationVersion, cryptographyProvider)
-        {
-            _localAssetManager = localAssetManager;
-        }
-
         private void CreateHttpClient(ILogger logger)
         {
             HttpClient = AsyncHttpClientFactory.Create(logger);
             HttpClient.HttpResponseReceived += HttpClient_HttpResponseReceived;
         }
 
-        void HttpClient_HttpResponseReceived(object sender, HttpResponseEventArgs e)
+        void HttpClient_HttpResponseReceived(object sender, HttpWebResponse e)
         {
             if (e.StatusCode == HttpStatusCode.Unauthorized)
             {
-                if (RemoteLoggedOut != null)
-                {
-                    RemoteLoggedOut(this, new GenericEventArgs<RemoteLogoutReason>());
-                }
+                RemoteLoggedOut?.Invoke(this, new GenericEventArgs<RemoteLogoutReason>());
             }
         }
 
-        private ConnectionMode ConnectionMode { get; set; }
         internal ServerInfo ServerInfo { get; set; }
         private INetworkConnection NetworkConnection { get; set; }
 
-        public void EnableAutomaticNetworking(ServerInfo info, ConnectionMode initialMode, INetworkConnection networkConnection)
+        public void EnableAutomaticNetworking(ServerInfo info, INetworkConnection networkConnection)
         {
             NetworkConnection = networkConnection;
-            ConnectionMode = initialMode;
             ServerInfo = info;
-            ServerAddress = info.GetAddress(initialMode);
+            ServerAddress = info.Address;
         }
 
         private async Task<Stream> SendAsync(HttpRequest request, bool enableFailover = true)
@@ -154,7 +117,6 @@ private async Task<Stream> SendAsync(HttpRequest request, bool enableFailover =
                 return await HttpClient.SendAsync(request).ConfigureAwait(false);
             }
 
-            var initialConnectionMode = ConnectionMode;
             var originalRequestTime = DateTime.UtcNow;
             Exception timeoutException;
 
@@ -174,7 +136,7 @@ private async Task<Stream> SendAsync(HttpRequest request, bool enableFailover =
 
             try
             {
-                await ValidateConnection(originalRequestTime, initialConnectionMode, request.CancellationToken).ConfigureAwait(false);
+                await ValidateConnection(originalRequestTime, request.CancellationToken).ConfigureAwait(false);
             }
             catch
             {
@@ -183,7 +145,7 @@ private async Task<Stream> SendAsync(HttpRequest request, bool enableFailover =
                 throw timeoutException;
             }
 
-            request.Url = ReplaceServerAddress(request.Url, initialConnectionMode);
+            request.Url = ReplaceServerAddress(request.Url);
 
             return await HttpClient.SendAsync(request).ConfigureAwait(false);
         }
@@ -192,7 +154,7 @@ private async Task<Stream> SendAsync(HttpRequest request, bool enableFailover =
 
         private DateTime _lastConnectionValidationTime = DateTime.MinValue;
 
-        private async Task ValidateConnection(DateTime originalRequestTime, ConnectionMode initialConnectionMode, CancellationToken cancellationToken)
+        private async Task ValidateConnection(DateTime originalRequestTime, CancellationToken cancellationToken)
         {
             await _validateConnectionSemaphore.WaitAsync(cancellationToken).ConfigureAwait(false);
 
@@ -200,7 +162,7 @@ private async Task ValidateConnection(DateTime originalRequestTime, ConnectionMo
             {
                 if (originalRequestTime > _lastConnectionValidationTime)
                 {
-                    await ValidateConnectionInternal(initialConnectionMode, cancellationToken).ConfigureAwait(false);
+                    await ValidateConnectionInternal(cancellationToken).ConfigureAwait(false);
                 }
             }
             finally
@@ -209,9 +171,9 @@ private async Task ValidateConnection(DateTime originalRequestTime, ConnectionMo
             }
         }
 
-        private async Task ValidateConnectionInternal(ConnectionMode initialConnectionMode, CancellationToken cancellationToken)
+        private async Task ValidateConnectionInternal(CancellationToken cancellationToken)
         {
-            Logger.Debug("Connection to server dropped. Attempting to reconnect.");
+            Logger.LogDebug("Connection to server dropped. Attempting to reconnect.");
 
             const int maxWaitMs = 10000;
             const int waitIntervalMs = 100;
@@ -231,10 +193,9 @@ private async Task ValidateConnectionInternal(ConnectionMode initialConnectionMo
                 networkStatus = NetworkConnection.GetNetworkStatus();
             }
 
-            var urlList = new List<Tuple<string, ConnectionMode>>
+            var urlList = new List<Uri>
 			{
-				new Tuple<string,ConnectionMode>(ServerInfo.LocalAddress, ConnectionMode.Local),
-				new Tuple<string,ConnectionMode>(ServerInfo.RemoteAddress, ConnectionMode.Remote)
+				ServerInfo.Address,
 			};
 
             if (!networkStatus.GetIsAnyLocalNetworkAvailable())
@@ -242,22 +203,17 @@ private async Task ValidateConnectionInternal(ConnectionMode initialConnectionMo
                 urlList.Reverse();
             }
 
-            if (!string.IsNullOrEmpty(ServerInfo.ManualAddress))
+            if (ServerInfo.Address != null)
             {
-                if (!string.Equals(ServerInfo.ManualAddress, ServerInfo.LocalAddress, StringComparison.OrdinalIgnoreCase) &&
-                    !string.Equals(ServerInfo.ManualAddress, ServerInfo.RemoteAddress, StringComparison.OrdinalIgnoreCase))
-                {
-                    urlList.Insert(0, new Tuple<string, ConnectionMode>(ServerInfo.ManualAddress, ConnectionMode.Manual));
-                }
+                urlList.Insert(0, ServerInfo.Address);
             }
 
             foreach (var url in urlList)
             {
-                var connected = await TryConnect(url.Item1, cancellationToken).ConfigureAwait(false);
+                var connected = await TryConnect(url, cancellationToken).ConfigureAwait(false);
 
                 if (connected)
                 {
-                    ConnectionMode = url.Item2;
                     break;
                 }
             }
@@ -265,9 +221,9 @@ private async Task ValidateConnectionInternal(ConnectionMode initialConnectionMo
             _lastConnectionValidationTime = DateTime.UtcNow;
         }
 
-        private async Task<bool> TryConnect(string baseUrl, CancellationToken cancellationToken)
+        private async Task<bool> TryConnect(Uri baseUrl, CancellationToken cancellationToken)
         {
-            var fullUrl = baseUrl + "/system/info/public";
+            var fullUrl = new Uri(baseUrl, new Uri("/system/info/public", UriKind.Relative));
 
             fullUrl = AddDataFormat(fullUrl);
 
@@ -286,29 +242,27 @@ private async Task<bool> TryConnect(string baseUrl, CancellationToken cancellati
                     return true;
                 }
             }
-            catch (Exception ex)
+            catch (Exception)
             {
                 return false;
             }
         }
 
-        private string ReplaceServerAddress(string url, ConnectionMode initialConnectionMode)
+        private Uri ReplaceServerAddress(Uri url)
         {
-            var baseUrl = ServerInfo.GetAddress(ConnectionMode);
+            var baseUrl = ServerInfo.Address;
 
-            var index = url.IndexOf("/mediabrowser", StringComparison.OrdinalIgnoreCase);
+            var index = url.ToString().IndexOf("/mediabrowser", StringComparison.OrdinalIgnoreCase);
 
             if (index != -1)
             {
-                return baseUrl.TrimEnd('/') + url.Substring(index);
+                return new Uri(baseUrl, url.ToString().Substring(index));
             }
 
             return url;
-
-            //return url.Replace(ServerInfo.GetAddress(initialConnectionMode), ServerInfo.GetAddress(ConnectionMode), StringComparison.OrdinalIgnoreCase);
         }
 
-        public Task<Stream> GetStream(string url, CancellationToken cancellationToken = default(CancellationToken))
+        public Task<Stream> GetStream(Uri url, CancellationToken cancellationToken = default)
         {
             return SendAsync(new HttpRequest
             {
@@ -320,7 +274,7 @@ private string ReplaceServerAddress(string url, ConnectionMode initialConnection
         }
 
 
-        public Task<HttpResponse> GetResponse(string url, CancellationToken cancellationToken = default(CancellationToken))
+        public Task<HttpWebResponse> GetResponse(Uri url, CancellationToken cancellationToken = default)
         {
             return HttpClient.GetResponse(new HttpRequest
             {
@@ -338,9 +292,9 @@ private string ReplaceServerAddress(string url, ConnectionMode initialConnection
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>Task{Stream}.</returns>
         /// <exception cref="System.ArgumentNullException">url</exception>
-        public Task<Stream> GetImageStreamAsync(string url, CancellationToken cancellationToken = default(CancellationToken))
+        public Task<Stream> GetImageStreamAsync(Uri url, CancellationToken cancellationToken = default)
         {
-            if (string.IsNullOrEmpty(url))
+            if (url == null)
             {
                 throw new ArgumentNullException("url");
             }
@@ -367,7 +321,7 @@ public async Task<BaseItemDto> GetItemAsync(string id, string userId)
                 throw new ArgumentNullException("userId");
             }
 
-            var url = GetApiUrl("Users/" + userId + "/Items/" + id);
+            var url = GetApiUrl(new Uri("Users/" + userId + "/Items/" + id, UriKind.Relative));
 
             using (var stream = await GetSerializedStreamAsync(url).ConfigureAwait(false))
             {
@@ -394,8 +348,7 @@ public async Task<QueryResult<BaseItemDto>> GetIntrosAsync(string itemId, string
                 throw new ArgumentNullException("userId");
             }
 
-            var url = GetApiUrl("Users/" + userId + "/Items/" + itemId + "/Intros");
-
+            var url = GetApiUrl(new Uri("Users/" + userId + "/Items/" + itemId + "/Intros", UriKind.Relative));
             using (var stream = await GetSerializedStreamAsync(url).ConfigureAwait(false))
             {
                 return DeserializeFromStream<QueryResult<BaseItemDto>>(stream);
@@ -415,12 +368,12 @@ public async Task<ItemCounts> GetItemCountsAsync(ItemCountsQuery query)
                 throw new ArgumentNullException("query");
             }
 
-            var dict = new QueryStringDictionary { };
+            var dict = new NameValueCollection { };
 
             dict.AddIfNotNullOrEmpty("UserId", query.UserId);
             dict.AddIfNotNull("IsFavorite", query.IsFavorite);
 
-            var url = GetApiUrl("Items/Counts", dict);
+            var url = GetApiUrl(new Uri("Items/Counts", UriKind.Relative), dict);
 
             using (var stream = await GetSerializedStreamAsync(url).ConfigureAwait(false))
             {
@@ -441,7 +394,7 @@ public async Task<BaseItemDto> GetRootFolderAsync(string userId)
                 throw new ArgumentNullException("userId");
             }
 
-            var url = GetApiUrl("Users/" + userId + "/Items/Root");
+            var url = GetApiUrl(new Uri("Users/" + userId + "/Items/Root", UriKind.Relative));
 
             using (var stream = await GetSerializedStreamAsync(url).ConfigureAwait(false))
             {
@@ -455,12 +408,12 @@ public async Task<BaseItemDto> GetRootFolderAsync(string userId)
         /// <returns>Task{UserDto[]}.</returns>
         public async Task<UserDto[]> GetUsersAsync(UserQuery query)
         {
-            var queryString = new QueryStringDictionary();
+            var queryString = new NameValueCollection();
 
             queryString.AddIfNotNull("IsDisabled", query.IsDisabled);
             queryString.AddIfNotNull("IsHidden", query.IsHidden);
 
-            var url = GetApiUrl("Users", queryString);
+            var url = GetApiUrl(new Uri("Users", UriKind.Relative), queryString);
 
             using (var stream = await GetSerializedStreamAsync(url).ConfigureAwait(false))
             {
@@ -468,9 +421,9 @@ public async Task<UserDto[]> GetUsersAsync(UserQuery query)
             }
         }
 
-        public async Task<UserDto[]> GetPublicUsersAsync(CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<UserDto[]> GetPublicUsersAsync(CancellationToken cancellationToken = default)
         {
-            var url = GetApiUrl("Users/Public");
+            var url = GetApiUrl(new Uri("Users/Public", UriKind.Relative));
 
             using (var stream = await GetSerializedStreamAsync(url, cancellationToken).ConfigureAwait(false))
             {
@@ -484,11 +437,11 @@ public async Task<UserDto[]> GetUsersAsync(UserQuery query)
         /// <returns>Task{SessionInfoDto[]}.</returns>
         public async Task<SessionInfoDto[]> GetClientSessionsAsync(SessionQuery query)
         {
-            var queryString = new QueryStringDictionary();
+            var queryString = new NameValueCollection();
 
             queryString.AddIfNotNullOrEmpty("ControllableByUserId", query.ControllableByUserId);
 
-            var url = GetApiUrl("Sessions", queryString);
+            var url = GetApiUrl(new Uri("Sessions", UriKind.Relative), queryString);
 
             using (var stream = await GetSerializedStreamAsync(url).ConfigureAwait(false))
             {
@@ -496,18 +449,13 @@ public async Task<SessionInfoDto[]> GetClientSessionsAsync(SessionQuery query)
             }
         }
 
-        public Task<PluginSecurityInfo> GetRegistrationInfo()
-        {
-            throw new NotImplementedException();
-        }
-
         /// <summary>
         /// Queries for items
         /// </summary>
         /// <param name="query">The query.</param>
         /// <returns>Task{ItemsResult}.</returns>
         /// <exception cref="System.ArgumentNullException">query</exception>
-        public async Task<QueryResult<BaseItemDto>> GetItemsAsync(ItemQuery query, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<QueryResult<BaseItemDto>> GetItemsAsync(ItemQuery query, CancellationToken cancellationToken = default)
         {
             if (query == null)
             {
@@ -528,7 +476,7 @@ public Task<PluginSecurityInfo> GetRegistrationInfo()
         /// <param name="query">The query.</param>
         /// <returns>Task{ItemsResult}.</returns>
         /// <exception cref="System.ArgumentNullException">query</exception>
-        public async Task<QueryResult<BaseItemDto>> GetNextUpEpisodesAsync(NextUpQuery query, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<QueryResult<BaseItemDto>> GetNextUpEpisodesAsync(NextUpQuery query, CancellationToken cancellationToken = default)
         {
             if (query == null)
             {
@@ -550,12 +498,7 @@ public async Task<QueryResult<BaseItemDto>> GetUpcomingEpisodesAsync(UpcomingEpi
                 throw new ArgumentNullException("query");
             }
 
-            if (query == null)
-            {
-                throw new ArgumentNullException("query");
-            }
-
-            var dict = new QueryStringDictionary { };
+            var dict = new NameValueCollection { };
 
             if (query.Fields != null)
             {
@@ -577,7 +520,7 @@ public async Task<QueryResult<BaseItemDto>> GetUpcomingEpisodesAsync(UpcomingEpi
             }
             dict.AddIfNotNull("ImageTypeLimit", query.ImageTypeLimit);
 
-            var url = GetApiUrl("Shows/Upcoming", dict);
+            var url = GetApiUrl(new Uri("Shows/Upcoming", UriKind.Relative), dict);
 
             using (var stream = await GetSerializedStreamAsync(url).ConfigureAwait(false))
             {
@@ -585,14 +528,14 @@ public async Task<QueryResult<BaseItemDto>> GetUpcomingEpisodesAsync(UpcomingEpi
             }
         }
 
-        public async Task<QueryResult<BaseItemDto>> GetEpisodesAsync(EpisodeQuery query, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<QueryResult<BaseItemDto>> GetEpisodesAsync(EpisodeQuery query, CancellationToken cancellationToken = default)
         {
             if (query == null)
             {
                 throw new ArgumentNullException("query");
             }
 
-            var dict = new QueryStringDictionary { };
+            var dict = new NameValueCollection{ };
 
             dict.AddIfNotNull("StartIndex", query.StartIndex);
             dict.AddIfNotNull("Limit", query.Limit);
@@ -611,7 +554,7 @@ public async Task<QueryResult<BaseItemDto>> GetUpcomingEpisodesAsync(UpcomingEpi
             dict.AddIfNotNull("IsMissing", query.IsMissing);
             dict.AddIfNotNull("IsVirtualUnaired", query.IsVirtualUnaired);
 
-            var url = GetApiUrl("Shows/" + query.SeriesId + "/Episodes", dict);
+            var url = GetApiUrl(new Uri("Shows/" + query.SeriesId + "/Episodes", UriKind.Relative), dict);
 
             using (var stream = await GetSerializedStreamAsync(url, cancellationToken).ConfigureAwait(false))
             {
@@ -619,14 +562,14 @@ public async Task<QueryResult<BaseItemDto>> GetUpcomingEpisodesAsync(UpcomingEpi
             }
         }
 
-        public async Task<QueryResult<BaseItemDto>> GetSeasonsAsync(SeasonQuery query, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<QueryResult<BaseItemDto>> GetSeasonsAsync(SeasonQuery query, CancellationToken cancellationToken = default)
         {
             if (query == null)
             {
                 throw new ArgumentNullException("query");
             }
 
-            var dict = new QueryStringDictionary { };
+            var dict = new NameValueCollection { };
 
             dict.AddIfNotNullOrEmpty("UserId", query.UserId);
 
@@ -639,7 +582,7 @@ public async Task<QueryResult<BaseItemDto>> GetUpcomingEpisodesAsync(UpcomingEpi
             dict.AddIfNotNull("IsVirtualUnaired", query.IsVirtualUnaired);
             dict.AddIfNotNull("IsSpecialSeason", query.IsSpecialSeason);
 
-            var url = GetApiUrl("Shows/" + query.SeriesId + "/Seasons", dict);
+            var url = GetApiUrl(new Uri("Shows/" + query.SeriesId + "/Seasons", UriKind.Relative), dict);
 
             using (var stream = await GetSerializedStreamAsync(url, cancellationToken).ConfigureAwait(false))
             {
@@ -653,13 +596,17 @@ public async Task<QueryResult<BaseItemDto>> GetUpcomingEpisodesAsync(UpcomingEpi
         /// <param name="query">The query.</param>
         /// <returns>Task{ItemsResult}.</returns>
         /// <exception cref="System.ArgumentNullException">userId</exception>
-        public async Task<QueryResult<BaseItemDto>> GetPeopleAsync(PersonsQuery query, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<QueryResult<BaseItemDto>> GetPeopleAsync(PersonsQuery query, CancellationToken cancellationToken = default)
         {
             var url = GetItemByNameListUrl("Persons", query);
 
             if (query.PersonTypes != null && query.PersonTypes.Length > 0)
             {
-                url += "&PersonTypes=" + string.Join(",", query.PersonTypes);
+                var uriBuilder = new UriBuilder(url);
+                var uriQuery = HttpUtility.ParseQueryString(uriBuilder.Query);
+                uriQuery["PersonTypes"] = string.Join(",", query.PersonTypes);
+                uriBuilder.Query = uriQuery.ToQueryString();
+                url = uriBuilder.Uri;
             }
 
             using (var stream = await GetSerializedStreamAsync(url, cancellationToken).ConfigureAwait(false))
@@ -736,18 +683,18 @@ public async Task<QueryResult<BaseItemDto>> GetAlbumArtistsAsync(ArtistsQuery qu
         /// <returns>Task.</returns>
         public Task RestartServerAsync()
         {
-            var url = GetApiUrl("System/Restart");
+            var url = GetApiUrl(new Uri("System/Restart", UriKind.Relative));
 
-            return PostAsync<EmptyRequestResult>(url, new QueryStringDictionary(), CancellationToken.None);
+            return PostAsync<EmptyRequestResult>(url, new NameValueCollection(), CancellationToken.None);
         }
 
         /// <summary>
         /// Gets the system status async.
         /// </summary>
         /// <returns>Task{SystemInfo}.</returns>
-        public async Task<SystemInfo> GetSystemInfoAsync(CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<SystemInfo> GetSystemInfoAsync(CancellationToken cancellationToken = default)
         {
-            var url = GetApiUrl("System/Info");
+            var url = GetApiUrl(new Uri("System/Info", UriKind.Relative));
 
             using (var stream = await GetSerializedStreamAsync(url, cancellationToken).ConfigureAwait(false))
             {
@@ -760,9 +707,9 @@ public Task RestartServerAsync()
         /// </summary>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>Task&lt;PublicSystemInfo&gt;.</returns>
-        public async Task<PublicSystemInfo> GetPublicSystemInfoAsync(CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<PublicSystemInfo> GetPublicSystemInfoAsync(CancellationToken cancellationToken = default)
         {
-            var url = GetApiUrl("System/Info/Public");
+            var url = GetApiUrl(new Uri("System/Info/Public", UriKind.Relative));
 
             using (var stream = await GetSerializedStreamAsync(url, cancellationToken).ConfigureAwait(false))
             {
@@ -776,7 +723,7 @@ public Task RestartServerAsync()
         /// <returns>Task{PluginInfo[]}.</returns>
         public async Task<PluginInfo[]> GetInstalledPluginsAsync()
         {
-            var url = GetApiUrl("Plugins");
+            var url = GetApiUrl(new Uri("Plugins", UriKind.Relative));
 
             using (var stream = await GetSerializedStreamAsync(url).ConfigureAwait(false))
             {
@@ -790,7 +737,7 @@ public async Task<PluginInfo[]> GetInstalledPluginsAsync()
         /// <returns>Task{ServerConfiguration}.</returns>
         public async Task<ServerConfiguration> GetServerConfigurationAsync()
         {
-            var url = GetApiUrl("System/Configuration");
+            var url = GetApiUrl(new Uri("System/Configuration", UriKind.Relative));
 
             using (var stream = await GetSerializedStreamAsync(url).ConfigureAwait(false))
             {
@@ -804,7 +751,7 @@ public async Task<ServerConfiguration> GetServerConfigurationAsync()
         /// <returns>Task{TaskInfo[]}.</returns>
         public async Task<TaskInfo[]> GetScheduledTasksAsync()
         {
-            var url = GetApiUrl("ScheduledTasks");
+            var url = GetApiUrl(new Uri("ScheduledTasks", UriKind.Relative));
 
             using (var stream = await GetSerializedStreamAsync(url).ConfigureAwait(false))
             {
@@ -825,7 +772,7 @@ public async Task<TaskInfo> GetScheduledTaskAsync(string id)
                 throw new ArgumentNullException("id");
             }
 
-            var url = GetApiUrl("ScheduledTasks/" + id);
+            var url = GetApiUrl(new Uri("ScheduledTasks/" + id, UriKind.Relative));
 
             using (var stream = await GetSerializedStreamAsync(url).ConfigureAwait(false))
             {
@@ -846,7 +793,7 @@ public async Task<UserDto> GetUserAsync(string id)
                 throw new ArgumentNullException("id");
             }
 
-            var url = GetApiUrl("Users/" + id);
+            var url = GetApiUrl(new Uri("Users/" + id, UriKind.Relative));
 
             using (var stream = await GetSerializedStreamAsync(url).ConfigureAwait(false))
             {
@@ -860,7 +807,7 @@ public async Task<UserDto> GetUserAsync(string id)
         /// <returns>Task{List{ParentalRating}}.</returns>
         public async Task<List<ParentalRating>> GetParentalRatingsAsync()
         {
-            var url = GetApiUrl("Localization/ParentalRatings");
+            var url = GetApiUrl(new Uri("Localization/ParentalRatings", UriKind.Relative));
 
             using (var stream = await GetSerializedStreamAsync(url).ConfigureAwait(false))
             {
@@ -886,7 +833,7 @@ public async Task<BaseItemDto[]> GetLocalTrailersAsync(string userId, string ite
                 throw new ArgumentNullException("itemId");
             }
 
-            var url = GetApiUrl("Users/" + userId + "/Items/" + itemId + "/LocalTrailers");
+            var url = GetApiUrl(new Uri("Users/" + userId + "/Items/" + itemId + "/LocalTrailers", UriKind.Relative));
 
             using (var stream = await GetSerializedStreamAsync(url).ConfigureAwait(false))
             {
@@ -912,7 +859,7 @@ public async Task<BaseItemDto[]> GetSpecialFeaturesAsync(string userId, string i
                 throw new ArgumentNullException("itemId");
             }
 
-            var url = GetApiUrl("Users/" + userId + "/Items/" + itemId + "/SpecialFeatures");
+            var url = GetApiUrl(new Uri("Users/" + userId + "/Items/" + itemId + "/SpecialFeatures", UriKind.Relative));
 
             using (var stream = await GetSerializedStreamAsync(url).ConfigureAwait(false))
             {
@@ -926,7 +873,7 @@ public async Task<BaseItemDto[]> GetSpecialFeaturesAsync(string userId, string i
         /// <returns>Task{CultureDto[]}.</returns>
         public async Task<CultureDto[]> GetCulturesAsync()
         {
-            var url = GetApiUrl("Localization/Cultures");
+            var url = GetApiUrl(new Uri("Localization/Cultures", UriKind.Relative));
 
             using (var stream = await GetSerializedStreamAsync(url).ConfigureAwait(false))
             {
@@ -940,7 +887,7 @@ public async Task<CultureDto[]> GetCulturesAsync()
         /// <returns>Task{CountryInfo[]}.</returns>
         public async Task<CountryInfo[]> GetCountriesAsync()
         {
-            var url = GetApiUrl("Localization/Countries");
+            var url = GetApiUrl(new Uri("Localization/Countries", UriKind.Relative));
 
             using (var stream = await GetSerializedStreamAsync(url).ConfigureAwait(false))
             {
@@ -948,20 +895,6 @@ public async Task<CountryInfo[]> GetCountriesAsync()
             }
         }
 
-        /// <summary>
-        /// Gets the game system summaries async.
-        /// </summary>
-        /// <returns>Task{List{GameSystemSummary}}.</returns>
-        public async Task<List<GameSystemSummary>> GetGameSystemSummariesAsync(CancellationToken cancellationToken = default(CancellationToken))
-        {
-            var url = GetApiUrl("Games/SystemSummaries");
-
-            using (var stream = await GetSerializedStreamAsync(url, cancellationToken).ConfigureAwait(false))
-            {
-                return DeserializeFromStream<List<GameSystemSummary>>(stream);
-            }
-        }
-
         public Task<UserItemDataDto> MarkPlayedAsync(string itemId, string userId, DateTime? datePlayed)
         {
             if (string.IsNullOrEmpty(itemId))
@@ -973,16 +906,16 @@ public Task<UserItemDataDto> MarkPlayedAsync(string itemId, string userId, DateT
                 throw new ArgumentNullException("userId");
             }
 
-            var dict = new QueryStringDictionary();
+            var dict = new NameValueCollection();
 
             if (datePlayed.HasValue)
             {
-                dict.Add("DatePlayed", datePlayed.Value.ToString("yyyyMMddHHmmss"));
+                dict.Add("DatePlayed", datePlayed.Value.ToString("yyyyMMddHHmmss", CultureInfo.InvariantCulture));
             }
 
-            var url = GetApiUrl("Users/" + userId + "/PlayedItems/" + itemId, dict);
+            var url = GetApiUrl(new Uri("Users/" + userId + "/PlayedItems/" + itemId, UriKind.Relative), dict);
 
-            return PostAsync<UserItemDataDto>(url, new Dictionary<string, string>(), CancellationToken.None);
+            return PostAsync<UserItemDataDto>(url, new NameValueCollection(), CancellationToken.None);
         }
 
         /// <summary>
@@ -1007,7 +940,7 @@ public Task<UserItemDataDto> MarkUnplayedAsync(string itemId, string userId)
                 throw new ArgumentNullException("userId");
             }
 
-            var url = GetApiUrl("Users/" + userId + "/PlayedItems/" + itemId);
+            var url = GetApiUrl(new Uri("Users/" + userId + "/PlayedItems/" + itemId, UriKind.Relative));
 
             return DeleteAsync<UserItemDataDto>(url, CancellationToken.None);
         }
@@ -1031,11 +964,11 @@ public Task<UserItemDataDto> UpdateFavoriteStatusAsync(string itemId, string use
                 throw new ArgumentNullException("userId");
             }
 
-            var url = GetApiUrl("Users/" + userId + "/FavoriteItems/" + itemId);
+            var url = GetApiUrl(new Uri("Users/" + userId + "/FavoriteItems/" + itemId, UriKind.Relative));
 
             if (isFavorite)
             {
-                return PostAsync<UserItemDataDto>(url, new Dictionary<string, string>(), CancellationToken.None);
+                return PostAsync<UserItemDataDto>(url, new NameValueCollection(), CancellationToken.None);
             }
 
             return DeleteAsync<UserItemDataDto>(url, CancellationToken.None);
@@ -1054,9 +987,9 @@ public Task ReportPlaybackStartAsync(PlaybackStartInfo info)
                 throw new ArgumentNullException("info");
             }
 
-            Logger.Debug("ReportPlaybackStart: Item {0}", info.ItemId);
+            Logger.LogDebug("ReportPlaybackStart: Item {0}", info.ItemId);
 
-            var url = GetApiUrl("Sessions/Playing");
+            var url = GetApiUrl(new Uri("Sessions/Playing", UriKind.Relative));
 
             return PostAsync<PlaybackStartInfo, EmptyRequestResult>(url, info, CancellationToken.None);
         }
@@ -1079,7 +1012,7 @@ public Task ReportPlaybackProgressAsync(PlaybackProgressInfo info)
                 return SendWebSocketMessage("ReportPlaybackProgress", JsonSerializer.SerializeToString(info));
             }
 
-            var url = GetApiUrl("Sessions/Playing/Progress");
+            var url = GetApiUrl(new Uri("Sessions/Playing/Progress", UriKind.Relative));
 
             return PostAsync<PlaybackProgressInfo, EmptyRequestResult>(url, info, CancellationToken.None);
         }
@@ -1097,7 +1030,7 @@ public Task ReportPlaybackStoppedAsync(PlaybackStopInfo info)
                 throw new ArgumentNullException("info");
             }
 
-            var url = GetApiUrl("Sessions/Playing/Stopped");
+            var url = GetApiUrl(new Uri("Sessions/Playing/Stopped", UriKind.Relative));
 
             return PostAsync<PlaybackStopInfo, EmptyRequestResult>(url, info, CancellationToken.None);
         }
@@ -1151,14 +1084,17 @@ public Task SendPlayCommandAsync(string sessionId, PlayRequest request)
                 throw new ArgumentNullException("request");
             }
 
-            var dict = new QueryStringDictionary();
-            dict.Add("ItemIds", request.ItemIds);
+            var dict = new NameValueCollection
+            {
+                { "ItemIds", request.ItemIds.Select(o => o.ToString("N", CultureInfo.InvariantCulture)).ToList() },
+                { "PlayCommand", request.PlayCommand.ToString() }
+            };
+
             dict.AddIfNotNull("StartPositionTicks", request.StartPositionTicks);
-            dict.Add("PlayCommand", request.PlayCommand.ToString());
 
-            var url = GetApiUrl("Sessions/" + sessionId + "/Playing", dict);
+            var url = GetApiUrl(new Uri("Sessions/" + sessionId + "/Playing", UriKind.Relative), dict);
 
-            return PostAsync<EmptyRequestResult>(url, new Dictionary<string, string>(), CancellationToken.None);
+            return PostAsync<EmptyRequestResult>(url, new NameValueCollection(), CancellationToken.None);
         }
 
         public Task SendMessageCommandAsync(string sessionId, MessageCommand command)
@@ -1173,7 +1109,7 @@ public Task SendMessageCommandAsync(string sessionId, MessageCommand command)
 
             if (command.TimeoutMs.HasValue)
             {
-                cmd.Arguments["Timeout"] = command.TimeoutMs.Value.ToString(CultureInfo.InvariantCulture);
+                cmd.Arguments["Timeout"] = command.TimeoutMs?.ToString(CultureInfo.InvariantCulture);
             }
 
             return SendCommandAsync(sessionId, cmd);
@@ -1193,7 +1129,7 @@ public Task SendCommandAsync(string sessionId, GeneralCommand command)
                 throw new ArgumentNullException("sessionId");
             }
 
-            var url = GetApiUrl("Sessions/" + sessionId + "/Command");
+            var url = GetApiUrl(new Uri("Sessions/" + sessionId + "/Command", UriKind.Relative));
 
             return PostAsync<GeneralCommand, EmptyRequestResult>(url, command, CancellationToken.None);
         }
@@ -1206,12 +1142,12 @@ public Task SendCommandAsync(string sessionId, GeneralCommand command)
         /// <returns>Task.</returns>
         public Task SendPlaystateCommandAsync(string sessionId, PlaystateRequest request)
         {
-            var dict = new QueryStringDictionary();
+            var dict = new NameValueCollection();
             dict.AddIfNotNull("SeekPositionTicks", request.SeekPositionTicks);
 
-            var url = GetApiUrl("Sessions/" + sessionId + "/Playing/" + request.Command.ToString(), dict);
+            var url = GetApiUrl(new Uri("Sessions/" + sessionId + "/Playing/" + request.Command.ToString(), UriKind.Relative), dict);
 
-            return PostAsync<EmptyRequestResult>(url, new Dictionary<string, string>(), CancellationToken.None);
+            return PostAsync<EmptyRequestResult>(url, new NameValueCollection(), CancellationToken.None);
         }
 
         /// <summary>
@@ -1233,7 +1169,7 @@ public Task<UserItemDataDto> ClearUserItemRatingAsync(string itemId, string user
                 throw new ArgumentNullException("userId");
             }
 
-            var url = GetApiUrl("Users/" + userId + "/Items/" + itemId + "/Rating");
+            var url = GetApiUrl(new Uri("Users/" + userId + "/Items/" + itemId + "/Rating", UriKind.Relative));
 
             return DeleteAsync<UserItemDataDto>(url, CancellationToken.None);
         }
@@ -1258,17 +1194,15 @@ public Task<UserItemDataDto> UpdateUserItemRatingAsync(string itemId, string use
                 throw new ArgumentNullException("userId");
             }
 
-            var dict = new QueryStringDictionary { };
+            var dict = new NameValueCollection { };
 
             dict.Add("likes", likes);
 
-            var url = GetApiUrl("Users/" + userId + "/Items/" + itemId + "/Rating", dict);
+            var url = GetApiUrl(new Uri("Users/" + userId + "/Items/" + itemId + "/Rating", UriKind.Relative), dict);
 
-            return PostAsync<UserItemDataDto>(url, new Dictionary<string, string>(), CancellationToken.None);
+            return PostAsync<UserItemDataDto>(url, new NameValueCollection(), CancellationToken.None);
         }
 
-        internal Func<IApiClient, AuthenticationResult, Task> OnAuthenticated { get; set; }
-
         /// <summary>
         /// Authenticates a user and returns the result
         /// </summary>
@@ -1284,26 +1218,19 @@ public async Task<AuthenticationResult> AuthenticateUserAsync(string username, s
                 throw new ArgumentNullException("username");
             }
 
-            var url = GetApiUrl("Users/AuthenticateByName");
-
-            var args = new Dictionary<string, string>();
+            var url = GetApiUrl(new Uri("Users/AuthenticateByName", UriKind.Relative));
 
-            args["username"] = Uri.EscapeDataString(username);
-            args["pw"] = password;
-
-            var bytes = Encoding.UTF8.GetBytes(password ?? string.Empty);
-            args["password"] = BitConverter.ToString(_cryptographyProvider.CreateSha1(bytes)).Replace("-", string.Empty);
-
-            args["passwordMD5"] = ConnectService.GetConnectPasswordMd5(password ?? string.Empty, _cryptographyProvider);
+            var authRequest = new AuthenticationRequest
+            {
+                Username = username,
+                Pw = password
+            };
 
-            var result = await PostAsync<AuthenticationResult>(url, args, CancellationToken.None);
+            var result = await PostAsync<AuthenticationRequest,AuthenticationResult>(url, authRequest, CancellationToken.None);
 
             SetAuthenticationInfo(result.AccessToken, result.User.Id);
 
-            if (OnAuthenticated != null)
-            {
-                await OnAuthenticated(this, result).ConfigureAwait(false);
-            }
+            OnAuthenticated?.Invoke(this, new GenericEventArgs<AuthenticationResult>(result));
 
             return result;
         }
@@ -1321,7 +1248,7 @@ public Task UpdateServerConfigurationAsync(ServerConfiguration configuration)
                 throw new ArgumentNullException("configuration");
             }
 
-            var url = GetApiUrl("System/Configuration");
+            var url = GetApiUrl(new Uri("System/Configuration", UriKind.Relative));
 
             return PostAsync<ServerConfiguration, EmptyRequestResult>(url, configuration, CancellationToken.None);
         }
@@ -1345,7 +1272,7 @@ public Task UpdateScheduledTaskTriggersAsync(string id, TaskTriggerInfo[] trigge
                 throw new ArgumentNullException("triggers");
             }
 
-            var url = GetApiUrl("ScheduledTasks/" + id + "/Triggers");
+            var url = GetApiUrl(new Uri("ScheduledTasks/" + id + "/Triggers", UriKind.Relative));
 
             return PostAsync<TaskTriggerInfo[], EmptyRequestResult>(url, triggers, CancellationToken.None);
         }
@@ -1357,14 +1284,15 @@ public Task UpdateScheduledTaskTriggersAsync(string id, TaskTriggerInfo[] trigge
         /// <param name="userId">The user id.</param>
         /// <param name="client">The client.</param>
         /// <returns>Task{BaseItemDto}.</returns>
-        public async Task<DisplayPreferences> GetDisplayPreferencesAsync(string id, string userId, string client, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<DisplayPreferences> GetDisplayPreferencesAsync(string id, string userId, string client, CancellationToken cancellationToken = default)
         {
-            var dict = new QueryStringDictionary();
-
-            dict.Add("userId", userId);
-            dict.Add("client", client);
+            var dict = new NameValueCollection
+            {
+                { "userId", userId },
+                { "client", client }
+            };
 
-            var url = GetApiUrl("DisplayPreferences/" + id, dict);
+            var url = GetApiUrl(new Uri("DisplayPreferences/" + id, UriKind.Relative), dict);
 
             using (var stream = await GetSerializedStreamAsync(url, cancellationToken).ConfigureAwait(false))
             {
@@ -1378,19 +1306,20 @@ public Task UpdateScheduledTaskTriggersAsync(string id, TaskTriggerInfo[] trigge
         /// <param name="displayPreferences">The display preferences.</param>
         /// <returns>Task{DisplayPreferences}.</returns>
         /// <exception cref="System.ArgumentNullException">userId</exception>
-        public Task UpdateDisplayPreferencesAsync(DisplayPreferences displayPreferences, string userId, string client, CancellationToken cancellationToken = default(CancellationToken))
+        public Task UpdateDisplayPreferencesAsync(DisplayPreferences displayPreferences, string userId, string client, CancellationToken cancellationToken = default)
         {
             if (displayPreferences == null)
             {
                 throw new ArgumentNullException("displayPreferences");
             }
 
-            var dict = new QueryStringDictionary();
-
-            dict.Add("userId", userId);
-            dict.Add("client", client);
+            var dict = new NameValueCollection
+            {
+                { "userId", userId },
+                { "client", client }
+            };
 
-            var url = GetApiUrl("DisplayPreferences/" + displayPreferences.Id, dict);
+            var url = GetApiUrl(new Uri("DisplayPreferences/" + displayPreferences.Id, UriKind.Relative), dict);
 
             return PostAsync<DisplayPreferences, EmptyRequestResult>(url, displayPreferences, cancellationToken);
         }
@@ -1403,14 +1332,13 @@ public Task UpdateScheduledTaskTriggersAsync(string id, TaskTriggerInfo[] trigge
         /// <param name="args">The args.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>Task{``0}.</returns>
-        public async Task<T> PostAsync<T>(string url, Dictionary<string, string> args, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<T> PostAsync<T>(Uri url, NameValueCollection query, CancellationToken cancellationToken = default)
             where T : class
         {
             url = AddDataFormat(url);
 
             // Create the post body
-            var strings = args.Keys.Select(key => string.Format("{0}={1}", key, args[key]));
-            var postContent = string.Join("&", strings.ToArray());
+            var postContent = query.ToQueryString();
 
             const string contentType = "application/x-www-form-urlencoded";
 
@@ -1435,7 +1363,7 @@ public Task UpdateScheduledTaskTriggersAsync(string id, TaskTriggerInfo[] trigge
         /// <param name="url">The URL.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>Task{``0}.</returns>
-        private async Task<T> DeleteAsync<T>(string url, CancellationToken cancellationToken = default(CancellationToken))
+        private async Task<T> DeleteAsync<T>(Uri url, CancellationToken cancellationToken = default)
             where T : class
         {
             url = AddDataFormat(url);
@@ -1462,7 +1390,7 @@ public Task UpdateScheduledTaskTriggersAsync(string id, TaskTriggerInfo[] trigge
         /// <param name="obj">The obj.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>Task{``1}.</returns>
-        private async Task<TOutputType> PostAsync<TInputType, TOutputType>(string url, TInputType obj, CancellationToken cancellationToken = default(CancellationToken))
+        private async Task<TOutputType> PostAsync<TInputType, TOutputType>(Uri url, TInputType obj, CancellationToken cancellationToken = default)
             where TOutputType : class
         {
             url = AddDataFormat(url);
@@ -1491,21 +1419,21 @@ public Task UpdateScheduledTaskTriggersAsync(string id, TaskTriggerInfo[] trigge
         /// <param name="url">The URL.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>Task{Stream}.</returns>
-        public Task<Stream> GetSerializedStreamAsync(string url, CancellationToken cancellationToken)
+        public Task<Stream> GetSerializedStreamAsync(Uri url, CancellationToken cancellationToken)
         {
             url = AddDataFormat(url);
 
             return GetStream(url, cancellationToken);
         }
 
-        public Task<Stream> GetSerializedStreamAsync(string url)
+        public Task<Stream> GetSerializedStreamAsync(Uri url)
         {
             return GetSerializedStreamAsync(url, CancellationToken.None);
         }
 
         public async Task<NotificationsSummary> GetNotificationsSummary(string userId)
         {
-            var url = GetApiUrl("Notifications/" + userId + "/Summary");
+            var url = GetApiUrl(new Uri("Notifications/" + userId + "/Summary", UriKind.Relative));
 
             using (var stream = await GetSerializedStreamAsync(url).ConfigureAwait(false))
             {
@@ -1515,11 +1443,11 @@ public async Task<NotificationsSummary> GetNotificationsSummary(string userId)
 
         public Task MarkNotificationsRead(string userId, IEnumerable<string> notificationIdList, bool isRead)
         {
-            var url = "Notifications/" + userId;
+            Uri url = new Uri("Notifications/" + userId, UriKind.Relative);
 
-            url += isRead ? "/Read" : "/Unread";
+            url = new Uri(url, isRead ? "/Read" : "/Unread");
 
-            var dict = new QueryStringDictionary();
+            var dict = new NameValueCollection();
 
             var ids = notificationIdList.ToArray();
 
@@ -1527,14 +1455,14 @@ public Task MarkNotificationsRead(string userId, IEnumerable<string> notificatio
 
             url = GetApiUrl(url, dict);
 
-            return PostAsync<EmptyRequestResult>(url, new Dictionary<string, string>(), CancellationToken.None);
+            return PostAsync<EmptyRequestResult>(url, new NameValueCollection(), CancellationToken.None);
         }
 
         public async Task<NotificationResult> GetNotificationsAsync(NotificationQuery query)
         {
-            var url = "Notifications/" + query.UserId;
+            var url = new Uri("Notifications/" + query.UserId, UriKind.Relative);
 
-            var dict = new QueryStringDictionary();
+            var dict = new NameValueCollection();
             dict.AddIfNotNull("ItemIds", query.IsRead);
             dict.AddIfNotNull("StartIndex", query.StartIndex);
             dict.AddIfNotNull("Limit", query.Limit);
@@ -1547,14 +1475,16 @@ public async Task<NotificationResult> GetNotificationsAsync(NotificationQuery qu
             }
         }
 
-        public async Task<AllThemeMediaResult> GetAllThemeMediaAsync(string userId, string itemId, bool inheritFromParent, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AllThemeMediaResult> GetAllThemeMediaAsync(string userId, string itemId, bool inheritFromParent, CancellationToken cancellationToken = default)
         {
-            var queryString = new QueryStringDictionary();
+            var queryString = new NameValueCollection
+            {
+                { "InheritFromParent", inheritFromParent }
+            };
 
-            queryString.Add("InheritFromParent", inheritFromParent);
             queryString.AddIfNotNullOrEmpty("UserId", userId);
 
-            var url = GetApiUrl("Items/" + itemId + "/ThemeMedia", queryString);
+            var url = GetApiUrl(new Uri("Items/" + itemId + "/ThemeMedia", UriKind.Relative), queryString);
 
             using (var stream = await GetSerializedStreamAsync(url, cancellationToken).ConfigureAwait(false))
             {
@@ -1569,10 +1499,10 @@ public async Task<SearchHintResult> GetSearchHintsAsync(SearchQuery query)
                 throw new ArgumentNullException("query");
             }
 
-            var queryString = new QueryStringDictionary();
+            var queryString = new NameValueCollection();
 
             queryString.AddIfNotNullOrEmpty("SearchTerm", query.SearchTerm);
-            queryString.AddIfNotNullOrEmpty("UserId", query.UserId);
+            queryString.AddIfNotNullOrEmpty("UserId", query.UserId.ToString("N", CultureInfo.InvariantCulture));
             queryString.AddIfNotNullOrEmpty("ParentId", query.ParentId);
             queryString.AddIfNotNull("StartIndex", query.StartIndex);
             queryString.AddIfNotNull("Limit", query.Limit);
@@ -1593,7 +1523,7 @@ public async Task<SearchHintResult> GetSearchHintsAsync(SearchQuery query)
             queryString.AddIfNotNull("IsSports", query.IsSports);
             queryString.AddIfNotNull("MediaTypes", query.MediaTypes);
 
-            var url = GetApiUrl("Search/Hints", queryString);
+            var url = GetApiUrl(new Uri("Search/Hints", UriKind.Relative), queryString);
 
             using (var stream = await GetSerializedStreamAsync(url).ConfigureAwait(false))
             {
@@ -1601,14 +1531,16 @@ public async Task<SearchHintResult> GetSearchHintsAsync(SearchQuery query)
             }
         }
 
-        public async Task<ThemeMediaResult> GetThemeSongsAsync(string userId, string itemId, bool inheritFromParent, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<ThemeMediaResult> GetThemeSongsAsync(string userId, string itemId, bool inheritFromParent, CancellationToken cancellationToken = default)
         {
-            var queryString = new QueryStringDictionary();
+            var queryString = new NameValueCollection
+            {
+                { "InheritFromParent", inheritFromParent }
+            };
 
-            queryString.Add("InheritFromParent", inheritFromParent);
             queryString.AddIfNotNullOrEmpty("UserId", userId);
 
-            var url = GetApiUrl("Items/" + itemId + "/ThemeSongs", queryString);
+            var url = GetApiUrl(new Uri("Items/" + itemId + "/ThemeSongs", UriKind.Relative), queryString);
 
             using (var stream = await GetSerializedStreamAsync(url, cancellationToken).ConfigureAwait(false))
             {
@@ -1616,14 +1548,16 @@ public async Task<SearchHintResult> GetSearchHintsAsync(SearchQuery query)
             }
         }
 
-        public async Task<ThemeMediaResult> GetThemeVideosAsync(string userId, string itemId, bool inheritFromParent, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<ThemeMediaResult> GetThemeVideosAsync(string userId, string itemId, bool inheritFromParent, CancellationToken cancellationToken = default)
         {
-            var queryString = new QueryStringDictionary();
+            var queryString = new NameValueCollection
+            {
+                { "InheritFromParent", inheritFromParent }
+            };
 
-            queryString.Add("InheritFromParent", inheritFromParent);
             queryString.AddIfNotNullOrEmpty("UserId", userId);
 
-            var url = GetApiUrl("Items/" + itemId + "/ThemeVideos", queryString);
+            var url = GetApiUrl(new Uri("Items/" + itemId + "/ThemeVideos", UriKind.Relative), queryString);
 
             using (var stream = await GetSerializedStreamAsync(url, cancellationToken).ConfigureAwait(false))
             {
@@ -1643,19 +1577,19 @@ public async Task<SearchHintResult> GetSearchHintsAsync(SearchQuery query)
         /// or
         /// userId
         /// </exception>
-        public async Task<QueryResult<ItemReview>> GetCriticReviews(string itemId, CancellationToken cancellationToken = default(CancellationToken), int? startIndex = null, int? limit = null)
+        public async Task<QueryResult<ItemReview>> GetCriticReviews(string itemId, CancellationToken cancellationToken = default, int? startIndex = null, int? limit = null)
         {
             if (string.IsNullOrEmpty(itemId))
             {
                 throw new ArgumentNullException("itemId");
             }
 
-            var queryString = new QueryStringDictionary();
+            var queryString = new NameValueCollection();
 
             queryString.AddIfNotNull("startIndex", startIndex);
             queryString.AddIfNotNull("limit", limit);
 
-            var url = GetApiUrl("Items/" + itemId + "/CriticReviews", queryString);
+            var url = GetApiUrl(new Uri("Items/" + itemId + "/CriticReviews", UriKind.Relative), queryString);
 
             using (var stream = await GetSerializedStreamAsync(url, cancellationToken).ConfigureAwait(false))
             {
@@ -1663,7 +1597,7 @@ public async Task<SearchHintResult> GetSearchHintsAsync(SearchQuery query)
             }
         }
 
-        public async Task<T> GetAsync<T>(string url, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<T> GetAsync<T>(Uri url, CancellationToken cancellationToken = default)
             where T : class
         {
             using (var stream = await GetSerializedStreamAsync(url, cancellationToken).ConfigureAwait(false))
@@ -1678,13 +1612,13 @@ public async Task<SearchHintResult> GetSearchHintsAsync(SearchQuery query)
         /// <param name="userId">The user id.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>Task{List{ItemIndex}}.</returns>
-        public async Task<List<ItemIndex>> GetGamePlayerIndex(string userId, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<List<ItemIndex>> GetGamePlayerIndex(string userId, CancellationToken cancellationToken = default)
         {
-            var queryString = new QueryStringDictionary();
+            var queryString = new NameValueCollection();
 
             queryString.AddIfNotNullOrEmpty("UserId", userId);
 
-            var url = GetApiUrl("Games/PlayerIndex", queryString);
+            var url = GetApiUrl(new Uri("Games/PlayerIndex", UriKind.Relative), queryString);
 
             using (var stream = await GetSerializedStreamAsync(url, cancellationToken).ConfigureAwait(false))
             {
@@ -1699,14 +1633,14 @@ public async Task<SearchHintResult> GetSearchHintsAsync(SearchQuery query)
         /// <param name="includeItemTypes">The include item types.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>Task{List{ItemIndex}}.</returns>
-        public async Task<List<ItemIndex>> GetYearIndex(string userId, string[] includeItemTypes, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<List<ItemIndex>> GetYearIndex(string userId, string[] includeItemTypes, CancellationToken cancellationToken = default)
         {
-            var queryString = new QueryStringDictionary();
+            var queryString = new NameValueCollection();
 
             queryString.AddIfNotNullOrEmpty("UserId", userId);
             queryString.AddIfNotNull("IncludeItemTypes", includeItemTypes);
 
-            var url = GetApiUrl("Items/YearIndex", queryString);
+            var url = GetApiUrl(new Uri("Items/YearIndex", UriKind.Relative), queryString);
 
             using (var stream = await GetSerializedStreamAsync(url, cancellationToken).ConfigureAwait(false))
             {
@@ -1714,21 +1648,21 @@ public async Task<SearchHintResult> GetSearchHintsAsync(SearchQuery query)
             }
         }
 
-        public Task ReportCapabilities(ClientCapabilities capabilities, CancellationToken cancellationToken = default(CancellationToken))
+        public Task ReportCapabilities(ClientCapabilities capabilities, CancellationToken cancellationToken = default)
         {
             if (capabilities == null)
             {
                 throw new ArgumentNullException("capabilities");
             }
 
-            var url = GetApiUrl("Sessions/Capabilities/Full");
+            var url = GetApiUrl(new Uri("Sessions/Capabilities/Full", UriKind.Relative));
 
             return PostAsync<ClientCapabilities, EmptyRequestResult>(url, capabilities, cancellationToken);
         }
 
-        public async Task<LiveTvInfo> GetLiveTvInfoAsync(CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<LiveTvInfo> GetLiveTvInfoAsync(CancellationToken cancellationToken = default)
         {
-            var url = GetApiUrl("LiveTv/Info");
+            var url = GetApiUrl(new Uri("LiveTv/Info", UriKind.Relative));
 
             using (var stream = await GetSerializedStreamAsync(url, cancellationToken).ConfigureAwait(false))
             {
@@ -1736,18 +1670,18 @@ public async Task<SearchHintResult> GetSearchHintsAsync(SearchQuery query)
             }
         }
 
-        public async Task<QueryResult<BaseItemDto>> GetLiveTvRecordingGroupsAsync(RecordingGroupQuery query, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<QueryResult<BaseItemDto>> GetLiveTvRecordingGroupsAsync(RecordingGroupQuery query, CancellationToken cancellationToken = default)
         {
             if (query == null)
             {
                 throw new ArgumentNullException("query");
             }
 
-            var dict = new QueryStringDictionary { };
+            var dict = new NameValueCollection { };
 
             dict.AddIfNotNullOrEmpty("UserId", query.UserId);
 
-            var url = GetApiUrl("LiveTv/Recordings/Groups", dict);
+            var url = GetApiUrl(new Uri("LiveTv/Recordings/Groups", UriKind.Relative), dict);
 
             using (var stream = await GetSerializedStreamAsync(url, cancellationToken).ConfigureAwait(false))
             {
@@ -1755,18 +1689,17 @@ public async Task<SearchHintResult> GetSearchHintsAsync(SearchQuery query)
             }
         }
 
-        public async Task<QueryResult<BaseItemDto>> GetLiveTvRecordingsAsync(RecordingQuery query, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<QueryResult<BaseItemDto>> GetLiveTvRecordingsAsync(RecordingQuery query, CancellationToken cancellationToken = default)
         {
             if (query == null)
             {
                 throw new ArgumentNullException("query");
             }
 
-            var dict = new QueryStringDictionary { };
+            var dict = new NameValueCollection { };
 
-            dict.AddIfNotNullOrEmpty("UserId", query.UserId);
+            dict.AddIfNotNullOrEmpty("UserId", query.UserId.ToString("N", CultureInfo.InvariantCulture));
             dict.AddIfNotNullOrEmpty("ChannelId", query.ChannelId);
-            dict.AddIfNotNullOrEmpty("GroupId", query.GroupId);
             dict.AddIfNotNullOrEmpty("Id", query.Id);
             dict.AddIfNotNullOrEmpty("SeriesTimerId", query.SeriesTimerId);
             dict.AddIfNotNull("IsInProgress", query.IsInProgress);
@@ -1778,7 +1711,7 @@ public async Task<SearchHintResult> GetSearchHintsAsync(SearchQuery query)
                 dict.Add("EnableTotalRecordCount", query.EnableTotalRecordCount);
             }
 
-            var url = GetApiUrl("LiveTv/Recordings", dict);
+            var url = GetApiUrl(new Uri("LiveTv/Recordings", UriKind.Relative), dict);
 
             using (var stream = await GetSerializedStreamAsync(url, cancellationToken).ConfigureAwait(false))
             {
@@ -1786,16 +1719,16 @@ public async Task<SearchHintResult> GetSearchHintsAsync(SearchQuery query)
             }
         }
 
-        public async Task<QueryResult<ChannelInfoDto>> GetLiveTvChannelsAsync(LiveTvChannelQuery query, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<QueryResult<ChannelInfoDto>> GetLiveTvChannelsAsync(LiveTvChannelQuery query, CancellationToken cancellationToken = default)
         {
             if (query == null)
             {
                 throw new ArgumentNullException("query");
             }
 
-            var dict = new QueryStringDictionary { };
+            var dict = new NameValueCollection { };
 
-            dict.AddIfNotNullOrEmpty("UserId", query.UserId);
+            dict.AddIfNotNullOrEmpty("UserId", query.UserId.ToString("N", CultureInfo.InvariantCulture));
             dict.AddIfNotNull("StartIndex", query.StartIndex);
             dict.AddIfNotNull("Limit", query.Limit);
             dict.AddIfNotNull("IsFavorite", query.IsFavorite);
@@ -1809,7 +1742,7 @@ public async Task<SearchHintResult> GetSearchHintsAsync(SearchQuery query)
                 dict.Add("ChannelType", query.ChannelType.Value.ToString());
             }
 
-            var url = GetApiUrl("LiveTv/Channels", dict);
+            var url = GetApiUrl(new Uri("LiveTv/Channels", UriKind.Relative), dict);
 
             using (var stream = await GetSerializedStreamAsync(url, cancellationToken).ConfigureAwait(false))
             {
@@ -1817,16 +1750,16 @@ public async Task<SearchHintResult> GetSearchHintsAsync(SearchQuery query)
             }
         }
 
-        public Task CancelLiveTvSeriesTimerAsync(string id, CancellationToken cancellationToken = default(CancellationToken))
+        public Task CancelLiveTvSeriesTimerAsync(string id, CancellationToken cancellationToken = default)
         {
             if (string.IsNullOrEmpty(id))
             {
                 throw new ArgumentNullException("id");
             }
 
-            var dict = new QueryStringDictionary { };
+            var dict = new NameValueCollection { };
 
-            var url = GetApiUrl("LiveTv/SeriesTimers/" + id, dict);
+            var url = GetApiUrl(new Uri("LiveTv/SeriesTimers/" + id, UriKind.Relative), dict);
 
             return SendAsync(new HttpRequest
             {
@@ -1837,16 +1770,16 @@ public async Task<SearchHintResult> GetSearchHintsAsync(SearchQuery query)
             });
         }
 
-        public Task CancelLiveTvTimerAsync(string id, CancellationToken cancellationToken = default(CancellationToken))
+        public Task CancelLiveTvTimerAsync(string id, CancellationToken cancellationToken = default)
         {
             if (string.IsNullOrEmpty(id))
             {
                 throw new ArgumentNullException("id");
             }
 
-            var dict = new QueryStringDictionary { };
+            var dict = new NameValueCollection { };
 
-            var url = GetApiUrl("LiveTv/Timers/" + id, dict);
+            var url = GetApiUrl(new Uri("LiveTv/Timers/" + id, UriKind.Relative), dict);
 
             return SendAsync(new HttpRequest
             {
@@ -1857,17 +1790,17 @@ public async Task<SearchHintResult> GetSearchHintsAsync(SearchQuery query)
             });
         }
 
-        public async Task<ChannelInfoDto> GetLiveTvChannelAsync(string id, string userId, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<ChannelInfoDto> GetLiveTvChannelAsync(string id, string userId, CancellationToken cancellationToken = default)
         {
             if (string.IsNullOrEmpty(id))
             {
                 throw new ArgumentNullException("id");
             }
 
-            var dict = new QueryStringDictionary { };
+            var dict = new NameValueCollection { };
             dict.AddIfNotNullOrEmpty("userId", userId);
 
-            var url = GetApiUrl("LiveTv/Channels/" + id, dict);
+            var url = GetApiUrl(new Uri("LiveTv/Channels/" + id, UriKind.Relative), dict);
 
             using (var stream = await GetSerializedStreamAsync(url, cancellationToken).ConfigureAwait(false))
             {
@@ -1875,17 +1808,17 @@ public async Task<SearchHintResult> GetSearchHintsAsync(SearchQuery query)
             }
         }
 
-        public async Task<BaseItemDto> GetLiveTvRecordingAsync(string id, string userId, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<BaseItemDto> GetLiveTvRecordingAsync(string id, string userId, CancellationToken cancellationToken = default)
         {
             if (string.IsNullOrEmpty(id))
             {
                 throw new ArgumentNullException("id");
             }
 
-            var dict = new QueryStringDictionary { };
+            var dict = new NameValueCollection { };
             dict.AddIfNotNullOrEmpty("userId", userId);
 
-            var url = GetApiUrl("LiveTv/Recordings/" + id, dict);
+            var url = GetApiUrl(new Uri("LiveTv/Recordings/" + id, UriKind.Relative), dict);
 
             using (var stream = await GetSerializedStreamAsync(url, cancellationToken).ConfigureAwait(false))
             {
@@ -1893,17 +1826,17 @@ public async Task<SearchHintResult> GetSearchHintsAsync(SearchQuery query)
             }
         }
 
-        public async Task<BaseItemDto> GetLiveTvRecordingGroupAsync(string id, string userId, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<BaseItemDto> GetLiveTvRecordingGroupAsync(string id, string userId, CancellationToken cancellationToken = default)
         {
             if (string.IsNullOrEmpty(id))
             {
                 throw new ArgumentNullException("id");
             }
 
-            var dict = new QueryStringDictionary { };
+            var dict = new NameValueCollection { };
             dict.AddIfNotNullOrEmpty("userId", userId);
 
-            var url = GetApiUrl("LiveTv/Recordings/Groups/" + id, dict);
+            var url = GetApiUrl(new Uri("LiveTv/Recordings/Groups/" + id, UriKind.Relative), dict);
 
             using (var stream = await GetSerializedStreamAsync(url, cancellationToken).ConfigureAwait(false))
             {
@@ -1911,16 +1844,16 @@ public async Task<SearchHintResult> GetSearchHintsAsync(SearchQuery query)
             }
         }
 
-        public async Task<SeriesTimerInfoDto> GetLiveTvSeriesTimerAsync(string id, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<SeriesTimerInfoDto> GetLiveTvSeriesTimerAsync(string id, CancellationToken cancellationToken = default)
         {
             if (string.IsNullOrEmpty(id))
             {
                 throw new ArgumentNullException("id");
             }
 
-            var dict = new QueryStringDictionary { };
+            var dict = new NameValueCollection { };
 
-            var url = GetApiUrl("LiveTv/SeriesTimers/" + id, dict);
+            var url = GetApiUrl(new Uri("LiveTv/SeriesTimers/" + id, UriKind.Relative), dict);
 
             using (var stream = await GetSerializedStreamAsync(url, cancellationToken).ConfigureAwait(false))
             {
@@ -1928,19 +1861,19 @@ public async Task<SearchHintResult> GetSearchHintsAsync(SearchQuery query)
             }
         }
 
-        public async Task<QueryResult<SeriesTimerInfoDto>> GetLiveTvSeriesTimersAsync(SeriesTimerQuery query, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<QueryResult<SeriesTimerInfoDto>> GetLiveTvSeriesTimersAsync(SeriesTimerQuery query, CancellationToken cancellationToken = default)
         {
             if (query == null)
             {
                 throw new ArgumentNullException("query");
             }
 
-            var dict = new QueryStringDictionary { };
+            var dict = new NameValueCollection { };
 
             dict.AddIfNotNullOrEmpty("SortBy", query.SortBy);
             dict.Add("SortOrder", query.SortOrder.ToString());
 
-            var url = GetApiUrl("LiveTv/SeriesTimers", dict);
+            var url = GetApiUrl(new Uri("LiveTv/SeriesTimers", UriKind.Relative), dict);
 
             using (var stream = await GetSerializedStreamAsync(url, cancellationToken).ConfigureAwait(false))
             {
@@ -1948,16 +1881,16 @@ public async Task<SearchHintResult> GetSearchHintsAsync(SearchQuery query)
             }
         }
 
-        public async Task<TimerInfoDto> GetLiveTvTimerAsync(string id, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<TimerInfoDto> GetLiveTvTimerAsync(string id, CancellationToken cancellationToken = default)
         {
             if (string.IsNullOrEmpty(id))
             {
                 throw new ArgumentNullException("id");
             }
 
-            var dict = new QueryStringDictionary { };
+            var dict = new NameValueCollection { };
 
-            var url = GetApiUrl("LiveTv/Timers/" + id, dict);
+            var url = GetApiUrl(new Uri("LiveTv/Timers/" + id, UriKind.Relative), dict);
 
             using (var stream = await GetSerializedStreamAsync(url, cancellationToken).ConfigureAwait(false))
             {
@@ -1965,19 +1898,19 @@ public async Task<SearchHintResult> GetSearchHintsAsync(SearchQuery query)
             }
         }
 
-        public async Task<QueryResult<TimerInfoDto>> GetLiveTvTimersAsync(TimerQuery query, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<QueryResult<TimerInfoDto>> GetLiveTvTimersAsync(TimerQuery query, CancellationToken cancellationToken = default)
         {
             if (query == null)
             {
                 throw new ArgumentNullException("query");
             }
 
-            var dict = new QueryStringDictionary { };
+            var dict = new NameValueCollection { };
 
             dict.AddIfNotNullOrEmpty("ChannelId", query.ChannelId);
             dict.AddIfNotNullOrEmpty("SeriesTimerId", query.SeriesTimerId);
 
-            var url = GetApiUrl("LiveTv/Timers", dict);
+            var url = GetApiUrl(new Uri("LiveTv/Timers", UriKind.Relative), dict);
 
             using (var stream = await GetSerializedStreamAsync(url, cancellationToken).ConfigureAwait(false))
             {
@@ -1985,32 +1918,32 @@ public async Task<SearchHintResult> GetSearchHintsAsync(SearchQuery query)
             }
         }
 
-        public async Task<QueryResult<BaseItemDto>> GetLiveTvProgramsAsync(ProgramQuery query, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<QueryResult<BaseItemDto>> GetLiveTvProgramsAsync(ProgramQuery query, CancellationToken cancellationToken = default)
         {
             if (query == null)
             {
                 throw new ArgumentNullException("query");
             }
 
-            var dict = new QueryStringDictionary { };
+            var dict = new NameValueCollection { };
 
             const string isoDateFormat = "o";
 
             if (query.MaxEndDate.HasValue)
             {
-                dict.Add("MaxEndDate", query.MaxEndDate.Value.ToUniversalTime().ToString(isoDateFormat));
+                dict.Add("MaxEndDate", query.MaxEndDate.Value.ToUniversalTime().ToString(isoDateFormat, CultureInfo.InvariantCulture));
             }
             if (query.MaxStartDate.HasValue)
             {
-                dict.Add("MaxStartDate", query.MaxStartDate.Value.ToUniversalTime().ToString(isoDateFormat));
+                dict.Add("MaxStartDate", query.MaxStartDate.Value.ToUniversalTime().ToString(isoDateFormat, CultureInfo.InvariantCulture));
             }
             if (query.MinEndDate.HasValue)
             {
-                dict.Add("MinEndDate", query.MinEndDate.Value.ToUniversalTime().ToString(isoDateFormat));
+                dict.Add("MinEndDate", query.MinEndDate.Value.ToUniversalTime().ToString(isoDateFormat, CultureInfo.InvariantCulture));
             }
             if (query.MinStartDate.HasValue)
             {
-                dict.Add("MinStartDate", query.MinStartDate.Value.ToUniversalTime().ToString(isoDateFormat));
+                dict.Add("MinStartDate", query.MinStartDate.Value.ToUniversalTime().ToString(isoDateFormat, CultureInfo.InvariantCulture));
             }
 
             dict.AddIfNotNullOrEmpty("UserId", query.UserId);
@@ -2026,7 +1959,7 @@ public async Task<SearchHintResult> GetSearchHintsAsync(SearchQuery query)
             }
 
             // TODO: This endpoint supports POST if the query string is too long
-            var url = GetApiUrl("LiveTv/Programs", dict);
+            var url = GetApiUrl(new Uri("LiveTv/Programs", UriKind.Relative), dict);
 
             using (var stream = await GetSerializedStreamAsync(url, cancellationToken).ConfigureAwait(false))
             {
@@ -2034,14 +1967,14 @@ public async Task<SearchHintResult> GetSearchHintsAsync(SearchQuery query)
             }
         }
 
-        public async Task<QueryResult<BaseItemDto>> GetRecommendedLiveTvProgramsAsync(RecommendedProgramQuery query, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<QueryResult<BaseItemDto>> GetRecommendedLiveTvProgramsAsync(RecommendedProgramQuery query, CancellationToken cancellationToken = default)
         {
             if (query == null)
             {
                 throw new ArgumentNullException("query");
             }
 
-            var dict = new QueryStringDictionary { };
+            var dict = new NameValueCollection { };
 
             dict.AddIfNotNullOrEmpty("UserId", query.UserId);
             dict.AddIfNotNull("Limit", query.Limit);
@@ -2053,7 +1986,7 @@ public async Task<SearchHintResult> GetSearchHintsAsync(SearchQuery query)
                 dict.Add("EnableTotalRecordCount", query.EnableTotalRecordCount);
             }
 
-            var url = GetApiUrl("LiveTv/Programs/Recommended", dict);
+            var url = GetApiUrl(new Uri("LiveTv/Programs/Recommended", UriKind.Relative), dict);
 
             using (var stream = await GetSerializedStreamAsync(url, cancellationToken).ConfigureAwait(false))
             {
@@ -2061,42 +1994,42 @@ public async Task<SearchHintResult> GetSearchHintsAsync(SearchQuery query)
             }
         }
 
-        public Task CreateLiveTvSeriesTimerAsync(SeriesTimerInfoDto timer, CancellationToken cancellationToken = default(CancellationToken))
+        public Task CreateLiveTvSeriesTimerAsync(SeriesTimerInfoDto timer, CancellationToken cancellationToken = default)
         {
             if (timer == null)
             {
                 throw new ArgumentNullException("timer");
             }
 
-            var url = GetApiUrl("LiveTv/SeriesTimers");
+            var url = GetApiUrl(new Uri("LiveTv/SeriesTimers", UriKind.Relative));
 
             return PostAsync<SeriesTimerInfoDto, EmptyRequestResult>(url, timer, cancellationToken);
         }
 
-        public Task CreateLiveTvTimerAsync(BaseTimerInfoDto timer, CancellationToken cancellationToken = default(CancellationToken))
+        public Task CreateLiveTvTimerAsync(BaseTimerInfoDto timer, CancellationToken cancellationToken = default)
         {
             if (timer == null)
             {
                 throw new ArgumentNullException("timer");
             }
 
-            var url = GetApiUrl("LiveTv/Timers");
+            var url = GetApiUrl(new Uri("LiveTv/Timers", UriKind.Relative));
 
             return PostAsync<BaseTimerInfoDto, EmptyRequestResult>(url, timer, cancellationToken);
         }
 
-        public async Task<SeriesTimerInfoDto> GetDefaultLiveTvTimerInfo(string programId, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<SeriesTimerInfoDto> GetDefaultLiveTvTimerInfo(string programId, CancellationToken cancellationToken = default)
         {
             if (string.IsNullOrWhiteSpace(programId))
             {
                 throw new ArgumentNullException("programId");
             }
 
-            var dict = new QueryStringDictionary { };
+            var dict = new NameValueCollection { };
 
             dict.AddIfNotNullOrEmpty("programId", programId);
 
-            var url = GetApiUrl("LiveTv/Timers/Defaults", dict);
+            var url = GetApiUrl(new Uri("LiveTv/Timers/Defaults", UriKind.Relative), dict);
 
             using (var stream = await GetSerializedStreamAsync(url, cancellationToken).ConfigureAwait(false))
             {
@@ -2104,9 +2037,9 @@ public async Task<SearchHintResult> GetSearchHintsAsync(SearchQuery query)
             }
         }
 
-        public async Task<SeriesTimerInfoDto> GetDefaultLiveTvTimerInfo(CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<SeriesTimerInfoDto> GetDefaultLiveTvTimerInfo(CancellationToken cancellationToken = default)
         {
-            var url = GetApiUrl("LiveTv/Timers/Defaults");
+            var url = GetApiUrl(new Uri("LiveTv/Timers/Defaults", UriKind.Relative));
 
             using (var stream = await GetSerializedStreamAsync(url, cancellationToken).ConfigureAwait(false))
             {
@@ -2114,9 +2047,9 @@ public async Task<SearchHintResult> GetSearchHintsAsync(SearchQuery query)
             }
         }
 
-        public async Task<GuideInfo> GetLiveTvGuideInfo(CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<GuideInfo> GetLiveTvGuideInfo(CancellationToken cancellationToken = default)
         {
-            var url = GetApiUrl("LiveTv/GuideInfo");
+            var url = GetApiUrl(new Uri("LiveTv/GuideInfo", UriKind.Relative));
 
             using (var stream = await GetSerializedStreamAsync(url, cancellationToken).ConfigureAwait(false))
             {
@@ -2124,17 +2057,17 @@ public async Task<SearchHintResult> GetSearchHintsAsync(SearchQuery query)
             }
         }
 
-        public async Task<BaseItemDto> GetLiveTvProgramAsync(string id, string userId, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<BaseItemDto> GetLiveTvProgramAsync(string id, string userId, CancellationToken cancellationToken = default)
         {
             if (string.IsNullOrEmpty(id))
             {
                 throw new ArgumentNullException("id");
             }
 
-            var dict = new QueryStringDictionary { };
+            var dict = new NameValueCollection { };
             dict.AddIfNotNullOrEmpty("userId", userId);
 
-            var url = GetApiUrl("LiveTv/Programs/" + id, dict);
+            var url = GetApiUrl(new Uri("LiveTv/Programs/" + id, UriKind.Relative), dict);
 
             using (var stream = await GetSerializedStreamAsync(url, cancellationToken).ConfigureAwait(false))
             {
@@ -2142,26 +2075,26 @@ public async Task<SearchHintResult> GetSearchHintsAsync(SearchQuery query)
             }
         }
 
-        public Task UpdateLiveTvSeriesTimerAsync(SeriesTimerInfoDto timer, CancellationToken cancellationToken = default(CancellationToken))
+        public Task UpdateLiveTvSeriesTimerAsync(SeriesTimerInfoDto timer, CancellationToken cancellationToken = default)
         {
             if (timer == null)
             {
                 throw new ArgumentNullException("timer");
             }
 
-            var url = GetApiUrl("LiveTv/SeriesTimers/" + timer.Id);
+            var url = GetApiUrl(new Uri("LiveTv/SeriesTimers/" + timer.Id, UriKind.Relative));
 
             return PostAsync<SeriesTimerInfoDto, EmptyRequestResult>(url, timer, cancellationToken);
         }
 
-        public Task UpdateLiveTvTimerAsync(TimerInfoDto timer, CancellationToken cancellationToken = default(CancellationToken))
+        public Task UpdateLiveTvTimerAsync(TimerInfoDto timer, CancellationToken cancellationToken = default)
         {
             if (timer == null)
             {
                 throw new ArgumentNullException("timer");
             }
 
-            var url = GetApiUrl("LiveTv/Timers/" + timer.Id);
+            var url = GetApiUrl(new Uri("LiveTv/Timers/" + timer.Id, UriKind.Relative));
 
             return PostAsync<TimerInfoDto, EmptyRequestResult>(url, timer, cancellationToken);
         }
@@ -2216,11 +2149,11 @@ public Task SetVolume(string sessionId, int volume)
 
         public async Task<QueryResult<BaseItemDto>> GetAdditionalParts(string itemId, string userId)
         {
-            var queryString = new QueryStringDictionary();
+            var queryString = new NameValueCollection();
 
             queryString.AddIfNotNullOrEmpty("UserId", userId);
 
-            var url = GetApiUrl("Videos/" + itemId + "/AdditionalParts", queryString);
+            var url = GetApiUrl(new Uri("Videos/" + itemId + "/AdditionalParts", UriKind.Relative), queryString);
 
             using (var stream = await GetSerializedStreamAsync(url, CancellationToken.None).ConfigureAwait(false))
             {
@@ -2228,9 +2161,9 @@ public async Task<QueryResult<BaseItemDto>> GetAdditionalParts(string itemId, st
             }
         }
 
-        public async Task<ChannelFeatures> GetChannelFeatures(string channelId, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<ChannelFeatures> GetChannelFeatures(string channelId, CancellationToken cancellationToken = default)
         {
-            var url = GetApiUrl("Channels/" + channelId + "/Features");
+            var url = GetApiUrl(new Uri("Channels/" + channelId + "/Features", UriKind.Relative));
 
             using (var stream = await GetSerializedStreamAsync(url, cancellationToken).ConfigureAwait(false))
             {
@@ -2238,9 +2171,9 @@ public async Task<QueryResult<BaseItemDto>> GetAdditionalParts(string itemId, st
             }
         }
 
-        public async Task<QueryResult<BaseItemDto>> GetChannelItems(ChannelItemQuery query, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<QueryResult<BaseItemDto>> GetChannelItems(ChannelItemQuery query, CancellationToken cancellationToken = default)
         {
-            var queryString = new QueryStringDictionary();
+            var queryString = new NameValueCollection();
 
             queryString.AddIfNotNullOrEmpty("UserId", query.UserId);
             queryString.AddIfNotNull("StartIndex", query.StartIndex);
@@ -2266,7 +2199,7 @@ public async Task<QueryResult<BaseItemDto>> GetAdditionalParts(string itemId, st
             queryString.AddIfNotNull("SortBy", sortBy);
             queryString.AddIfNotNull("SortOrder", sortOrder);
 
-            var url = GetApiUrl("Channels/" + query.ChannelId + "/Items", queryString);
+            var url = GetApiUrl(new Uri("Channels/" + query.ChannelId + "/Items", UriKind.Relative), queryString);
 
             using (var stream = await GetSerializedStreamAsync(url, cancellationToken).ConfigureAwait(false))
             {
@@ -2274,17 +2207,17 @@ public async Task<QueryResult<BaseItemDto>> GetAdditionalParts(string itemId, st
             }
         }
 
-        public async Task<QueryResult<BaseItemDto>> GetChannels(ChannelQuery query, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<QueryResult<BaseItemDto>> GetChannels(ChannelQuery query, CancellationToken cancellationToken = default)
         {
-            var queryString = new QueryStringDictionary();
+            var queryString = new NameValueCollection();
 
-            queryString.AddIfNotNullOrEmpty("UserId", query.UserId);
+            queryString.AddIfNotNullOrEmpty("UserId", query.UserId.ToString("N", CultureInfo.InvariantCulture));
             queryString.AddIfNotNull("SupportsLatestItems", query.SupportsLatestItems);
             queryString.AddIfNotNull("StartIndex", query.StartIndex);
             queryString.AddIfNotNull("Limit", query.Limit);
             queryString.AddIfNotNull("IsFavorite", query.IsFavorite);
 
-            var url = GetApiUrl("Channels", queryString);
+            var url = GetApiUrl(new Uri("Channels", UriKind.Relative), queryString);
 
             using (var stream = await GetSerializedStreamAsync(url, cancellationToken).ConfigureAwait(false))
             {
@@ -2292,12 +2225,14 @@ public async Task<QueryResult<BaseItemDto>> GetAdditionalParts(string itemId, st
             }
         }
 
-        public async Task<SessionInfoDto> GetCurrentSessionAsync(CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<SessionInfoDto> GetCurrentSessionAsync(CancellationToken cancellationToken = default)
         {
-            var queryString = new QueryStringDictionary();
+            var queryString = new NameValueCollection
+            {
+                { "DeviceId", DeviceId }
+            };
 
-            queryString.Add("DeviceId", DeviceId);
-            var url = GetApiUrl("Sessions", queryString);
+            var url = GetApiUrl(new Uri("Sessions", UriKind.Relative), queryString);
 
             using (var stream = await GetSerializedStreamAsync(url, cancellationToken).ConfigureAwait(false))
             {
@@ -2309,11 +2244,13 @@ public async Task<QueryResult<BaseItemDto>> GetAdditionalParts(string itemId, st
 
         public Task StopTranscodingProcesses(string deviceId, string playSessionId)
         {
-            var queryString = new QueryStringDictionary();
+            var queryString = new NameValueCollection
+            {
+                { "DeviceId", DeviceId }
+            };
 
-            queryString.Add("DeviceId", DeviceId);
             queryString.AddIfNotNullOrEmpty("PlaySessionId", playSessionId);
-            var url = GetApiUrl("Videos/ActiveEncodings", queryString);
+            Uri url = GetApiUrl(new Uri("Videos/ActiveEncodings", UriKind.Relative), queryString);
 
             return SendAsync(new HttpRequest
             {
@@ -2323,7 +2260,7 @@ public Task StopTranscodingProcesses(string deviceId, string playSessionId)
             });
         }
 
-        public async Task<QueryResult<BaseItemDto>> GetLatestChannelItems(AllChannelMediaQuery query, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<QueryResult<BaseItemDto>> GetLatestChannelItems(AllChannelMediaQuery query, CancellationToken cancellationToken = default)
         {
             if (query == null)
             {
@@ -2335,10 +2272,14 @@ public Task StopTranscodingProcesses(string deviceId, string playSessionId)
                 throw new ArgumentNullException("userId");
             }
 
-            var queryString = new QueryStringDictionary();
-            queryString.Add("UserId", query.UserId);
+            var queryString = new NameValueCollection
+            {
+                { "UserId", query.UserId }
+            };
+
             queryString.AddIfNotNull("StartIndex", query.StartIndex);
             queryString.AddIfNotNull("Limit", query.Limit);
+
             if (query.Filters != null)
             {
                 queryString.Add("Filters", query.Filters.Select(f => f.ToString()));
@@ -2350,7 +2291,7 @@ public Task StopTranscodingProcesses(string deviceId, string playSessionId)
 
             queryString.AddIfNotNull("ChannelIds", query.ChannelIds);
 
-            var url = GetApiUrl("Channels/Items/Latest");
+            var url = GetApiUrl(new Uri("Channels/Items/Latest", UriKind.Relative));
 
             using (var stream = await GetSerializedStreamAsync(url, CancellationToken.None).ConfigureAwait(false))
             {
@@ -2362,44 +2303,32 @@ public async Task Logout()
         {
             try
             {
-                var url = GetApiUrl("Sessions/Logout");
+                var url = GetApiUrl(new Uri("Sessions/Logout", UriKind.Relative));
 
-                await PostAsync<EmptyRequestResult>(url, new Dictionary<string, string>(), CancellationToken.None);
+                await PostAsync<EmptyRequestResult>(url, new NameValueCollection(), CancellationToken.None);
             }
             catch (Exception ex)
             {
-                Logger.ErrorException("Error logging out", ex);
+                Logger.LogError("Error logging out", ex);
             }
 
             ClearAuthenticationInfo();
         }
 
-        public async Task<QueryResult<BaseItemDto>> GetUserViews(string userId, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<QueryResult<BaseItemDto>> GetUserViews(string userId, CancellationToken cancellationToken = default)
         {
             if (string.IsNullOrEmpty(userId))
             {
                 throw new ArgumentNullException("userId");
             }
 
-            var url = GetApiUrl("Users/" + userId + "/Views");
+            var url = GetApiUrl(new Uri("Users/" + userId + "/Views", UriKind.Relative));
 
             using (var stream = await GetSerializedStreamAsync(url, cancellationToken).ConfigureAwait(false))
             {
                 var result = DeserializeFromStream<QueryResult<BaseItemDto>>(stream);
 
                 var serverInfo = ServerInfo;
-                if (serverInfo != null && _localAssetManager != null)
-                {
-                    var offlineView = await GetOfflineView(serverInfo.Id, userId).ConfigureAwait(false);
-
-                    if (offlineView != null)
-                    {
-                        var list = result.Items.ToList();
-                        list.Add(offlineView);
-                        result.Items = list.ToArray();
-                        result.TotalRecordCount = list.Count;
-                    }
-                }
 
                 return result;
             }
@@ -2412,15 +2341,15 @@ public async Task<BaseItemDto[]> GetLatestItems(LatestItemsQuery query)
                 throw new ArgumentNullException("query");
             }
 
-            if (string.IsNullOrEmpty(query.UserId))
+            if (string.IsNullOrEmpty(query.UserId.ToString("N", CultureInfo.InvariantCulture)))
             {
                 throw new ArgumentNullException("userId");
             }
 
-            var queryString = new QueryStringDictionary();
+            var queryString = new NameValueCollection();
             queryString.AddIfNotNull("GroupItems", query.GroupItems);
             queryString.AddIfNotNull("IncludeItemTypes", query.IncludeItemTypes);
-            queryString.AddIfNotNullOrEmpty("ParentId", query.ParentId);
+            queryString.AddIfNotNullOrEmpty("ParentId", query.ParentId.ToString("N", CultureInfo.InvariantCulture));
             queryString.AddIfNotNull("IsPlayed", query.IsPlayed);
             queryString.AddIfNotNull("StartIndex", query.StartIndex);
             queryString.AddIfNotNull("Limit", query.Limit);
@@ -2430,7 +2359,7 @@ public async Task<BaseItemDto[]> GetLatestItems(LatestItemsQuery query)
                 queryString.Add("fields", query.Fields.Select(f => f.ToString()));
             }
 
-            var url = GetApiUrl("Users/" + query.UserId + "/Items/Latest", queryString);
+            var url = GetApiUrl(new Uri("Users/" + query.UserId + "/Items/Latest", UriKind.Relative), queryString);
 
             using (var stream = await GetSerializedStreamAsync(url, CancellationToken.None).ConfigureAwait(false))
             {
@@ -2438,24 +2367,6 @@ public async Task<BaseItemDto[]> GetLatestItems(LatestItemsQuery query)
             }
         }
 
-        private async Task<BaseItemDto> GetOfflineView(string serverId, string userId)
-        {
-            var views = await _localAssetManager.GetViews(serverId, userId).ConfigureAwait(false);
-
-            if (views.Count > 0)
-            {
-                return new BaseItemDto
-                {
-                    Name = "AnyTime",
-                    ServerId = serverId,
-                    Id = "OfflineView",
-                    Type = "OfflineView"
-                };
-            }
-
-            return null;
-        }
-
         public Task AddToPlaylist(string playlistId, IEnumerable<string> itemIds, string userId)
         {
             if (playlistId == null)
@@ -2468,16 +2379,16 @@ public Task AddToPlaylist(string playlistId, IEnumerable<string> itemIds, string
                 throw new ArgumentNullException("itemIds");
             }
 
-            var dict = new QueryStringDictionary { };
+            var dict = new NameValueCollection { };
 
             dict.AddIfNotNull("Ids", itemIds);
-            var url = GetApiUrl(string.Format("Playlists/{0}/Items", playlistId), dict);
-            return PostAsync<EmptyRequestResult>(url, new Dictionary<string, string>(), CancellationToken.None);
+            var url = GetApiUrl(new Uri(string.Format("Playlists/{0}/Items", playlistId), UriKind.Relative), dict);
+            return PostAsync<EmptyRequestResult>(url, new NameValueCollection(), CancellationToken.None);
         }
 
         public async Task<PlaylistCreationResult> CreatePlaylist(PlaylistCreationRequest request)
         {
-            if (string.IsNullOrEmpty(request.UserId))
+            if (string.IsNullOrEmpty(request.UserId.ToString("N", CultureInfo.InvariantCulture)))
             {
                 throw new ArgumentNullException("userId");
             }
@@ -2487,20 +2398,21 @@ public async Task<PlaylistCreationResult> CreatePlaylist(PlaylistCreationRequest
                 throw new ArgumentNullException("must provide either MediaType or Ids");
             }
 
-            var queryString = new QueryStringDictionary();
-
-            queryString.Add("UserId", request.UserId);
-            queryString.Add("Name", request.Name);
+            var queryString = new NameValueCollection
+            {
+                { "UserId", request.UserId.ToString("N", CultureInfo.InvariantCulture) },
+                { "Name", request.Name }
+            };
 
             if (!string.IsNullOrEmpty(request.MediaType))
                 queryString.Add("MediaType", request.MediaType);
 
             if (request.ItemIdList != null && request.ItemIdList.Any())
-                queryString.Add("Ids", request.ItemIdList);
+                queryString.Add("Ids", request.ItemIdList.Select(o => o.ToString("N", CultureInfo.InvariantCulture)).ToList());
 
-            var url = GetApiUrl("Playlists/", queryString);
+            var url = GetApiUrl(new Uri("Playlists/", UriKind.Relative), queryString);
 
-            return await PostAsync<PlaylistCreationResult>(url, new Dictionary<string, string>(), CancellationToken.None);
+            return await PostAsync<PlaylistCreationResult>(url, new NameValueCollection(), CancellationToken.None);
 
         }
 
@@ -2511,7 +2423,7 @@ public async Task<QueryResult<BaseItemDto>> GetPlaylistItems(PlaylistItemQuery q
                 throw new ArgumentNullException("query");
             }
 
-            var dict = new QueryStringDictionary { };
+            var dict = new NameValueCollection { };
 
             dict.AddIfNotNull("StartIndex", query.StartIndex);
 
@@ -2523,7 +2435,7 @@ public async Task<QueryResult<BaseItemDto>> GetPlaylistItems(PlaylistItemQuery q
                 dict.Add("fields", query.Fields.Select(f => f.ToString()));
             }
 
-            var url = GetApiUrl("Playlists/" + query.Id + "/Items", dict);
+            var url = GetApiUrl(new Uri("Playlists/" + query.Id + "/Items", UriKind.Relative), dict);
 
             using (var stream = await GetSerializedStreamAsync(url).ConfigureAwait(false))
             {
@@ -2543,20 +2455,20 @@ public Task RemoveFromPlaylist(string playlistId, IEnumerable<string> entryIds)
                 throw new ArgumentNullException("entryIds");
             }
 
-            var dict = new QueryStringDictionary { };
+            var dict = new NameValueCollection { };
 
             dict.AddIfNotNull("EntryIds", entryIds);
-            var url = GetApiUrl(string.Format("Playlists/{0}/Items", playlistId), dict);
+            var url = GetApiUrl(new Uri(string.Format("Playlists/{0}/Items", playlistId), UriKind.Relative), dict);
             return DeleteAsync<EmptyRequestResult>(url, CancellationToken.None);
         }
 
         public async Task<ContentUploadHistory> GetContentUploadHistory(string deviceId)
         {
-            var dict = new QueryStringDictionary { };
+            var dict = new NameValueCollection { };
 
             dict.Add("DeviceId", deviceId);
 
-            var url = GetApiUrl("Devices/CameraUploads", dict);
+            var url = GetApiUrl(new Uri("Devices/CameraUploads", UriKind.Relative), dict);
 
             using (var stream = await GetSerializedStreamAsync(url).ConfigureAwait(false))
             {
@@ -2564,16 +2476,16 @@ public async Task<ContentUploadHistory> GetContentUploadHistory(string deviceId)
             }
         }
 
-        public async Task UploadFile(Stream stream, LocalFileInfo file, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task UploadFile(Stream stream, LocalFileInfo file, CancellationToken cancellationToken = default)
         {
-            var dict = new QueryStringDictionary { };
+            var dict = new NameValueCollection { };
 
             dict.Add("DeviceId", DeviceId);
             dict.Add("Name", file.Name);
             dict.Add("Id", file.Id);
             dict.AddIfNotNullOrEmpty("Album", file.Album);
 
-            var url = GetApiUrl("Devices/CameraUploads", dict);
+            var url = GetApiUrl(new Uri("Devices/CameraUploads", UriKind.Relative), dict);
 
             using (stream)
             {
@@ -2592,9 +2504,9 @@ await SendAsync(new HttpRequest
 
         public async Task<DevicesOptions> GetDevicesOptions()
         {
-            var dict = new QueryStringDictionary { };
+            var dict = new NameValueCollection { };
 
-            var url = GetApiUrl("System/Configuration/devices", dict);
+            var url = GetApiUrl(new Uri("System/Configuration/devices", UriKind.Relative), dict);
 
             using (var stream = await GetSerializedStreamAsync(url).ConfigureAwait(false))
             {
@@ -2604,11 +2516,11 @@ public async Task<DevicesOptions> GetDevicesOptions()
 
         public async Task<PlaybackInfoResponse> GetPlaybackInfo(PlaybackInfoRequest request)
         {
-            var dict = new QueryStringDictionary { };
+            var dict = new NameValueCollection { };
 
-            dict.AddIfNotNullOrEmpty("UserId", request.UserId);
+            dict.AddIfNotNullOrEmpty("UserId", request.UserId.ToString("N", CultureInfo.InvariantCulture));
 
-            var url = GetApiUrl("Items/" + request.Id + "/PlaybackInfo", dict);
+            var url = GetApiUrl(new Uri("Items/" + request.Id + "/PlaybackInfo", UriKind.Relative), dict);
 
             using (var stream = await GetSerializedStreamAsync(url).ConfigureAwait(false))
             {
@@ -2626,107 +2538,6 @@ public Task UpdateItem(BaseItemDto item)
             throw new NotImplementedException();
         }
 
-        public Task<SyncJob> CreateSyncJob(SyncJobRequest request)
-        {
-            if (request == null)
-            {
-                throw new ArgumentNullException("request");
-            }
-
-            var url = GetApiUrl("Sync/Jobs");
-
-            return PostAsync<SyncJobRequest, SyncJob>(url, request, CancellationToken.None);
-        }
-
-        public Task UpdateSyncJob(SyncJob job)
-        {
-            if (job == null)
-            {
-                throw new ArgumentNullException("job");
-            }
-
-            var url = GetApiUrl("Sync/Jobs/" + job.Id);
-
-            return PostAsync<SyncJob, EmptyRequestResult>(url, job, CancellationToken.None);
-        }
-
-        public async Task<QueryResult<SyncJobItem>> GetSyncJobItems(SyncJobItemQuery query)
-        {
-            var dict = new QueryStringDictionary { };
-
-            dict.AddIfNotNullOrEmpty("JobId", query.JobId);
-            dict.AddIfNotNull("Limit", query.Limit);
-            dict.AddIfNotNull("StartIndex", query.StartIndex);
-            dict.AddIfNotNullOrEmpty("TargetId", query.TargetId);
-            dict.AddIfNotNull("AddMetadata", query.AddMetadata);
-
-            if (query.Statuses.Length > 0)
-            {
-                dict.Add("Statuses", string.Join(",", query.Statuses.Select(i => i.ToString()).ToArray()));
-            }
-
-            var url = GetApiUrl("Sync/JobItems", dict);
-
-            using (var stream = await GetSerializedStreamAsync(url).ConfigureAwait(false))
-            {
-                return DeserializeFromStream<QueryResult<SyncJobItem>>(stream);
-            }
-        }
-
-        public async Task<QueryResult<SyncJob>> GetSyncJobs(SyncJobQuery query)
-        {
-            var dict = new QueryStringDictionary { };
-
-            dict.AddIfNotNull("Limit", query.Limit);
-            dict.AddIfNotNull("StartIndex", query.StartIndex);
-            dict.AddIfNotNull("SyncNewContent", query.SyncNewContent);
-            dict.AddIfNotNullOrEmpty("TargetId", query.TargetId);
-
-            if (query.Statuses.Length > 0)
-            {
-                dict.Add("Statuses", string.Join(",", query.Statuses.Select(i => i.ToString()).ToArray()));
-            }
-
-            var url = GetApiUrl("Sync/Jobs", dict);
-
-            using (var stream = await GetSerializedStreamAsync(url).ConfigureAwait(false))
-            {
-                return DeserializeFromStream<QueryResult<SyncJob>>(stream);
-            }
-        }
-
-        public Task ReportSyncJobItemTransferred(string id)
-        {
-            if (string.IsNullOrEmpty(id))
-            {
-                throw new ArgumentNullException("id");
-            }
-
-            var url = GetApiUrl("Sync/JobItems/" + id + "/Transferred");
-
-            return PostAsync<EmptyRequestResult>(url, new Dictionary<string, string>());
-        }
-
-        public Task<Stream> GetSyncJobItemFile(string id, CancellationToken cancellationToken = default(CancellationToken))
-        {
-            if (string.IsNullOrEmpty(id))
-            {
-                throw new ArgumentNullException("id");
-            }
-
-            return GetStream(GetSyncJobItemFileUrl(id), cancellationToken);
-        }
-
-        public string GetSyncJobItemFileUrl(string id)
-        {
-            if (string.IsNullOrEmpty(id))
-            {
-                throw new ArgumentNullException("id");
-            }
-
-            return GetApiUrl("Sync/JobItems/" + id + "/File");
-        }
-
         public Task UpdateUserConfiguration(string userId, UserConfiguration configuration)
         {
             if (configuration == null)
@@ -2734,107 +2545,11 @@ public Task UpdateUserConfiguration(string userId, UserConfiguration configurati
                 throw new ArgumentNullException("configuration");
             }
 
-            var url = GetApiUrl("Users/" + userId + "/Configuration");
+            var url = GetApiUrl(new Uri("Users/" + userId + "/Configuration", UriKind.Relative));
 
             return PostAsync<UserConfiguration, EmptyRequestResult>(url, configuration, CancellationToken.None);
         }
 
-        public Task ReportOfflineActions(List<UserAction> actions)
-        {
-            if (actions == null || actions.Count == 0)
-            {
-                throw new ArgumentNullException("actions");
-            }
-
-            var url = GetApiUrl("Sync/OfflineActions");
-
-            return PostAsync<List<UserAction>, EmptyRequestResult>(url, actions, CancellationToken.None);
-        }
-
-        public async Task<List<SyncedItem>> GetReadySyncItems(string targetId)
-        {
-            var dict = new QueryStringDictionary { };
-
-            dict.AddIfNotNullOrEmpty("TargetId", targetId);
-
-            var url = GetApiUrl("Sync/Items/Ready", dict);
-
-            using (var stream = await GetSerializedStreamAsync(url).ConfigureAwait(false))
-            {
-                return DeserializeFromStream<List<SyncedItem>>(stream);
-            }
-        }
-
-        public Task<SyncDataResponse> SyncData(SyncDataRequest request)
-        {
-            var url = GetApiUrl("Sync/Data");
-
-            return PostAsync<SyncDataRequest, SyncDataResponse>(url, request, CancellationToken.None);
-        }
-
-        public Task<Stream> GetSyncJobItemAdditionalFile(string id, string name, CancellationToken cancellationToken = default(CancellationToken))
-        {
-            var dict = new QueryStringDictionary { };
-
-            dict.AddIfNotNullOrEmpty("Name", name);
-
-            var url = GetApiUrl("Sync/JobItems/" + id + "/AdditionalFiles", dict);
-
-            return GetStream(url, cancellationToken);
-        }
-
-        public Task CancelSyncJob(string id)
-        {
-            if (string.IsNullOrWhiteSpace(id))
-            {
-                throw new ArgumentNullException("id");
-            }
-
-            var url = GetApiUrl("Sync/Jobs/" + id);
-
-            return DeleteAsync<EmptyRequestResult>(url, CancellationToken.None);
-        }
-
-        public Task CancelSyncJobItem(string id)
-        {
-            if (string.IsNullOrWhiteSpace(id))
-            {
-                throw new ArgumentNullException("id");
-            }
-
-            var url = GetApiUrl("Sync/JobItems/" + id);
-
-            return DeleteAsync<EmptyRequestResult>(url, CancellationToken.None);
-        }
-
-        public Task EnableCancelledSyncJobItem(string id)
-        {
-            var url = GetApiUrl("Sync/JobItems/" + id + "/Enable");
-
-            return PostAsync<EmptyRequestResult>(url, new QueryStringDictionary(), CancellationToken.None);
-        }
-
-        public Task MarkSyncJobItemForRemoval(string id)
-        {
-            var url = GetApiUrl("Sync/JobItems/" + id + "/MarkForRemoval");
-
-            return PostAsync<EmptyRequestResult>(url, new QueryStringDictionary(), CancellationToken.None);
-        }
-
-        public Task QueueFailedSyncJobItemForRetry(string id)
-        {
-            var url = GetApiUrl("Sync/JobItems/" + id + "/Enable");
-
-            return PostAsync<EmptyRequestResult>(url, new QueryStringDictionary(), CancellationToken.None);
-        }
-
-        public Task UnmarkSyncJobItemForRemoval(string id)
-        {
-            var url = GetApiUrl("Sync/JobItems/" + id + "/UnmarkForRemoval");
-
-            return PostAsync<EmptyRequestResult>(url, new QueryStringDictionary(), CancellationToken.None);
-        }
-
         public async Task<UserDto> GetOfflineUserAsync(string id)
         {
             if (string.IsNullOrEmpty(id))
@@ -2842,7 +2557,7 @@ public async Task<UserDto> GetOfflineUserAsync(string id)
                 throw new ArgumentNullException("id");
             }
 
-            var url = GetApiUrl("Users/" + id + "/Offline");
+            var url = GetApiUrl(new Uri("Users/" + id + "/Offline", UriKind.Relative));
 
             using (var stream = await GetSerializedStreamAsync(url).ConfigureAwait(false))
             {
@@ -2850,69 +2565,9 @@ public async Task<UserDto> GetOfflineUserAsync(string id)
             }
         }
 
-        public async Task<SyncDialogOptions> GetSyncOptions(SyncJobRequest jobInfo)
-        {
-            var dict = new QueryStringDictionary();
-
-            dict.AddIfNotNullOrEmpty("UserId", jobInfo.UserId);
-            dict.AddIfNotNullOrEmpty("ParentId", jobInfo.ParentId);
-            dict.AddIfNotNullOrEmpty("TargetId", jobInfo.TargetId);
-
-            if (jobInfo.Category.HasValue)
-            {
-                dict.AddIfNotNullOrEmpty("Category", jobInfo.Category.Value.ToString());
-            }
-
-            if (jobInfo.ItemIds != null)
-            {
-                var list = jobInfo.ItemIds.ToList();
-                if (list.Count > 0)
-                {
-                    dict.Add("ItemIds", list);
-                }
-            }
-            
-            var url = GetApiUrl("Sync/Options", dict);
-
-            using (var stream = await GetSerializedStreamAsync(url).ConfigureAwait(false))
-            {
-                return DeserializeFromStream<SyncDialogOptions>(stream);
-            }
-        }
-
-        public async Task<SyncDialogOptions> GetSyncOptions(SyncJob jobInfo)
-        {
-            var dict = new QueryStringDictionary();
-
-            dict.AddIfNotNullOrEmpty("UserId", jobInfo.UserId);
-            dict.AddIfNotNullOrEmpty("ParentId", jobInfo.ParentId);
-            dict.AddIfNotNullOrEmpty("TargetId", jobInfo.TargetId);
-
-            if (jobInfo.Category.HasValue)
-            {
-                dict.AddIfNotNullOrEmpty("Category", jobInfo.Category.Value.ToString());
-            }
-
-            if (jobInfo.RequestedItemIds != null)
-            {
-                var list = jobInfo.RequestedItemIds.ToList();
-                if (list.Count > 0)
-                {
-                    dict.Add("ItemIds", list);
-                }
-            }
-
-            var url = GetApiUrl("Sync/Options", dict);
-
-            using (var stream = await GetSerializedStreamAsync(url).ConfigureAwait(false))
-            {
-                return DeserializeFromStream<SyncDialogOptions>(stream);
-            }
-        }
-
         public async Task<List<RecommendationDto>> GetMovieRecommendations(MovieRecommendationQuery query)
         {
-            var dict = new QueryStringDictionary();
+            var dict = new NameValueCollection();
 
             dict.AddIfNotNullOrEmpty("UserId", query.UserId);
             dict.AddIfNotNullOrEmpty("ParentId", query.ParentId);
@@ -2924,7 +2579,7 @@ public async Task<List<RecommendationDto>> GetMovieRecommendations(MovieRecommen
                 dict.Add("fields", query.Fields.Select(f => f.ToString()));
             }
 
-            var url = GetApiUrl("Movies/Recommendations", dict);
+            var url = GetApiUrl(new Uri("Movies/Recommendations", UriKind.Relative), dict);
 
             using (var stream = await GetSerializedStreamAsync(url).ConfigureAwait(false))
             {
@@ -2934,22 +2589,11 @@ public async Task<List<RecommendationDto>> GetMovieRecommendations(MovieRecommen
 
         public Task<LiveStreamResponse> OpenLiveStream(LiveStreamRequest request, CancellationToken cancellationToken)
         {
-            var url = GetApiUrl("LiveStreams/Open");
+            var url = GetApiUrl(new Uri("LiveStreams/Open", UriKind.Relative));
 
             return PostAsync<LiveStreamRequest, LiveStreamResponse>(url, request, cancellationToken);
         }
 
-        public Task CancelSyncLibraryItems(string targetId, IEnumerable<string> itemIds)
-        {
-            var dict = new QueryStringDictionary();
-
-            dict.Add("ItemIds", itemIds);
-
-            var url = GetApiUrl("Sync/" + targetId + "/Items", dict);
-
-            return DeleteAsync<EmptyRequestResult>(url, CancellationToken.None);
-        }
-
         public Task<int> DetectMaxBitrate(CancellationToken cancellationToken)
         {
             throw new NotImplementedException();
@@ -2957,7 +2601,7 @@ public Task<int> DetectMaxBitrate(CancellationToken cancellationToken)
 
         public async Task<EndPointInfo> GetEndPointInfo(CancellationToken cancellationToken)
         {
-            var url = GetApiUrl("System/Endpoint");
+            var url = GetApiUrl(new Uri("System/Endpoint", UriKind.Relative));
 
             using (var stream = await GetSerializedStreamAsync(url, cancellationToken).ConfigureAwait(false))
             {
@@ -2980,7 +2624,7 @@ public async Task<QueryResult<BaseItemDto>> GetInstantMixFromItemAsync(SimilarIt
             }
         }
 
-        public async Task<QueryResult<BaseItemDto>> GetSimilarItemsAsync(SimilarItemsQuery query, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<QueryResult<BaseItemDto>> GetSimilarItemsAsync(SimilarItemsQuery query, CancellationToken cancellationToken = default)
         {
             if (query == null)
             {
diff --git a/Emby.ApiClient/ApiWebSocket.cs b/Jellyfin.ApiClient/ApiWebSocket.cs
similarity index 83%
rename from Emby.ApiClient/ApiWebSocket.cs
rename to Jellyfin.ApiClient/ApiWebSocket.cs
index 6fe1ec2..4556b66 100644
--- a/Emby.ApiClient/ApiWebSocket.cs
+++ b/Jellyfin.ApiClient/ApiWebSocket.cs
@@ -1,15 +1,16 @@
-using MediaBrowser.Model.ApiClient;
+using Jellyfin.ApiClient.Model;
+using Jellyfin.ApiClient.Net;
+using Jellyfin.ApiClient.WebSocket;
 using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.Events;
 using MediaBrowser.Model.Net;
 using MediaBrowser.Model.Plugins;
-using MediaBrowser.Model.Querying;
 using MediaBrowser.Model.Serialization;
 using MediaBrowser.Model.Session;
-using MediaBrowser.Model.Sync;
 using MediaBrowser.Model.Tasks;
 using MediaBrowser.Model.Updates;
+using Microsoft.Extensions.Logging;
 using System;
 using System.Collections.Generic;
 using System.Globalization;
@@ -17,10 +18,8 @@
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
-using Emby.ApiClient.Model;
-using Newtonsoft.Json;
 
-namespace Emby.ApiClient
+namespace Jellyfin.ApiClient
 {
     public partial class ApiClient : IServerEvents, IDisposable
     {
@@ -58,10 +57,6 @@ public partial class ApiClient : IServerEvents, IDisposable
         public event EventHandler<GenericEventArgs<SessionInfoDto>> PlaybackStart;
         public event EventHandler<GenericEventArgs<SessionInfoDto>> PlaybackStopped;
         public event EventHandler<GenericEventArgs<SessionInfoDto>> SessionEnded;
-        public event EventHandler<GenericEventArgs<SyncJobCreationResult>> SyncJobCreated;
-        public event EventHandler<GenericEventArgs<SyncJob>> SyncJobCancelled;
-        public event EventHandler<GenericEventArgs<List<SyncJob>>> SyncJobsUpdated;
-        public event EventHandler<GenericEventArgs<CompleteSyncJobInfo>> SyncJobUpdated;
 
         /// <summary>
         /// The _web socket
@@ -108,17 +103,17 @@ private async Task EnsureConnectionAsync(CancellationToken cancellationToken)
                 {
                     var socket = _webSocketFactory();
 
-                    Logger.Info("Created new web socket of type {0}", socket.GetType().Name);
+                    Logger.LogInformation("Created new web socket of type {0}", socket.GetType().Name);
 
-                    Logger.Info("Connecting to {0}", url);
+                    Logger.LogInformation("Connecting to {0}", url);
 
                     await socket.ConnectAsync(url, cancellationToken).ConfigureAwait(false);
 
-                    Logger.Info("Connected to {0}", url);
+                    Logger.LogInformation("Connected to {0}", url);
 
                     socket.OnReceiveBytes = OnMessageReceived;
                     socket.OnReceive = OnMessageReceived;
-                    socket.Closed += _currentWebSocket_Closed;
+                    socket.Closed += OnCurrentWebSocketClosed;
 
                     //try
                     //{
@@ -135,7 +130,7 @@ private async Task EnsureConnectionAsync(CancellationToken cancellationToken)
                 }
                 catch (Exception ex)
                 {
-                    Logger.ErrorException("Error connecting to {0}", ex, url);
+                    Logger.LogError("Error connecting to {0}", ex, url);
                 }
             }
         }
@@ -161,14 +156,11 @@ private void ReplaceSocket(IClientWebSocket socket)
         /// </summary>
         /// <param name="sender">The source of the event.</param>
         /// <param name="e">The <see cref="EventArgs" /> instance containing the event data.</param>
-        void _currentWebSocket_Closed(object sender, EventArgs e)
+        void OnCurrentWebSocketClosed(object sender, EventArgs e)
         {
-            Logger.Warn("Web socket connection closed.");
+            Logger.LogWarning("Web socket connection closed.");
 
-            if (WebSocketClosed != null)
-            {
-                WebSocketClosed(this, EventArgs.Empty);
-            }
+            WebSocketClosed?.Invoke(this, EventArgs.Empty);
         }
 
         /// <summary>
@@ -201,7 +193,7 @@ public async Task SendWebSocketMessage<T>(string messageName, T data, Cancellati
             }
             catch (Exception ex)
             {
-                Logger.ErrorException("Error sending web socket message", ex);
+                Logger.LogError("Error sending web socket message", ex);
 
                 throw;
             }
@@ -216,7 +208,7 @@ public async Task SendWebSocketMessage<T>(string messageName, T data, Cancellati
         /// <param name="context">An optional, client-specific value indicating the area or section being browsed</param>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>Task.</returns>
-        public Task SendContextMessageAsync(string itemType, string itemId, string itemName, string context, CancellationToken cancellationToken = default(CancellationToken))
+        public Task SendContextMessageAsync(string itemType, string itemId, string itemName, string context, CancellationToken cancellationToken = default)
         {
             var vals = new List<string>
                 {
@@ -252,37 +244,6 @@ public Task StopReceivingSessionUpdates()
             return SendWebSocketMessage("SessionsStop", string.Empty);
         }
 
-        public Task StartReceivingSyncJobsUpdates(int intervalMs, string userId, string targetId)
-        {
-            var options = new List<string>();
-            options.Add(intervalMs.ToString(CultureInfo.InvariantCulture));
-            options.Add(intervalMs.ToString(CultureInfo.InvariantCulture));
-            options.Add(userId ?? string.Empty);
-            options.Add(targetId ?? string.Empty);
-
-            return SendWebSocketMessage("SyncJobsStart", string.Join(",", options.ToArray()));
-        }
-
-        public Task StopReceivingSyncJobsUpdates()
-        {
-            return SendWebSocketMessage("SyncJobsStop", string.Empty);
-        }
-
-        public Task StartReceivingSyncJobUpdates(int intervalMs, string jobId)
-        {
-            var options = new List<string>();
-            options.Add(intervalMs.ToString(CultureInfo.InvariantCulture));
-            options.Add(intervalMs.ToString(CultureInfo.InvariantCulture));
-            options.Add(jobId ?? string.Empty);
-
-            return SendWebSocketMessage("SyncJobStart", string.Join(",", options.ToArray()));
-        }
-
-        public Task StopReceivingSyncJobUpdates()
-        {
-            return SendWebSocketMessage("SyncJobStop", string.Empty);
-        }
-
         protected override void Dispose(bool disposing)
         {
             base.Dispose(disposing);
@@ -299,7 +260,7 @@ private void DisposeWebSocket()
 
             if (socket != null)
             {
-                Logger.Debug("Disposing client web socket");
+                Logger.LogDebug("Disposing client web socket");
 
                 try
                 {
@@ -307,7 +268,7 @@ private void DisposeWebSocket()
                 }
                 catch (Exception ex)
                 {
-                    Logger.ErrorException("Error disposing web socket {0}", ex);
+                    Logger.LogError("Error disposing web socket {0}", ex);
                 }
                 _currentWebSocket = null;
             }
@@ -318,14 +279,20 @@ private void DisposeWebSocket()
         /// </summary>
         /// <param name="serverAddress">The server address.</param>
         /// <returns>System.String.</returns>
-        protected string GetWebSocketUrl(string serverAddress)
+        protected Uri GetWebSocketUrl(Uri serverAddress)
         {
             if (string.IsNullOrWhiteSpace(AccessToken))
             {
                 throw new ArgumentException("Cannot open web socket without an access token.");
             }
 
-            return serverAddress.Replace("http:", "ws:").Replace("https:", "wss:") + "/embywebsocket?api_key=" + AccessToken + "&deviceId=" + DeviceId;
+            var uriBuilder = new UriBuilder(new Uri(serverAddress, "/socket"))
+            {
+                Scheme = serverAddress.Scheme.Equals(Uri.UriSchemeHttps, StringComparison.InvariantCultureIgnoreCase) ? "wss" : "ws",
+                Query = "?api_key=" + AccessToken + "&deviceId=" + DeviceId,
+            };
+
+            return uriBuilder.Uri;
         }
 
         /// <summary>
@@ -351,7 +318,7 @@ protected void OnMessageReceived(string json)
             }
             catch (Exception ex)
             {
-                Logger.ErrorException("Error in OnMessageReceivedInternal", ex);
+                Logger.LogError("Error in OnMessageReceivedInternal", ex);
             }
         }
 
@@ -360,7 +327,7 @@ private void OnMessageReceivedInternal(string json)
             // deserialize the WebSocketMessage with an object payload
             var messageType = GetMessageType(json);
 
-            Logger.Info("Received web socket message: {0}", messageType);
+            Logger.LogInformation("Received web socket message: {0}", messageType);
 
             if (string.Equals(messageType, "LibraryChanged"))
             {
@@ -476,20 +443,6 @@ private void OnMessageReceivedInternal(string json)
                     Sessions = JsonSerializer.DeserializeFromString<WebSocketMessage<SessionInfoDto[]>>(json).Data
                 }));
             }
-            else if (string.Equals(messageType, "SyncJobs"))
-            {
-                FireEvent(SyncJobsUpdated, this, new GenericEventArgs<List<SyncJob>>
-                {
-                    Argument = JsonSerializer.DeserializeFromString<WebSocketMessage<List<SyncJob>>>(json).Data
-                });
-            }
-            else if (string.Equals(messageType, "SyncJob"))
-            {
-                FireEvent(SyncJobUpdated, this, new GenericEventArgs<CompleteSyncJobInfo>
-                {
-                    Argument = JsonSerializer.DeserializeFromString<WebSocketMessage<CompleteSyncJobInfo>>(json).Data
-                });
-            }
             else if (string.Equals(messageType, "UserDataChanged"))
             {
                 FireEvent(UserDataChanged, this, new GenericEventArgs<UserDataChangeInfo>
@@ -504,20 +457,6 @@ private void OnMessageReceivedInternal(string json)
                     Argument = JsonSerializer.DeserializeFromString<WebSocketMessage<SessionInfoDto>>(json).Data
                 });
             }
-            else if (string.Equals(messageType, "SyncJobCreated"))
-            {
-                FireEvent(SyncJobCreated, this, new GenericEventArgs<SyncJobCreationResult>
-                {
-                    Argument = JsonSerializer.DeserializeFromString<WebSocketMessage<SyncJobCreationResult>>(json).Data
-                });
-            }
-            else if (string.Equals(messageType, "SyncJobCancelled"))
-            {
-                FireEvent(SyncJobCancelled, this, new GenericEventArgs<SyncJob>
-                {
-                    Argument = JsonSerializer.DeserializeFromString<WebSocketMessage<SyncJob>>(json).Data
-                });
-            }
             else if (string.Equals(messageType, "PlaybackStart"))
             {
                 FireEvent(PlaybackStart, this, new GenericEventArgs<SessionInfoDto>
@@ -554,13 +493,10 @@ private void OnGeneralCommand(string json)
             {
                 if (args.KnownCommandType.Value == GeneralCommandType.DisplayContent)
                 {
-                    string itemId;
-                    string itemName;
-                    string itemType;
 
-                    args.Command.Arguments.TryGetValue("ItemId", out itemId);
-                    args.Command.Arguments.TryGetValue("ItemName", out itemName);
-                    args.Command.Arguments.TryGetValue("ItemType", out itemType);
+                    args.Command.Arguments.TryGetValue("ItemId", out string itemId);
+                    args.Command.Arguments.TryGetValue("ItemName", out string itemName);
+                    args.Command.Arguments.TryGetValue("ItemType", out string itemType);
 
                     FireEvent(BrowseCommand, this, new GenericEventArgs<BrowseRequest>
                     {
@@ -575,15 +511,12 @@ private void OnGeneralCommand(string json)
                 }
                 if (args.KnownCommandType.Value == GeneralCommandType.DisplayMessage)
                 {
-                    string header;
-                    string text;
-                    string timeoutMs;
 
-                    args.Command.Arguments.TryGetValue("Header", out header);
-                    args.Command.Arguments.TryGetValue("Text", out text);
-                    args.Command.Arguments.TryGetValue("TimeoutMs", out timeoutMs);
+                    args.Command.Arguments.TryGetValue("Header", out string header);
+                    args.Command.Arguments.TryGetValue("Text", out string text);
+                    args.Command.Arguments.TryGetValue("TimeoutMs", out string timeoutMs);
 
-                    long? timeoutVal = string.IsNullOrEmpty(timeoutMs) ? (long?)null : long.Parse(timeoutMs, CultureInfo.InvariantCulture);
+                    long? timeoutVal = string.IsNullOrEmpty(timeoutMs) ? (long?)null : long.Parse(timeoutMs);
 
                     FireEvent(MessageCommand, this, new GenericEventArgs<MessageCommand>
                     {
@@ -598,9 +531,8 @@ private void OnGeneralCommand(string json)
                 }
                 if (args.KnownCommandType.Value == GeneralCommandType.SetVolume)
                 {
-                    string volume;
 
-                    args.Command.Arguments.TryGetValue("Volume", out volume);
+                    args.Command.Arguments.TryGetValue("Volume", out string volume);
 
                     FireEvent(SetVolumeCommand, this, new GenericEventArgs<int>
                     {
@@ -610,9 +542,8 @@ private void OnGeneralCommand(string json)
                 }
                 if (args.KnownCommandType.Value == GeneralCommandType.SetAudioStreamIndex)
                 {
-                    string index;
 
-                    args.Command.Arguments.TryGetValue("Index", out index);
+                    args.Command.Arguments.TryGetValue("Index", out string index);
 
                     FireEvent(SetAudioStreamIndexCommand, this, new GenericEventArgs<int>
                     {
@@ -622,9 +553,8 @@ private void OnGeneralCommand(string json)
                 }
                 if (args.KnownCommandType.Value == GeneralCommandType.SetSubtitleStreamIndex)
                 {
-                    string index;
 
-                    args.Command.Arguments.TryGetValue("Index", out index);
+                    args.Command.Arguments.TryGetValue("Index", out string index);
 
                     FireEvent(SetSubtitleStreamIndexCommand, this, new GenericEventArgs<int>
                     {
@@ -634,9 +564,8 @@ private void OnGeneralCommand(string json)
                 }
                 if (args.KnownCommandType.Value == GeneralCommandType.SendString)
                 {
-                    string val;
 
-                    args.Command.Arguments.TryGetValue("String", out val);
+                    args.Command.Arguments.TryGetValue("String", out string val);
 
                     FireEvent(SendStringCommand, this, new GenericEventArgs<string>
                     {
@@ -704,7 +633,7 @@ protected void FireEvent<T>(EventHandler<T> handler, object sender, T args)
                 }
                 catch (Exception ex)
                 {
-                    Logger.ErrorException("Error in event handler", ex);
+                    Logger.LogError("Error in event handler", ex);
                 }
             }
         }
diff --git a/Emby.ApiClient/BaseApiClient.cs b/Jellyfin.ApiClient/BaseApiClient.cs
similarity index 85%
rename from Emby.ApiClient/BaseApiClient.cs
rename to Jellyfin.ApiClient/BaseApiClient.cs
index 6eae1bb..767be5c 100644
--- a/Emby.ApiClient/BaseApiClient.cs
+++ b/Jellyfin.ApiClient/BaseApiClient.cs
@@ -1,18 +1,20 @@
-using MediaBrowser.Model.ApiClient;
+using Jellyfin.ApiClient.Model;
+using Jellyfin.ApiClient.Model.Dto;
+using Jellyfin.ApiClient.Model.Querying;
+using Jellyfin.ApiClient.Net;
 using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Entities;
-using MediaBrowser.Model.LiveTv;
-using MediaBrowser.Model.Logging;
 using MediaBrowser.Model.Querying;
 using MediaBrowser.Model.Serialization;
+using Microsoft.Extensions.Logging;
 using System;
-using System.Collections.Generic;
+using System.Collections.Specialized;
+using System.Globalization;
 using System.IO;
 using System.Linq;
-using Emby.ApiClient.Model;
-using Emby.ApiClient.Net;
+using System.Web;
 
-namespace Emby.ApiClient
+namespace Jellyfin.ApiClient
 {
     /// <summary>
     /// Provides api methods that are usable on all platforms
@@ -38,48 +40,46 @@ public abstract class BaseApiClient : IDisposable
         /// </summary>
         public int? ImageQuality { get; set; }
 
-        protected BaseApiClient(ILogger logger, IJsonSerializer jsonSerializer, string serverAddress, string clientName, IDevice device, string applicationVersion)
+        protected BaseApiClient(ILogger logger, IJsonSerializer jsonSerializer, Uri serverAddress, string clientName, IDevice device, string applicationVersion)
         {
-            if (logger == null)
+            if (serverAddress == null)
             {
-                throw new ArgumentNullException("logger");
+                throw new ArgumentNullException("serverAddress");
             }
+
             if (jsonSerializer == null)
             {
                 throw new ArgumentNullException("jsonSerializer");
             }
-            if (string.IsNullOrEmpty(serverAddress))
+
+            if (logger == null)
             {
-                throw new ArgumentNullException("serverAddress");
+                throw new ArgumentNullException("logger");
             }
 
-            JsonSerializer = jsonSerializer;
-            Logger = logger;
-
             ClientName = clientName;
             Device = device;
             ApplicationVersion = applicationVersion;
             ServerAddress = serverAddress;
         }
 
-        protected BaseApiClient(ILogger logger, IJsonSerializer jsonSerializer, string serverAddress, string accessToken)
+        protected BaseApiClient(ILogger logger, IJsonSerializer jsonSerializer, Uri serverAddress, string accessToken)
         {
-            if (logger == null)
+            if (serverAddress == null)
             {
-                throw new ArgumentNullException("logger");
+                throw new ArgumentNullException("serverAddress");
             }
+
             if (jsonSerializer == null)
             {
                 throw new ArgumentNullException("jsonSerializer");
             }
-            if (string.IsNullOrEmpty(serverAddress))
+
+            if (logger == null)
             {
-                throw new ArgumentNullException("serverAddress");
+                throw new ArgumentNullException("logger");
             }
 
-            JsonSerializer = jsonSerializer;
-            Logger = logger;
-
             AccessToken = accessToken;
             ServerAddress = serverAddress;
         }
@@ -88,20 +88,20 @@ protected BaseApiClient(ILogger logger, IJsonSerializer jsonSerializer, string s
         /// Gets the name of the server host.
         /// </summary>
         /// <value>The name of the server host.</value>
-        public string ServerAddress { get; protected set; }
+        public Uri ServerAddress { get; protected set; }
 
         /// <summary>
         /// Changes the server location.
         /// </summary>
         /// <param name="address">The address.</param>
         /// <param name="keepExistingAuth"></param>
-        public void ChangeServerLocation(string address, bool keepExistingAuth = false)
+        public void ChangeServerLocation(Uri address, bool keepExistingAuth = false)
         {
             ServerAddress = address;
 
             if (!keepExistingAuth)
             {
-                SetAuthenticationInfo(null, null);
+                SetAuthenticationInfo(null, Guid.Empty);
             }
         }
 
@@ -146,17 +146,17 @@ public string DeviceId
         /// Gets or sets the current user id.
         /// </summary>
         /// <value>The current user id.</value>
-        public string CurrentUserId { get; private set; }
+        public Guid CurrentUserId { get; private set; }
 
         /// <summary>
         /// Gets the current api url based on hostname and port.
         /// </summary>
         /// <value>The API URL.</value>
-        public string ApiUrl
+        public Uri ApiUrl
         {
             get
             {
-                return ServerAddress + "/emby";
+                return new Uri(ServerAddress, "/emby");
             }
         }
 
@@ -184,7 +184,7 @@ protected string AuthorizationParameter
 
                 var header = string.Format("Client=\"{0}\", DeviceId=\"{1}\", Device=\"{2}\", Version=\"{3}\"", ClientName, DeviceId, DeviceName, ApplicationVersion);
 
-                if (!string.IsNullOrEmpty(CurrentUserId))
+                if (CurrentUserId != Guid.Empty)
                 {
                     header += string.Format(", UserId=\"{0}\"", CurrentUserId);
                 }
@@ -199,12 +199,12 @@ protected string AuthorizationParameter
         /// <param name="handler">The handler.</param>
         /// <returns>System.String.</returns>
         /// <exception cref="System.ArgumentNullException">handler</exception>
-        public string GetApiUrl(string handler)
+        public Uri GetApiUrl(Uri handler)
         {
-            return GetApiUrl(handler, new QueryStringDictionary());
+            return GetApiUrl(handler, new NameValueCollection());
         }
 
-        public void SetAuthenticationInfo(string accessToken, string userId)
+        public void SetAuthenticationInfo(string accessToken, Guid userId)
         {
             CurrentUserId = userId;
             AccessToken = accessToken;
@@ -213,14 +213,14 @@ public void SetAuthenticationInfo(string accessToken, string userId)
 
         public void ClearAuthenticationInfo()
         {
-            CurrentUserId = null;
+            CurrentUserId = Guid.Empty;
             AccessToken = null;
             ResetHttpHeaders();
         }
 
         public void SetAuthenticationInfo(string accessToken)
         {
-            CurrentUserId = null;
+            CurrentUserId = Guid.Empty;
             AccessToken = accessToken;
             ResetHttpHeaders();
         }
@@ -259,24 +259,24 @@ private void ClearHttpRequestHeader(string name)
         /// </summary>
         /// <param name="handler">The handler.</param>
         /// <param name="queryString">The query string.</param>
-        /// <returns>System.String.</returns>
+        /// <returns>System.Uri.</returns>
         /// <exception cref="System.ArgumentNullException">handler</exception>
-        protected string GetApiUrl(string handler, QueryStringDictionary queryString)
+        protected Uri GetApiUrl(Uri handler, NameValueCollection queryString)
         {
-            if (string.IsNullOrEmpty(handler))
+            if (handler == null)
             {
                 throw new ArgumentNullException("handler");
             }
 
-            if (queryString == null)
+            var uriBuilder = new UriBuilder(new Uri(ApiUrl, handler))
             {
-                throw new ArgumentNullException("queryString");
-            }
+                Query = queryString.ToQueryString(),
+            };
 
-            return queryString.GetUrl(ApiUrl + "/" + handler);
+            return uriBuilder.Uri;
         }
 
-        public string GetSubtitleUrl(SubtitleDownloadOptions options)
+        public Uri GetSubtitleUrl(SubtitleDownloadOptions options)
         {
             if (options == null)
             {
@@ -295,7 +295,7 @@ public string GetSubtitleUrl(SubtitleDownloadOptions options)
                 throw new ArgumentNullException("options");
             }
 
-            return GetApiUrl("Videos/" + options.ItemId + "/" + options.MediaSourceId + "/Subtitles/" + options.StreamIndex + "/Stream." + options.Format);
+            return GetApiUrl(new Uri("Videos/" + options.ItemId + "/" + options.MediaSourceId + "/Subtitles/" + options.StreamIndex + "/Stream." + options.Format, UriKind.Relative));
         }
 
         /// <summary>
@@ -304,14 +304,14 @@ public string GetSubtitleUrl(SubtitleDownloadOptions options)
         /// <param name="query">The query.</param>
         /// <returns>System.String.</returns>
         /// <exception cref="System.ArgumentNullException">query</exception>
-        protected string GetItemListUrl(ItemQuery query)
+        protected Uri GetItemListUrl(ItemQuery query)
         {
             if (query == null)
             {
                 throw new ArgumentNullException("query");
             }
 
-            var dict = new QueryStringDictionary { };
+            var dict = new NameValueCollection { };
 
             dict.AddIfNotNullOrEmpty("ParentId", query.ParentId);
 
@@ -418,7 +418,7 @@ protected string GetItemListUrl(ItemQuery query)
 
             dict.AddIfNotNull("AiredDuringSeason", query.AiredDuringSeason);
 
-            return GetApiUrl("Users/" + query.UserId + "/Items", dict);
+            return GetApiUrl(new Uri("Users/" + query.UserId + "/Items", UriKind.Relative), dict);
         }
 
         /// <summary>
@@ -427,14 +427,14 @@ protected string GetItemListUrl(ItemQuery query)
         /// <param name="query">The query.</param>
         /// <returns>System.String.</returns>
         /// <exception cref="System.ArgumentNullException">query</exception>
-        protected string GetNextUpUrl(NextUpQuery query)
+        protected Uri GetNextUpUrl(NextUpQuery query)
         {
             if (query == null)
             {
                 throw new ArgumentNullException("query");
             }
 
-            var dict = new QueryStringDictionary { };
+            var dict = new NameValueCollection { };
 
             if (query.Fields != null)
             {
@@ -449,7 +449,7 @@ protected string GetNextUpUrl(NextUpQuery query)
 
             dict.AddIfNotNullOrEmpty("SeriesId", query.SeriesId);
 
-            dict.Add("UserId", query.UserId);
+            dict.Add("UserId", query.UserId.ToString("N", CultureInfo.InvariantCulture));
 
             dict.AddIfNotNull("EnableImages", query.EnableImages);
             if (query.EnableImageTypes != null)
@@ -458,7 +458,7 @@ protected string GetNextUpUrl(NextUpQuery query)
             }
             dict.AddIfNotNull("ImageTypeLimit", query.ImageTypeLimit);
             
-            return GetApiUrl("Shows/NextUp", dict);
+            return GetApiUrl(new Uri("Shows/NextUp", UriKind.Relative), dict);
         }
 
         /// <summary>
@@ -472,7 +472,7 @@ protected string GetNextUpUrl(NextUpQuery query)
         /// or
         /// type
         /// </exception>
-        protected string GetSimilarItemListUrl(SimilarItemsQuery query, string type)
+        protected Uri GetSimilarItemListUrl(SimilarItemsQuery query, string type)
         {
             if (query == null)
             {
@@ -483,7 +483,7 @@ protected string GetSimilarItemListUrl(SimilarItemsQuery query, string type)
                 throw new ArgumentNullException("type");
             }
 
-            var dict = new QueryStringDictionary { };
+            var dict = new NameValueCollection { };
 
             dict.AddIfNotNull("Limit", query.Limit);
             dict.AddIfNotNullOrEmpty("UserId", query.UserId);
@@ -498,7 +498,7 @@ protected string GetSimilarItemListUrl(SimilarItemsQuery query, string type)
                 throw new ArgumentNullException("query");
             }
 
-            return GetApiUrl(type + "/" + query.Id + "/Similar", dict);
+            return GetApiUrl(new Uri(type + "/" + query.Id + "/Similar", UriKind.Relative), dict);
         }
 
         /// <summary>
@@ -512,7 +512,7 @@ protected string GetSimilarItemListUrl(SimilarItemsQuery query, string type)
         /// or
         /// type
         /// </exception>
-        protected string GetInstantMixUrl(SimilarItemsQuery query, string type)
+        protected Uri GetInstantMixUrl(SimilarItemsQuery query, string type)
         {
             if (query == null)
             {
@@ -523,7 +523,7 @@ protected string GetInstantMixUrl(SimilarItemsQuery query, string type)
                 throw new ArgumentNullException("type");
             }
 
-            var dict = new QueryStringDictionary { };
+            var dict = new NameValueCollection { };
 
             dict.AddIfNotNull("Limit", query.Limit);
             dict.AddIfNotNullOrEmpty("UserId", query.UserId);
@@ -538,7 +538,7 @@ protected string GetInstantMixUrl(SimilarItemsQuery query, string type)
                 throw new ArgumentNullException("query");
             }
 
-            return GetApiUrl(type + "/" + query.Id + "/InstantMix", dict);
+            return GetApiUrl(new Uri(type + "/" + query.Id + "/InstantMix", UriKind.Relative), dict);
         }
 
         /// <summary>
@@ -548,14 +548,14 @@ protected string GetInstantMixUrl(SimilarItemsQuery query, string type)
         /// <param name="query">The query.</param>
         /// <returns>System.String.</returns>
         /// <exception cref="System.ArgumentNullException">query</exception>
-        protected string GetItemByNameListUrl(string type, ItemsByNameQuery query)
+        protected Uri GetItemByNameListUrl(string type, ItemsByNameQuery query)
         {
             if (query == null)
             {
                 throw new ArgumentNullException("query");
             }
 
-            var dict = new QueryStringDictionary { };
+            var dict = new NameValueCollection { };
 
             dict.AddIfNotNullOrEmpty("ParentId", query.ParentId);
 
@@ -604,7 +604,7 @@ protected string GetItemByNameListUrl(string type, ItemsByNameQuery query)
             }
             dict.AddIfNotNull("ImageTypeLimit", query.ImageTypeLimit);
             
-            return GetApiUrl(type, dict);
+            return GetApiUrl(new Uri(type, UriKind.Relative), dict);
         }
 
         /// <summary>
@@ -615,7 +615,7 @@ protected string GetItemByNameListUrl(string type, ItemsByNameQuery query)
         /// <param name="queryParams">The query params.</param>
         /// <returns>System.String.</returns>
         /// <exception cref="System.ArgumentNullException">options</exception>
-        private string GetImageUrl(string baseUrl, ImageOptions options, QueryStringDictionary queryParams)
+        private Uri GetImageUrl(Uri baseUrl, ImageOptions options, NameValueCollection queryParams)
         {
             if (options == null)
             {
@@ -629,7 +629,7 @@ private string GetImageUrl(string baseUrl, ImageOptions options, QueryStringDict
 
             if (options.ImageIndex.HasValue)
             {
-                baseUrl += "/" + options.ImageIndex.Value;
+                baseUrl = new Uri(baseUrl, "/" + options.ImageIndex.Value);
             }
 
             queryParams.AddIfNotNull("Width", options.Width);
@@ -665,7 +665,7 @@ private string GetImageUrl(string baseUrl, ImageOptions options, QueryStringDict
         /// <param name="options">The options.</param>
         /// <returns>System.String.</returns>
         /// <exception cref="System.ArgumentNullException">item</exception>
-        public string GetImageUrl(BaseItemDto item, ImageOptions options)
+        public Uri GetImageUrl(BaseItemDto item, ImageOptions options)
         {
             if (item == null)
             {
@@ -679,10 +679,10 @@ public string GetImageUrl(BaseItemDto item, ImageOptions options)
 
             options.Tag = GetImageTag(item, options);
 
-            return GetImageUrl(item.Id, options);
+            return GetImageUrl(item, options);
         }
 
-        public string GetImageUrl(ChannelInfoDto item, ImageOptions options)
+        public Uri GetImageUrl(ChannelInfoDto item, ImageOptions options)
         {
             if (item == null)
             {
@@ -706,16 +706,16 @@ public string GetImageUrl(ChannelInfoDto item, ImageOptions options)
         /// <param name="options">The options.</param>
         /// <returns>System.String.</returns>
         /// <exception cref="System.ArgumentNullException">itemId</exception>
-        public string GetImageUrl(string itemId, ImageOptions options)
+        public Uri GetImageUrl(string itemId, ImageOptions options)
         {
             if (string.IsNullOrEmpty(itemId))
             {
                 throw new ArgumentNullException("itemId");
             }
 
-            var url = "Items/" + itemId + "/Images/" + options.ImageType;
+            var url = new Uri("Items/" + itemId + "/Images/" + options.ImageType, UriKind.Relative);
 
-            return GetImageUrl(url, options, new QueryStringDictionary());
+            return GetImageUrl(url, options, new NameValueCollection());
         }
 
         /// <summary>
@@ -725,7 +725,7 @@ public string GetImageUrl(string itemId, ImageOptions options)
         /// <param name="options">The options.</param>
         /// <returns>System.String.</returns>
         /// <exception cref="System.ArgumentNullException">user</exception>
-        public string GetUserImageUrl(UserDto user, ImageOptions options)
+        public Uri GetUserImageUrl(UserDto user, ImageOptions options)
         {
             if (user == null)
             {
@@ -749,16 +749,16 @@ public string GetUserImageUrl(UserDto user, ImageOptions options)
         /// <param name="options">The options.</param>
         /// <returns>System.String.</returns>
         /// <exception cref="System.ArgumentNullException">userId</exception>
-        public string GetUserImageUrl(string userId, ImageOptions options)
+        public Uri GetUserImageUrl(Guid userId, ImageOptions options)
         {
-            if (string.IsNullOrEmpty(userId))
+            if (userId.Equals(Guid.Empty))
             {
                 throw new ArgumentNullException("userId");
             }
 
-            var url = "Users/" + userId + "/Images/" + options.ImageType;
+            var url = new Uri("Users/" + userId.ToString("N", CultureInfo.InvariantCulture) + "/Images/" + options.ImageType, UriKind.Relative);
 
-            return GetImageUrl(url, options, new QueryStringDictionary());
+            return GetImageUrl(url, options, new NameValueCollection());
         }
 
         /// <summary>
@@ -768,7 +768,7 @@ public string GetUserImageUrl(string userId, ImageOptions options)
         /// <param name="options">The options.</param>
         /// <returns>System.String.</returns>
         /// <exception cref="System.ArgumentNullException">item</exception>
-        public string GetPersonImageUrl(BaseItemPerson item, ImageOptions options)
+        public Uri GetPersonImageUrl(BaseItemPerson item, ImageOptions options)
         {
             if (item == null)
             {
@@ -818,7 +818,7 @@ private string GetImageTag(BaseItemDto item, ImageOptions options)
         /// <param name="options">The options.</param>
         /// <returns>System.String[][].</returns>
         /// <exception cref="System.ArgumentNullException">item</exception>
-        public string[] GetBackdropImageUrls(BaseItemDto item, ImageOptions options)
+        public Uri[] GetBackdropImageUrls(BaseItemDto item, ImageOptions options)
         {
             if (item == null)
             {
@@ -842,16 +842,16 @@ public string[] GetBackdropImageUrls(BaseItemDto item, ImageOptions options)
             }
             else
             {
-                backdropItemId = item.Id;
+                backdropItemId = item.Id.ToString("N", CultureInfo.InvariantCulture);
                 backdropImageTags = item.BackdropImageTags;
             }
 
             if (string.IsNullOrEmpty(backdropItemId))
             {
-                return new string[] { };
+                return new Uri[] { };
             }
 
-            var files = new string[backdropImageTags.Length];
+            var files = new Uri[backdropImageTags.Length];
 
             for (var i = 0; i < backdropImageTags.Length; i++)
             {
@@ -871,7 +871,7 @@ public string[] GetBackdropImageUrls(BaseItemDto item, ImageOptions options)
         /// <param name="options">The options.</param>
         /// <returns>System.String.</returns>
         /// <exception cref="System.ArgumentNullException">item</exception>
-        public string GetLogoImageUrl(BaseItemDto item, ImageOptions options)
+        public Uri GetLogoImageUrl(BaseItemDto item, ImageOptions options)
         {
             if (item == null)
             {
@@ -885,7 +885,7 @@ public string GetLogoImageUrl(BaseItemDto item, ImageOptions options)
 
             options.ImageType = ImageType.Logo;
 
-            var logoItemId = HasLogo(item) ? item.Id : item.ParentLogoItemId;
+            var logoItemId = HasLogo(item) ? item.Id.ToString("N", CultureInfo.InvariantCulture) : item.ParentLogoItemId;
             var imageTag = HasLogo(item) ? item.ImageTags[ImageType.Logo] : item.ParentLogoImageTag;
 
             if (!string.IsNullOrEmpty(logoItemId))
@@ -898,7 +898,7 @@ public string GetLogoImageUrl(BaseItemDto item, ImageOptions options)
             return null;
         }
 
-        public string GetThumbImageUrl(BaseItemDto item, ImageOptions options)
+        public Uri GetThumbImageUrl(BaseItemDto item, ImageOptions options)
         {
             if (item == null)
             {
@@ -912,7 +912,7 @@ public string GetThumbImageUrl(BaseItemDto item, ImageOptions options)
 
             options.ImageType = ImageType.Thumb;
 
-            var itemId = HasThumb(item) ? item.Id : item.SeriesThumbImageTag != null ? item.SeriesId : item.ParentThumbItemId;
+            var itemId = HasThumb(item) ? item.Id.ToString("N", CultureInfo.InvariantCulture) : item.SeriesThumbImageTag != null ? item.SeriesId.ToString("N", CultureInfo.InvariantCulture) : item.ParentThumbItemId;
             var imageTag = HasThumb(item) ? item.ImageTags[ImageType.Thumb] : item.SeriesThumbImageTag ?? item.ParentThumbImageTag;
 
             if (!string.IsNullOrEmpty(itemId))
@@ -932,7 +932,7 @@ public string GetThumbImageUrl(BaseItemDto item, ImageOptions options)
         /// <param name="options">The options.</param>
         /// <returns>System.String.</returns>
         /// <exception cref="System.ArgumentNullException">item</exception>
-        public string GetArtImageUrl(BaseItemDto item, ImageOptions options)
+        public Uri GetArtImageUrl(BaseItemDto item, ImageOptions options)
         {
             if (item == null)
             {
@@ -946,7 +946,7 @@ public string GetArtImageUrl(BaseItemDto item, ImageOptions options)
 
             options.ImageType = ImageType.Art;
 
-            var artItemId = HasArtImage(item) ? item.Id : item.ParentArtItemId;
+            var artItemId = HasArtImage(item) ? item.Id.ToString("N", CultureInfo.InvariantCulture) : item.ParentArtItemId;
             var imageTag = HasArtImage(item) ? item.ImageTags[ImageType.Art] : item.ParentArtImageTag;
 
             if (!string.IsNullOrEmpty(artItemId))
@@ -1010,21 +1010,16 @@ protected string SerializeToJson(object obj)
         /// Adds the data format.
         /// </summary>
         /// <param name="url">The URL.</param>
-        /// <returns>System.String.</returns>
-        protected string AddDataFormat(string url)
+        /// <returns>System.Uri.</returns>
+        protected Uri AddDataFormat(Uri url)
         {
             const string format = "json";
 
-            if (url.IndexOf('?') == -1)
-            {
-                url += "?format=" + format;
-            }
-            else
-            {
-                url += "&format=" + format;
-            }
-
-            return url;
+            UriBuilder uriBuilder = new UriBuilder(url);
+            NameValueCollection query = HttpUtility.ParseQueryString(uriBuilder.Query);
+            query["format"] = format;
+            uriBuilder.Query = query.ToQueryString();
+            return uriBuilder.Uri;
         }
 
         /// <summary>
diff --git a/Jellyfin.ApiClient/ConnectionManager.cs b/Jellyfin.ApiClient/ConnectionManager.cs
new file mode 100644
index 0000000..94aa610
--- /dev/null
+++ b/Jellyfin.ApiClient/ConnectionManager.cs
@@ -0,0 +1,519 @@
+using Jellyfin.ApiClient.Model;
+using Jellyfin.ApiClient.Net;
+using MediaBrowser.Controller.Authentication;
+using MediaBrowser.Model.ApiClient;
+using MediaBrowser.Model.Dto;
+using MediaBrowser.Model.Events;
+using MediaBrowser.Model.Serialization;
+using MediaBrowser.Model.Session;
+using MediaBrowser.Model.System;
+using Microsoft.Extensions.Logging;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Jellyfin.ApiClient
+{
+    public class ConnectionManager : IConnectionManager
+    {
+        public event EventHandler<GenericEventArgs<UserDto>> LocalUserSignIn;
+        public event EventHandler<GenericEventArgs<IApiClient>> LocalUserSignOut;
+        public event EventHandler<EventArgs> RemoteLoggedOut;
+
+        public event EventHandler<GenericEventArgs<ConnectionResult>> Connected;
+
+        private readonly ICredentialProvider _credentialProvider;
+        private readonly INetworkConnection _networkConnectivity;
+        private readonly ILogger _logger;
+        private readonly IServerLocator _serverDiscovery;
+        private readonly IAsyncHttpClient _httpClient;
+        private readonly Func<IClientWebSocket> _webSocketFactory;
+
+        public Dictionary<string, IApiClient> ApiClients { get; private set; }
+
+        public string ApplicationName { get; private set; }
+        public string ApplicationVersion { get; private set; }
+        public IDevice Device { get; private set; }
+        public ClientCapabilities ClientCapabilities { get; private set; }
+
+        public IApiClient CurrentApiClient { get; private set; }
+
+        public ConnectionManager(ILogger logger,
+            ICredentialProvider credentialProvider,
+            INetworkConnection networkConnectivity,
+            IServerLocator serverDiscovery,
+            string applicationName,
+            string applicationVersion,
+            IDevice device,
+            ClientCapabilities clientCapabilities,
+            Func<IClientWebSocket> webSocketFactory = null)
+        {
+            _credentialProvider = credentialProvider;
+            _networkConnectivity = networkConnectivity;
+            _logger = logger;
+            _serverDiscovery = serverDiscovery;
+            _httpClient = AsyncHttpClientFactory.Create(logger);
+            ClientCapabilities = clientCapabilities;
+            _webSocketFactory = webSocketFactory;
+
+            Device = device;
+            ApplicationVersion = applicationVersion;
+            ApplicationName = applicationName;
+            ApiClients = new Dictionary<string, IApiClient>(StringComparer.OrdinalIgnoreCase);
+            SaveLocalCredentials = true;
+        }
+
+        public IJsonSerializer JsonSerializer = new NewtonsoftJsonSerializer();
+
+        public bool SaveLocalCredentials { get; set; }
+
+        private IApiClient GetOrAddApiClient(ServerInfo server)
+        {
+
+            if (!ApiClients.TryGetValue(server.Id, out IApiClient apiClient))
+            {
+                var address = server.Address;
+
+                apiClient = new ApiClient(_logger, address, ApplicationName, Device, ApplicationVersion)
+                {
+                    JsonSerializer = JsonSerializer,
+                };
+
+                apiClient.OnAuthenticated += ApiClientOnAuthenticated;
+
+                ApiClients[server.Id] = apiClient;
+            }
+
+            if (string.IsNullOrEmpty(server.AccessToken))
+            {
+                apiClient.ClearAuthenticationInfo();
+            }
+            else
+            {
+                apiClient.SetAuthenticationInfo(server.AccessToken, server.UserId);
+            }
+
+            return apiClient;
+        }
+
+        private async void ApiClientOnAuthenticated(object apiClient, GenericEventArgs<AuthenticationResult> result)
+        {
+            await OnAuthenticated((IApiClient)apiClient, result.Argument, new ConnectionOptions(), SaveLocalCredentials);
+        }
+
+        private async void AfterConnected(IApiClient apiClient, ConnectionOptions options)
+        {
+            if (options.ReportCapabilities)
+            {
+                try
+                {
+                    await apiClient.ReportCapabilities(ClientCapabilities).ConfigureAwait(false);
+                }
+                catch (Exception ex)
+                {
+                    _logger.LogError("Error reporting capabilities", ex);
+                }
+            }
+
+            if (options.EnableWebSocket)
+            {
+                if (_webSocketFactory != null)
+                {
+                    ((ApiClient)apiClient).OpenWebSocket(_webSocketFactory);
+                }
+            }
+        }
+
+        public async Task<List<ServerInfo>> GetAvailableServers(CancellationToken cancellationToken = default)
+        {
+            var credentials = await _credentialProvider.GetServerCredentials().ConfigureAwait(false);
+
+            _logger.LogDebug("{0} servers in saved credentials", credentials.Servers.Count);
+
+            if (_networkConnectivity.GetNetworkStatus().GetIsAnyLocalNetworkAvailable())
+            {
+                foreach (var server in await FindServers(cancellationToken).ConfigureAwait(false))
+                {
+                    credentials.AddOrUpdateServer(server);
+                }
+            }
+
+            await _credentialProvider.SaveServerCredentials(credentials).ConfigureAwait(false);
+
+            return credentials.Servers.OrderByDescending(i => i.DateLastAccessed).ToList();
+        }
+
+        private async Task<List<ServerInfo>> FindServers(CancellationToken cancellationToken)
+        {
+            List<ServerDiscoveryInfo> servers;
+
+            try
+            {
+                servers = await _serverDiscovery.FindServers(1500, cancellationToken).ConfigureAwait(false);
+            }
+            catch (OperationCanceledException)
+            {
+                _logger.LogDebug("No servers found via local discovery.");
+
+                servers = new List<ServerDiscoveryInfo>();
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError("Error discovering servers.", ex);
+
+                servers = new List<ServerDiscoveryInfo>();
+            }
+
+            return servers.Select(i => new ServerInfo
+            {
+                Id = i.Id,
+                Address = ConvertEndpointAddressToManualAddress(i) ?? new Uri(i.Address),
+                Name = i.Name
+            })
+            .ToList();
+        }
+
+        private Uri ConvertEndpointAddressToManualAddress(ServerDiscoveryInfo info)
+        {
+            if (!string.IsNullOrWhiteSpace(info.Address) && !string.IsNullOrWhiteSpace(info.EndpointAddress))
+            {
+                var uriBuilder = new UriBuilder(info.EndpointAddress.Split(':').First())
+                {
+                    Port = new Uri(info.Address).Port
+                };
+
+                return uriBuilder.Uri;
+            }
+
+            return null;
+        }
+
+        public async Task<ConnectionResult> Connect(CancellationToken cancellationToken = default)
+        {
+            var servers = await GetAvailableServers(cancellationToken).ConfigureAwait(false);
+
+            return await Connect(servers, cancellationToken).ConfigureAwait(false);
+        }
+
+        /// <summary>
+        /// Loops through a list of servers and returns the first that is available for connection
+        /// </summary>
+        private async Task<ConnectionResult> Connect(List<ServerInfo> servers, CancellationToken cancellationToken)
+        {
+            servers = servers
+               .OrderByDescending(i => i.DateLastAccessed)
+               .ToList();
+
+            if (servers.Count == 1)
+            {
+                _logger.LogDebug("1 server in the list.");
+
+                var result = await Connect(servers[0], cancellationToken).ConfigureAwait(false);
+
+                if (result.State == ConnectionState.Unavailable)
+                {
+                    result.State = ConnectionState.ServerSelection;
+                }
+
+                return result;
+            }
+
+            var firstServer = servers.FirstOrDefault();
+            // See if we have any saved credentials and can auto sign in
+            if (firstServer != null && !string.IsNullOrEmpty(firstServer.AccessToken))
+            {
+                var result = await Connect(firstServer, cancellationToken).ConfigureAwait(false);
+
+                if (result.State == ConnectionState.SignedIn)
+                {
+                    return result;
+                }
+            }
+
+            var finalResult = new ConnectionResult
+            {
+                Servers = servers
+            };
+
+            finalResult.State = ConnectionState.ServerSelection;
+
+            return finalResult;
+        }
+
+        /// <summary>
+        /// Attempts to connect to a server
+        /// </summary>
+        public Task<ConnectionResult> Connect(ServerInfo server, CancellationToken cancellationToken = default)
+        {
+            return Connect(server, new ConnectionOptions(), cancellationToken);
+        }
+
+        public async Task<ConnectionResult> Connect(ServerInfo server, ConnectionOptions options, CancellationToken cancellationToken = default)
+        {
+            if (server.Address == null)
+            {
+                // TODO: on failed connection
+                return new ConnectionResult { State = ConnectionState.Unavailable };
+            }
+
+            int timeout = 100;
+
+            await TryConnect(server.Address, timeout, cancellationToken);
+
+            // TODO: this isn't right
+            return new ConnectionResult { State = ConnectionState.Unavailable };
+        }
+
+        private async Task OnSuccessfulConnection(ServerInfo server,
+            ConnectionOptions options,
+            PublicSystemInfo systemInfo,
+            ConnectionResult result,
+            CancellationToken cancellationToken)
+        {
+            server.ImportInfo(systemInfo);
+
+            var credentials = await _credentialProvider.GetServerCredentials().ConfigureAwait(false);
+
+            if (!string.IsNullOrWhiteSpace(server.AccessToken))
+            {
+                await ValidateAuthentication(server, options, cancellationToken).ConfigureAwait(false);
+            }
+
+            credentials.AddOrUpdateServer(server);
+
+            if (options.UpdateDateLastAccessed)
+            {
+                server.DateLastAccessed = DateTime.UtcNow;
+            }
+
+            await _credentialProvider.SaveServerCredentials(credentials).ConfigureAwait(false);
+
+            result.ApiClient = GetOrAddApiClient(server);
+            result.State = string.IsNullOrEmpty(server.AccessToken) ?
+                ConnectionState.ServerSignIn :
+                ConnectionState.SignedIn;
+
+            ((ApiClient)result.ApiClient).EnableAutomaticNetworking(server, _networkConnectivity);
+
+            if (result.State == ConnectionState.SignedIn)
+            {
+                AfterConnected(result.ApiClient, options);
+            }
+
+            CurrentApiClient = result.ApiClient;
+
+            result.Servers.Add(server);
+
+            Connected?.Invoke(this, new GenericEventArgs<ConnectionResult>(result));
+        }
+
+        public Task<ConnectionResult> Connect(IApiClient apiClient, CancellationToken cancellationToken = default)
+        {
+            var client = (ApiClient)apiClient;
+            return Connect(client.ServerInfo, cancellationToken);
+        }
+
+        private async Task ValidateAuthentication(ServerInfo server, ConnectionOptions options, CancellationToken cancellationToken)
+        {
+            _logger.LogDebug("Validating saved authentication");
+
+            var url = server.Address;
+
+            var headers = new HttpHeaders();
+            headers.SetAccessToken(server.AccessToken);
+
+            var request = new HttpRequest
+            {
+                CancellationToken = cancellationToken,
+                Method = "GET",
+                RequestHeaders = headers,
+                Url = new Uri(url, "/emby/system/info?format=json")
+            };
+
+            try
+            {
+                using (var stream = await _httpClient.SendAsync(request).ConfigureAwait(false))
+                {
+                    var systemInfo = JsonSerializer.DeserializeFromStream<SystemInfo>(stream);
+
+                    server.ImportInfo(systemInfo);
+                }
+
+                if (server.UserId != Guid.Empty)
+                {
+                    request.Url = new Uri(url, "/mediabrowser/users/" + server.UserId + "?format=json");
+
+                    using (var stream = await _httpClient.SendAsync(request).ConfigureAwait(false))
+                    {
+                        var localUser = JsonSerializer.DeserializeFromStream<UserDto>(stream);
+
+                        OnLocalUserSignIn(options, localUser);
+                    }
+                }
+            }
+            catch (OperationCanceledException)
+            {
+                throw;
+            }
+            catch (Exception)
+            {
+                // Already logged at a lower level
+
+                server.UserId = Guid.Empty;
+                server.AccessToken = null;
+            }
+        }
+
+        private async Task<PublicSystemInfo> TryConnect(Uri url, int timeout, CancellationToken cancellationToken)
+        {
+            url = new Uri(url, "/emby/system/info/public?format=json");
+
+            try
+            {
+                using (var stream = await _httpClient.SendAsync(new HttpRequest
+                {
+                    Url = url,
+                    CancellationToken = cancellationToken,
+                    Timeout = timeout,
+                    Method = "GET"
+
+                }).ConfigureAwait(false))
+                {
+                    return JsonSerializer.DeserializeFromStream<PublicSystemInfo>(stream);
+                }
+            }
+            catch (OperationCanceledException)
+            {
+                throw;
+            }
+            catch (Exception)
+            {
+                // Already logged at a lower level
+
+                return null;
+            }
+        }
+
+        public void Dispose()
+        {
+            foreach (var client in ApiClients.Values.ToList())
+            {
+                client.Dispose();
+            }
+        }
+
+        public IApiClient GetApiClient(IHasServerId item)
+        {
+            return GetApiClient(item.ServerId);
+        }
+
+        public IApiClient GetApiClient(string serverId)
+        {
+            return ApiClients.Values.OfType<ApiClient>().FirstOrDefault(i => string.Equals(i.ServerInfo.Id, serverId, StringComparison.OrdinalIgnoreCase));
+        }
+
+        public async Task<ConnectionResult> Connect(Uri address, CancellationToken cancellationToken = default)
+        {
+            var publicInfo = await TryConnect(address, 15000, cancellationToken).ConfigureAwait(false);
+
+            if (publicInfo == null)
+            {
+                return new ConnectionResult
+                {
+                    State = ConnectionState.Unavailable
+                };
+            }
+
+            var server = new ServerInfo
+            {
+                Address = address
+            };
+
+            server.ImportInfo(publicInfo);
+
+            return await Connect(server, cancellationToken).ConfigureAwait(false);
+        }
+
+        private async Task OnAuthenticated(IApiClient apiClient,
+            AuthenticationResult result,
+            ConnectionOptions options,
+            bool saveCredentials)
+        {
+            var server = ((ApiClient)apiClient).ServerInfo;
+
+            var credentials = await _credentialProvider.GetServerCredentials().ConfigureAwait(false);
+
+            if (options.UpdateDateLastAccessed)
+            {
+                server.DateLastAccessed = DateTime.UtcNow;
+            }
+
+            if (saveCredentials)
+            {
+                server.UserId = result.User.Id;
+                server.AccessToken = result.AccessToken;
+            }
+            else
+            {
+                server.UserId = Guid.Empty;
+                server.AccessToken = null;
+            }
+
+            credentials.AddOrUpdateServer(server);
+            await _credentialProvider.SaveServerCredentials(credentials).ConfigureAwait(false);
+
+            AfterConnected(apiClient, options);
+
+            OnLocalUserSignIn(options, result.User);
+        }
+
+        private void OnLocalUserSignIn(ConnectionOptions options, UserDto user)
+        {
+            // TODO: Create a separate property for this
+            if (options.UpdateDateLastAccessed)
+            {
+                LocalUserSignIn?.Invoke(this, new GenericEventArgs<UserDto>(user));
+            }
+        }
+
+        private void OnLocalUserSignout(IApiClient apiClient)
+        {
+            LocalUserSignOut?.Invoke(this, new GenericEventArgs<IApiClient>(apiClient));
+        }
+
+        public async Task Logout()
+        {
+            foreach (var client in ApiClients.Values.ToList())
+            {
+                if (!string.IsNullOrEmpty(client.AccessToken))
+                {
+                    await client.Logout().ConfigureAwait(false);
+                    OnLocalUserSignout(client);
+                }
+            }
+
+            var credentials = await _credentialProvider.GetServerCredentials().ConfigureAwait(false);
+
+            var servers = credentials.Servers.ToList();
+
+            foreach (var server in servers)
+            {
+                server.AccessToken = null;
+                server.UserId = Guid.Empty;
+            }
+
+            credentials.Servers = servers;
+
+            await _credentialProvider.SaveServerCredentials(credentials).ConfigureAwait(false);
+        }
+
+        public async Task<ServerInfo> GetServerInfo(string id)
+        {
+            var credentials = await _credentialProvider.GetServerCredentials().ConfigureAwait(false);
+
+            return credentials.Servers.FirstOrDefault(i => i.Id.Equals(id, StringComparison.OrdinalIgnoreCase));
+        }
+    }
+}
diff --git a/Jellyfin.ApiClient/Device.cs b/Jellyfin.ApiClient/Device.cs
new file mode 100644
index 0000000..c0c4e57
--- /dev/null
+++ b/Jellyfin.ApiClient/Device.cs
@@ -0,0 +1,10 @@
+using Jellyfin.ApiClient.Model;
+
+namespace Jellyfin.ApiClient
+{
+    public class Device : IDevice
+    {
+        public string DeviceName { get; set; }
+        public string DeviceId { get; set; }
+    }
+}
diff --git a/Emby.ApiClient/ICredentialProvider.cs b/Jellyfin.ApiClient/ICredentialProvider.cs
similarity index 84%
rename from Emby.ApiClient/ICredentialProvider.cs
rename to Jellyfin.ApiClient/ICredentialProvider.cs
index 564c4b9..d3f8417 100644
--- a/Emby.ApiClient/ICredentialProvider.cs
+++ b/Jellyfin.ApiClient/ICredentialProvider.cs
@@ -1,8 +1,7 @@
-using MediaBrowser.Model.ApiClient;
+using Jellyfin.ApiClient.Model;
 using System.Threading.Tasks;
-using Emby.ApiClient.Model;
 
-namespace Emby.ApiClient
+namespace Jellyfin.ApiClient
 {
     public interface ICredentialProvider
     {
diff --git a/Emby.ApiClient/IServerLocator.cs b/Jellyfin.ApiClient/IServerLocator.cs
similarity index 78%
rename from Emby.ApiClient/IServerLocator.cs
rename to Jellyfin.ApiClient/IServerLocator.cs
index 5d7e78a..ef24f2f 100644
--- a/Emby.ApiClient/IServerLocator.cs
+++ b/Jellyfin.ApiClient/IServerLocator.cs
@@ -3,13 +3,13 @@
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace Emby.ApiClient
+namespace Jellyfin.ApiClient
 {
     public interface IServerLocator
     {
         /// <summary>
         /// Attemps to discover the server within a local network
         /// </summary>
-        Task<List<ServerDiscoveryInfo>> FindServers(int timeoutMs, CancellationToken cancellationToken = default(CancellationToken));
+        Task<List<ServerDiscoveryInfo>> FindServers(int timeoutMs, CancellationToken cancellationToken = default);
     }
 }
\ No newline at end of file
diff --git a/Jellyfin.ApiClient/Jellyfin.ApiClient.csproj b/Jellyfin.ApiClient/Jellyfin.ApiClient.csproj
new file mode 100644
index 0000000..4736a81
--- /dev/null
+++ b/Jellyfin.ApiClient/Jellyfin.ApiClient.csproj
@@ -0,0 +1,36 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>netstandard2.0</TargetFrameworks>
+    <AssemblyVersion>1.1.1.0</AssemblyVersion>
+    <FileVersion>1.1.1.0</FileVersion>
+    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    <PackageId>Jellyfin.ApiClient</PackageId>
+    <Version>10.4.3</Version>
+    <Authors>Jellyfin</Authors>
+    <Company>Jellyfin</Company>
+    <Description>Api libraries for connecting to Jellyfin Server.</Description>
+    <PackageProjectUrl>https://github.com/Jellyfin/jellyfin-apiclient-csharp</PackageProjectUrl>
+    <RepositoryUrl>https://github.com/Jellyfin/jellyfin-apiclient-csharp</RepositoryUrl>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <PackageIcon></PackageIcon>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
+    <PackageReference Include="WebSocket4Net" Version="0.15.2" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
+    <PackageReference Include="Jellyfin.Common">
+      <Version>10.4.3</Version>
+    </PackageReference>
+    <PackageReference Include="Jellyfin.Controller">
+      <Version>10.4.3</Version>
+    </PackageReference>
+    <PackageReference Include="Jellyfin.Model">
+      <Version>10.4.3</Version>
+    </PackageReference>
+  </ItemGroup>
+
+</Project>
diff --git a/Jellyfin.ApiClient/Model/AuthenticationRequest.cs b/Jellyfin.ApiClient/Model/AuthenticationRequest.cs
new file mode 100644
index 0000000..8ac3cfe
--- /dev/null
+++ b/Jellyfin.ApiClient/Model/AuthenticationRequest.cs
@@ -0,0 +1,8 @@
+namespace Jellyfin.ApiClient.Model
+{
+    class AuthenticationRequest
+    {
+        public string Username { get; set; }
+        public string Pw { get; set; }
+    }
+}
diff --git a/Emby.ApiClient/Model/ConnectionOptions.cs b/Jellyfin.ApiClient/Model/ConnectionOptions.cs
similarity index 96%
rename from Emby.ApiClient/Model/ConnectionOptions.cs
rename to Jellyfin.ApiClient/Model/ConnectionOptions.cs
index 0699464..8991291 100644
--- a/Emby.ApiClient/Model/ConnectionOptions.cs
+++ b/Jellyfin.ApiClient/Model/ConnectionOptions.cs
@@ -1,5 +1,4 @@
-
-namespace Emby.ApiClient.Model
+namespace Jellyfin.ApiClient.Model
 {
     public class ConnectionOptions
     {
diff --git a/Emby.ApiClient/Model/ConnectionResult.cs b/Jellyfin.ApiClient/Model/ConnectionResult.cs
similarity index 74%
rename from Emby.ApiClient/Model/ConnectionResult.cs
rename to Jellyfin.ApiClient/Model/ConnectionResult.cs
index 2574e4e..5e16226 100644
--- a/Emby.ApiClient/Model/ConnectionResult.cs
+++ b/Jellyfin.ApiClient/Model/ConnectionResult.cs
@@ -1,15 +1,13 @@
-using MediaBrowser.Model.Connect;
-using MediaBrowser.Model.Dto;
+using MediaBrowser.Model.Dto;
 using System.Collections.Generic;
 
-namespace Emby.ApiClient.Model
+namespace Jellyfin.ApiClient.Model
 {
     public class ConnectionResult
     {
         public ConnectionState State { get; set; }
         public List<ServerInfo> Servers { get; set; }
         public IApiClient ApiClient { get; set; }
-        public ConnectUser ConnectUser { get; set; }
         public UserDto OfflineUser { get; set; }
 
         public ConnectionResult()
diff --git a/Emby.ApiClient/Model/ConnectionState.cs b/Jellyfin.ApiClient/Model/ConnectionState.cs
similarity index 86%
rename from Emby.ApiClient/Model/ConnectionState.cs
rename to Jellyfin.ApiClient/Model/ConnectionState.cs
index 8fab06a..a266737 100644
--- a/Emby.ApiClient/Model/ConnectionState.cs
+++ b/Jellyfin.ApiClient/Model/ConnectionState.cs
@@ -1,4 +1,4 @@
-namespace Emby.ApiClient.Model
+namespace Jellyfin.ApiClient.Model
 {
     public enum ConnectionState
     {
diff --git a/Jellyfin.ApiClient/Model/Dto/ChannelInfoDto.cs b/Jellyfin.ApiClient/Model/Dto/ChannelInfoDto.cs
new file mode 100644
index 0000000..23cb7cb
--- /dev/null
+++ b/Jellyfin.ApiClient/Model/Dto/ChannelInfoDto.cs
@@ -0,0 +1,120 @@
+using MediaBrowser.Model.Dto;
+using MediaBrowser.Model.Entities;
+using MediaBrowser.Model.Library;
+using MediaBrowser.Model.LiveTv;
+using System.Collections.Generic;
+
+namespace Jellyfin.ApiClient.Model.Dto
+{
+    /// <summary>
+    /// Class ChannelInfoDto
+    /// </summary>
+    public class ChannelInfoDto : IItemDto, IHasServerId
+    {
+        /// <summary>
+        /// Gets or sets the name.
+        /// </summary>
+        /// <value>The name.</value>
+        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 identifier.
+        /// </summary>
+        /// <value>The identifier.</value>
+        public string Id { get; set; }
+
+        /// <summary>
+        /// Gets or sets the external identifier.
+        /// </summary>
+        /// <value>The external identifier.</value>
+        public string ExternalId { get; set; }
+
+        /// <summary>
+        /// Gets or sets the media sources.
+        /// </summary>
+        /// <value>The media sources.</value>
+        public MediaSourceInfo[] MediaSources { get; set; }
+
+        /// <summary>
+        /// Gets or sets the image tags.
+        /// </summary>
+        /// <value>The image tags.</value>
+        public Dictionary<ImageType, string> ImageTags { get; set; }
+
+        /// <summary>
+        /// Gets or sets the number.
+        /// </summary>
+        /// <value>The number.</value>
+        public string Number { get; set; }
+
+        /// <summary>
+        /// Gets or sets the play access.
+        /// </summary>
+        /// <value>The play access.</value>
+        public PlayAccess PlayAccess { get; set; }
+
+        /// <summary>
+        /// Gets or sets the name of the service.
+        /// </summary>
+        /// <value>The name of the service.</value>
+        public string ServiceName { get; set; }
+
+        /// <summary>
+        /// Gets or sets the type of the channel.
+        /// </summary>
+        /// <value>The type of the channel.</value>
+        public ChannelType ChannelType { get; set; }
+
+        /// <summary>
+        /// Gets or sets the type.
+        /// </summary>
+        /// <value>The type.</value>
+        public string Type { 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 user data.
+        /// </summary>
+        /// <value>The user data.</value>
+        public UserItemDataDto UserData { get; set; }
+
+        /// <summary>
+        /// Gets or sets the now playing program.
+        /// </summary>
+        /// <value>The now playing program.</value>
+        public BaseItemDto CurrentProgram { get; set; }
+
+        /// <summary>
+        /// Gets or sets the primary image aspect ratio, after image enhancements.
+        /// </summary>
+        /// <value>The primary image aspect ratio.</value>
+        public double? PrimaryImageAspectRatio { get; set; }
+
+        /// <summary>
+        /// Gets a value indicating whether this instance has primary image.
+        /// </summary>
+        /// <value><c>true</c> if this instance has primary image; otherwise, <c>false</c>.</value>
+        [IgnoreDataMember]
+        public bool HasPrimaryImage
+        {
+            get { return ImageTags != null && ImageTags.ContainsKey(ImageType.Primary); }
+        }
+
+        public ChannelInfoDto()
+        {
+            ImageTags = new Dictionary<ImageType, string>();
+            MediaSources = new MediaSourceInfo[] { };
+        }
+    }
+}
diff --git a/Jellyfin.ApiClient/Model/Dto/SubtitleDownloadOptions.cs b/Jellyfin.ApiClient/Model/Dto/SubtitleDownloadOptions.cs
new file mode 100644
index 0000000..bddc8cc
--- /dev/null
+++ b/Jellyfin.ApiClient/Model/Dto/SubtitleDownloadOptions.cs
@@ -0,0 +1,33 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Jellyfin.ApiClient.Model.Dto
+{
+    public class SubtitleDownloadOptions
+    {
+        /// <summary>
+        /// Gets or sets the item identifier.
+        /// </summary>
+        /// <value>The item identifier.</value>
+        public string ItemId { get; set; }
+
+        /// <summary>
+        /// Gets or sets the media source identifier.
+        /// </summary>
+        /// <value>The media source identifier.</value>
+        public string MediaSourceId { get; set; }
+
+        /// <summary>
+        /// Gets or sets the index of the stream.
+        /// </summary>
+        /// <value>The index of the stream.</value>
+        public int StreamIndex { get; set; }
+
+        /// <summary>
+        /// Gets or sets the format.
+        /// </summary>
+        /// <value>The format.</value>
+        public string Format { get; set; }
+    }
+}
diff --git a/Emby.ApiClient/Model/IApiClient.cs b/Jellyfin.ApiClient/Model/IApiClient.cs
similarity index 80%
rename from Emby.ApiClient/Model/IApiClient.cs
rename to Jellyfin.ApiClient/Model/IApiClient.cs
index e05c4bd..ddc4b51 100644
--- a/Emby.ApiClient/Model/IApiClient.cs
+++ b/Jellyfin.ApiClient/Model/IApiClient.cs
@@ -1,4 +1,8 @@
-using MediaBrowser.Model.Channels;
+using Jellyfin.ApiClient.Model.Dto;
+using Jellyfin.ApiClient.Model.Notifications;
+using Jellyfin.ApiClient.Model.Querying;
+using MediaBrowser.Controller.Authentication;
+using MediaBrowser.Model.Channels;
 using MediaBrowser.Model.Configuration;
 using MediaBrowser.Model.Devices;
 using MediaBrowser.Model.Dto;
@@ -8,24 +12,23 @@
 using MediaBrowser.Model.LiveTv;
 using MediaBrowser.Model.MediaInfo;
 using MediaBrowser.Model.Net;
-using MediaBrowser.Model.Notifications;
 using MediaBrowser.Model.Playlists;
 using MediaBrowser.Model.Plugins;
 using MediaBrowser.Model.Querying;
 using MediaBrowser.Model.Search;
 using MediaBrowser.Model.Serialization;
 using MediaBrowser.Model.Session;
-using MediaBrowser.Model.Sync;
 using MediaBrowser.Model.System;
 using MediaBrowser.Model.Tasks;
-using MediaBrowser.Model.Users;
 using System;
 using System.Collections.Generic;
+using System.Collections.Specialized;
 using System.IO;
+using System.Net;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace Emby.ApiClient.Model
+namespace Jellyfin.ApiClient.Model
 {
     /// <summary>
     /// Interface IApiClient
@@ -41,15 +44,8 @@ public interface IApiClient : IServerEvents, IDisposable
         /// Gets the API URL.
         /// </summary>
         /// <param name="handler">The handler.</param>
-        /// <returns>System.String.</returns>
-        string GetApiUrl(string handler);
-
-        /// <summary>
-        /// Gets the game system summaries async.
-        /// </summary>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        /// <returns>Task{List{GameSystemSummary}}.</returns>
-        Task<List<GameSystemSummary>> GetGameSystemSummariesAsync(CancellationToken cancellationToken = default(CancellationToken));
+        /// <returns>System.Uri.</returns>
+        Uri GetApiUrl(Uri handler);
 
         /// <summary>
         /// Gets the async.
@@ -58,7 +54,7 @@ public interface IApiClient : IServerEvents, IDisposable
         /// <param name="url">The URL.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>Task{``0}.</returns>
-        Task<T> GetAsync<T>(string url, CancellationToken cancellationToken = default(CancellationToken))
+        Task<T> GetAsync<T>(Uri url, CancellationToken cancellationToken = default)
             where T : class;
 
         /// <summary>
@@ -67,7 +63,7 @@ public interface IApiClient : IServerEvents, IDisposable
         /// <param name="capabilities">The capabilities.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>Task.</returns>
-        Task ReportCapabilities(ClientCapabilities capabilities, CancellationToken cancellationToken = default(CancellationToken));
+        Task ReportCapabilities(ClientCapabilities capabilities, CancellationToken cancellationToken = default);
 
         /// <summary>
         /// Logouts this instance.
@@ -81,7 +77,7 @@ public interface IApiClient : IServerEvents, IDisposable
         /// <param name="userId">The user id.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>Task{List{ItemIndex}}.</returns>
-        Task<List<ItemIndex>> GetGamePlayerIndex(string userId, CancellationToken cancellationToken = default(CancellationToken));
+        Task<List<ItemIndex>> GetGamePlayerIndex(string userId, CancellationToken cancellationToken = default);
 
         /// <summary>
         /// Gets the index of the year.
@@ -90,7 +86,7 @@ public interface IApiClient : IServerEvents, IDisposable
         /// <param name="includeItemTypes">The include item types.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>Task{List{ItemIndex}}.</returns>
-        Task<List<ItemIndex>> GetYearIndex(string userId, string[] includeItemTypes, CancellationToken cancellationToken = default(CancellationToken));
+        Task<List<ItemIndex>> GetYearIndex(string userId, string[] includeItemTypes, CancellationToken cancellationToken = default);
 
         /// <summary>
         /// Gets the critic reviews.
@@ -100,7 +96,7 @@ public interface IApiClient : IServerEvents, IDisposable
         /// <param name="startIndex">The start index.</param>
         /// <param name="limit">The limit.</param>
         /// <returns>Task{ItemReviewsResult}.</returns>
-        Task<QueryResult<ItemReview>> GetCriticReviews(string itemId, CancellationToken cancellationToken = default(CancellationToken), int? startIndex = null, int? limit = null);
+        Task<QueryResult<ItemReview>> GetCriticReviews(string itemId, CancellationToken cancellationToken = default, int? startIndex = null, int? limit = null);
 
         /// <summary>
         /// Gets the theme songs async.
@@ -110,7 +106,7 @@ public interface IApiClient : IServerEvents, IDisposable
         /// <param name="inheritFromParents">if set to <c>true</c> [inherit from parents].</param>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>Task{ThemeMediaResult}.</returns>
-        Task<ThemeMediaResult> GetThemeSongsAsync(string userId, string itemId, bool inheritFromParents, CancellationToken cancellationToken = default(CancellationToken));
+        Task<ThemeMediaResult> GetThemeSongsAsync(string userId, string itemId, bool inheritFromParents, CancellationToken cancellationToken = default);
 
         /// <summary>
         /// Gets the search hints async.
@@ -137,7 +133,7 @@ public interface IApiClient : IServerEvents, IDisposable
         /// <param name="inheritFromParents">if set to <c>true</c> [inherit from parents].</param>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>Task{ThemeMediaResult}.</returns>
-        Task<ThemeMediaResult> GetThemeVideosAsync(string userId, string itemId, bool inheritFromParents, CancellationToken cancellationToken = default(CancellationToken));
+        Task<ThemeMediaResult> GetThemeVideosAsync(string userId, string itemId, bool inheritFromParents, CancellationToken cancellationToken = default);
 
         /// <summary>
         /// Gets all theme media async.
@@ -147,7 +143,7 @@ public interface IApiClient : IServerEvents, IDisposable
         /// <param name="inheritFromParents">if set to <c>true</c> [inherit from parents].</param>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>Task{AllThemeMediaResult}.</returns>
-        Task<AllThemeMediaResult> GetAllThemeMediaAsync(string userId, string itemId, bool inheritFromParents, CancellationToken cancellationToken = default(CancellationToken));
+        Task<AllThemeMediaResult> GetAllThemeMediaAsync(string userId, string itemId, bool inheritFromParents, CancellationToken cancellationToken = default);
 
         /// <summary>
         /// Marks the notifications read.
@@ -179,7 +175,7 @@ public interface IApiClient : IServerEvents, IDisposable
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>Task{Stream}.</returns>
         /// <exception cref="ArgumentNullException">url</exception>
-        Task<Stream> GetImageStreamAsync(string url, CancellationToken cancellationToken = default(CancellationToken));
+        Task<Stream> GetImageStreamAsync(Uri url, CancellationToken cancellationToken = default);
 
         /// <summary>
         /// Gets the stream.
@@ -187,7 +183,7 @@ public interface IApiClient : IServerEvents, IDisposable
         /// <param name="url">The URL.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>Task&lt;Stream&gt;.</returns>
-        Task<Stream> GetStream(string url, CancellationToken cancellationToken = default(CancellationToken));
+        Task<Stream> GetStream(Uri url, CancellationToken cancellationToken = default);
 
         /// <summary>
         /// Gets the response.
@@ -195,7 +191,7 @@ public interface IApiClient : IServerEvents, IDisposable
         /// <param name="url">The URL.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>Task&lt;HttpResponse&gt;.</returns>
-        Task<HttpResponse> GetResponse(string url, CancellationToken cancellationToken = default(CancellationToken));
+        Task<HttpWebResponse> GetResponse(Uri url, CancellationToken cancellationToken = default);
 
         /// <summary>
         /// Updates the user configuration.
@@ -264,7 +260,7 @@ public interface IApiClient : IServerEvents, IDisposable
         /// </summary>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>Task{UserDto[]}.</returns>
-        Task<UserDto[]> GetPublicUsersAsync(CancellationToken cancellationToken = default(CancellationToken));
+        Task<UserDto[]> GetPublicUsersAsync(CancellationToken cancellationToken = default);
 
         /// <summary>
         /// Gets active client sessions.
@@ -277,7 +273,7 @@ public interface IApiClient : IServerEvents, IDisposable
         /// Gets the client session asynchronous.
         /// </summary>
         /// <returns>Task{SessionInfoDto}.</returns>
-        Task<SessionInfoDto> GetCurrentSessionAsync(CancellationToken cancellationToken = default(CancellationToken));
+        Task<SessionInfoDto> GetCurrentSessionAsync(CancellationToken cancellationToken = default);
 
         /// <summary>
         /// Gets the item counts async.
@@ -292,7 +288,7 @@ public interface IApiClient : IServerEvents, IDisposable
         /// <param name="query">The query.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>Task{ItemsResult}.</returns>
-        Task<QueryResult<BaseItemDto>> GetEpisodesAsync(EpisodeQuery query, CancellationToken cancellationToken = default(CancellationToken));
+        Task<QueryResult<BaseItemDto>> GetEpisodesAsync(EpisodeQuery query, CancellationToken cancellationToken = default);
 
         /// <summary>
         /// Gets the seasons asynchronous.
@@ -300,9 +296,7 @@ public interface IApiClient : IServerEvents, IDisposable
         /// <param name="query">The query.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>Task{ItemsResult}.</returns>
-        Task<QueryResult<BaseItemDto>> GetSeasonsAsync(SeasonQuery query, CancellationToken cancellationToken = default(CancellationToken));
-
-        Task<PluginSecurityInfo> GetRegistrationInfo();
+        Task<QueryResult<BaseItemDto>> GetSeasonsAsync(SeasonQuery query, CancellationToken cancellationToken = default);
 
         /// <summary>
         /// Queries for items
@@ -311,7 +305,7 @@ public interface IApiClient : IServerEvents, IDisposable
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>Task{ItemsResult}.</returns>
         /// <exception cref="ArgumentNullException">query</exception>
-        Task<QueryResult<BaseItemDto>> GetItemsAsync(ItemQuery query, CancellationToken cancellationToken = default(CancellationToken));
+        Task<QueryResult<BaseItemDto>> GetItemsAsync(ItemQuery query, CancellationToken cancellationToken = default);
 
         /// <summary>
         /// Gets the user views.
@@ -319,7 +313,7 @@ public interface IApiClient : IServerEvents, IDisposable
         /// <param name="userId">The user identifier.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>Task&lt;ItemsResult&gt;.</returns>
-        Task<QueryResult<BaseItemDto>> GetUserViews(string userId, CancellationToken cancellationToken = default(CancellationToken));
+        Task<QueryResult<BaseItemDto>> GetUserViews(string userId, CancellationToken cancellationToken = default);
 
         /// <summary>
         /// Gets the instant mix from item asynchronous.
@@ -334,7 +328,7 @@ public interface IApiClient : IServerEvents, IDisposable
         /// <param name="query">The query.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>Task{ItemsResult}.</returns>
-        Task<QueryResult<BaseItemDto>> GetSimilarItemsAsync(SimilarItemsQuery query, CancellationToken cancellationToken = default(CancellationToken));
+        Task<QueryResult<BaseItemDto>> GetSimilarItemsAsync(SimilarItemsQuery query, CancellationToken cancellationToken = default);
 
         /// <summary>
         /// Gets the people async.
@@ -343,7 +337,7 @@ public interface IApiClient : IServerEvents, IDisposable
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>Task{ItemsResult}.</returns>
         /// <exception cref="ArgumentNullException">userId</exception>
-        Task<QueryResult<BaseItemDto>> GetPeopleAsync(PersonsQuery query, CancellationToken cancellationToken = default(CancellationToken));
+        Task<QueryResult<BaseItemDto>> GetPeopleAsync(PersonsQuery query, CancellationToken cancellationToken = default);
 
         /// <summary>
         /// Gets the artists.
@@ -366,7 +360,7 @@ public interface IApiClient : IServerEvents, IDisposable
         /// <param name="query">The query.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>Task{ItemsResult}.</returns>
-        Task<QueryResult<BaseItemDto>> GetNextUpEpisodesAsync(NextUpQuery query, CancellationToken cancellationToken = default(CancellationToken));
+        Task<QueryResult<BaseItemDto>> GetNextUpEpisodesAsync(NextUpQuery query, CancellationToken cancellationToken = default);
 
         /// <summary>
         /// Gets the upcoming episodes asynchronous.
@@ -400,14 +394,14 @@ public interface IApiClient : IServerEvents, IDisposable
         /// </summary>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>Task{SystemInfo}.</returns>
-        Task<SystemInfo> GetSystemInfoAsync(CancellationToken cancellationToken = default(CancellationToken));
+        Task<SystemInfo> GetSystemInfoAsync(CancellationToken cancellationToken = default);
 
         /// <summary>
         /// Gets the public system information asynchronous.
         /// </summary>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>Task&lt;PublicSystemInfo&gt;.</returns>
-        Task<PublicSystemInfo> GetPublicSystemInfoAsync(CancellationToken cancellationToken = default(CancellationToken));
+        Task<PublicSystemInfo> GetPublicSystemInfoAsync(CancellationToken cancellationToken = default);
 
         /// <summary>
         /// Gets a list of plugins installed on the server
@@ -641,6 +635,9 @@ public interface IApiClient : IServerEvents, IDisposable
         /// <exception cref="ArgumentNullException">itemId</exception>
         Task<UserItemDataDto> UpdateUserItemRatingAsync(string itemId, string userId, bool likes);
 
+
+        event EventHandler<GenericEventArgs<AuthenticationResult>> OnAuthenticated;
+
         /// <summary>
         /// Authenticates a user and returns the result
         /// </summary>
@@ -676,7 +673,7 @@ Task<AuthenticationResult> AuthenticateUserAsync(string username,
         /// <param name="client">The client.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>Task{BaseItemDto}.</returns>
-        Task<DisplayPreferences> GetDisplayPreferencesAsync(string id, string userId, string client, CancellationToken cancellationToken = default(CancellationToken));
+        Task<DisplayPreferences> GetDisplayPreferencesAsync(string id, string userId, string client, CancellationToken cancellationToken = default);
 
         /// <summary>
         /// Updates display preferences for a user
@@ -687,7 +684,7 @@ Task<AuthenticationResult> AuthenticateUserAsync(string username,
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>Task{DisplayPreferences}.</returns>
         /// <exception cref="System.ArgumentNullException">userId</exception>
-        Task UpdateDisplayPreferencesAsync(DisplayPreferences displayPreferences, string userId, string client, CancellationToken cancellationToken = default(CancellationToken));
+        Task UpdateDisplayPreferencesAsync(DisplayPreferences displayPreferences, string userId, string client, CancellationToken cancellationToken = default);
 
         /// <summary>
         /// Posts a set of data to a url, and deserializes the return stream into T
@@ -697,7 +694,7 @@ Task<AuthenticationResult> AuthenticateUserAsync(string username,
         /// <param name="args">The args.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>Task{``0}.</returns>
-        Task<T> PostAsync<T>(string url, Dictionary<string, string> args, CancellationToken cancellationToken = default(CancellationToken))
+        Task<T> PostAsync<T>(Uri url, NameValueCollection args, CancellationToken cancellationToken = default)
             where T : class;
 
         /// <summary>
@@ -705,7 +702,7 @@ Task<AuthenticationResult> AuthenticateUserAsync(string username,
         /// </summary>
         /// <param name="url">The URL.</param>
         /// <returns>Task{Stream}.</returns>
-        Task<Stream> GetSerializedStreamAsync(string url);
+        Task<Stream> GetSerializedStreamAsync(Uri url);
 
         /// <summary>
         /// Gets the json serializer.
@@ -717,7 +714,7 @@ Task<AuthenticationResult> AuthenticateUserAsync(string username,
         /// Gets or sets the server address
         /// </summary>
         /// <value>The server address.</value>
-        string ServerAddress { get; }
+        Uri ServerAddress { get; }
 
         /// <summary>
         /// Gets or sets the type of the client.
@@ -747,7 +744,7 @@ Task<AuthenticationResult> AuthenticateUserAsync(string username,
         /// Gets or sets the current user id.
         /// </summary>
         /// <value>The current user id.</value>
-        string CurrentUserId { get; }
+        Guid CurrentUserId { get; }
 
         /// <summary>
         /// Gets the access token.
@@ -760,7 +757,7 @@ Task<AuthenticationResult> AuthenticateUserAsync(string username,
         /// </summary>
         /// <param name="accessToken">The access token.</param>
         /// <param name="userId">The user identifier.</param>
-        void SetAuthenticationInfo(string accessToken, string userId);
+        void SetAuthenticationInfo(string accessToken, Guid userId);
 
         /// <summary>
         /// Sets the authentication information.
@@ -778,36 +775,7 @@ Task<AuthenticationResult> AuthenticateUserAsync(string username,
         /// </summary>
         /// <param name="address">The address.</param>
         /// <param name="keepExistingAuth">if set to <c>true</c> [keep existing authentication].</param>
-        void ChangeServerLocation(string address, bool keepExistingAuth = false);
-
-        /// <summary>
-        /// Starts the receiving synchronize job updates.
-        /// </summary>
-        /// <param name="intervalMs">The interval ms.</param>
-        /// <param name="jobId">The job identifier.</param>
-        /// <returns>Task.</returns>
-        Task StartReceivingSyncJobUpdates(int intervalMs, string jobId);
-
-        /// <summary>
-        /// Stops the receiving synchronize job updates.
-        /// </summary>
-        /// <returns>Task.</returns>
-        Task StopReceivingSyncJobUpdates();
-
-        /// <summary>
-        /// Starts the receiving synchronize jobs updates.
-        /// </summary>
-        /// <param name="intervalMs">The interval ms.</param>
-        /// <param name="userId">The user identifier.</param>
-        /// <param name="targetId">The target identifier.</param>
-        /// <returns>Task.</returns>
-        Task StartReceivingSyncJobsUpdates(int intervalMs, string userId, string targetId);
-
-        /// <summary>
-        /// Stops the receiving synchronize jobs updates.
-        /// </summary>
-        /// <returns>Task.</returns>
-        Task StopReceivingSyncJobsUpdates();
+        void ChangeServerLocation(Uri address, bool keepExistingAuth = false);
 
         /// <summary>
         /// Starts the receiving session updates.
@@ -829,7 +797,7 @@ Task<AuthenticationResult> AuthenticateUserAsync(string username,
         /// <param name="options">The options.</param>
         /// <returns>System.String.</returns>
         /// <exception cref="ArgumentNullException">item</exception>
-        string GetImageUrl(BaseItemDto item, ImageOptions options);
+        Uri GetImageUrl(BaseItemDto item, ImageOptions options);
 
         /// <summary>
         /// Gets the image URL.
@@ -837,14 +805,14 @@ Task<AuthenticationResult> AuthenticateUserAsync(string username,
         /// <param name="item">The item.</param>
         /// <param name="options">The options.</param>
         /// <returns>System.String.</returns>
-        string GetImageUrl(ChannelInfoDto item, ImageOptions options);
+        Uri GetImageUrl(ChannelInfoDto item, ImageOptions options);
 
         /// <summary>
         /// Gets the subtitle URL.
         /// </summary>
         /// <param name="options">The options.</param>
         /// <returns>System.String.</returns>
-        string GetSubtitleUrl(SubtitleDownloadOptions options);
+        Uri GetSubtitleUrl(SubtitleDownloadOptions options);
 
         /// <summary>
         /// Gets an image url that can be used to download an image from the api
@@ -853,7 +821,7 @@ Task<AuthenticationResult> AuthenticateUserAsync(string username,
         /// <param name="options">The options.</param>
         /// <returns>System.String.</returns>
         /// <exception cref="ArgumentNullException">itemId</exception>
-        string GetImageUrl(string itemId, ImageOptions options);
+        Uri GetImageUrl(string itemId, ImageOptions options);
 
         /// <summary>
         /// Gets the user image URL.
@@ -862,7 +830,7 @@ Task<AuthenticationResult> AuthenticateUserAsync(string username,
         /// <param name="options">The options.</param>
         /// <returns>System.String.</returns>
         /// <exception cref="ArgumentNullException">user</exception>
-        string GetUserImageUrl(UserDto user, ImageOptions options);
+        Uri GetUserImageUrl(UserDto user, ImageOptions options);
 
         /// <summary>
         /// Gets an image url that can be used to download an image from the api
@@ -871,7 +839,7 @@ Task<AuthenticationResult> AuthenticateUserAsync(string username,
         /// <param name="options">The options.</param>
         /// <returns>System.String.</returns>
         /// <exception cref="ArgumentNullException">userId</exception>
-        string GetUserImageUrl(string userId, ImageOptions options);
+        Uri GetUserImageUrl(Guid userId, ImageOptions options);
 
         /// <summary>
         /// Gets the person image URL.
@@ -880,7 +848,7 @@ Task<AuthenticationResult> AuthenticateUserAsync(string username,
         /// <param name="options">The options.</param>
         /// <returns>System.String.</returns>
         /// <exception cref="ArgumentNullException">item</exception>
-        string GetPersonImageUrl(BaseItemPerson item, ImageOptions options);
+        Uri GetPersonImageUrl(BaseItemPerson item, ImageOptions options);
 
         /// <summary>
         /// This is a helper to get a list of backdrop url's from a given ApiBaseItemWrapper. If the actual item does not have any backdrops it will return backdrops from the first parent that does.
@@ -889,7 +857,7 @@ Task<AuthenticationResult> AuthenticateUserAsync(string username,
         /// <param name="options">The options.</param>
         /// <returns>System.String[][].</returns>
         /// <exception cref="ArgumentNullException">item</exception>
-        string[] GetBackdropImageUrls(BaseItemDto item, ImageOptions options);
+        Uri[] GetBackdropImageUrls(BaseItemDto item, ImageOptions options);
 
         /// <summary>
         /// This is a helper to get the logo image url from a given ApiBaseItemWrapper. If the actual item does not have a logo, it will return the logo from the first parent that does, or null.
@@ -898,7 +866,7 @@ Task<AuthenticationResult> AuthenticateUserAsync(string username,
         /// <param name="options">The options.</param>
         /// <returns>System.String.</returns>
         /// <exception cref="ArgumentNullException">item</exception>
-        string GetLogoImageUrl(BaseItemDto item, ImageOptions options);
+        Uri GetLogoImageUrl(BaseItemDto item, ImageOptions options);
 
         /// <summary>
         /// Gets the art image URL.
@@ -906,7 +874,7 @@ Task<AuthenticationResult> AuthenticateUserAsync(string username,
         /// <param name="item">The item.</param>
         /// <param name="options">The options.</param>
         /// <returns>System.String.</returns>
-        string GetArtImageUrl(BaseItemDto item, ImageOptions options);
+        Uri GetArtImageUrl(BaseItemDto item, ImageOptions options);
 
         /// <summary>
         /// Gets the thumb image URL.
@@ -914,14 +882,14 @@ Task<AuthenticationResult> AuthenticateUserAsync(string username,
         /// <param name="item">The item.</param>
         /// <param name="options">The options.</param>
         /// <returns>System.String.</returns>
-        string GetThumbImageUrl(BaseItemDto item, ImageOptions options);
+        Uri GetThumbImageUrl(BaseItemDto item, ImageOptions options);
 
         /// <summary>
         /// Gets the live tv information asynchronous.
         /// </summary>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>Task{LiveTvInfo}.</returns>
-        Task<LiveTvInfo> GetLiveTvInfoAsync(CancellationToken cancellationToken = default(CancellationToken));
+        Task<LiveTvInfo> GetLiveTvInfoAsync(CancellationToken cancellationToken = default);
 
         /// <summary>
         /// Gets the live tv channels asynchronous.
@@ -929,7 +897,7 @@ Task<AuthenticationResult> AuthenticateUserAsync(string username,
         /// <param name="query">The query.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>Task{LiveTvInfo}.</returns>
-        Task<QueryResult<ChannelInfoDto>> GetLiveTvChannelsAsync(LiveTvChannelQuery query, CancellationToken cancellationToken = default(CancellationToken));
+        Task<QueryResult<ChannelInfoDto>> GetLiveTvChannelsAsync(LiveTvChannelQuery query, CancellationToken cancellationToken = default);
 
         /// <summary>
         /// Gets the live tv channel asynchronous.
@@ -938,7 +906,7 @@ Task<AuthenticationResult> AuthenticateUserAsync(string username,
         /// <param name="userId">The user identifier.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>Task{ChannelInfoDto}.</returns>
-        Task<ChannelInfoDto> GetLiveTvChannelAsync(string id, string userId, CancellationToken cancellationToken = default(CancellationToken));
+        Task<ChannelInfoDto> GetLiveTvChannelAsync(string id, string userId, CancellationToken cancellationToken = default);
 
         /// <summary>
         /// Gets the live tv recordings asynchronous.
@@ -946,7 +914,7 @@ Task<AuthenticationResult> AuthenticateUserAsync(string username,
         /// <param name="query">The query.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>Task{QueryResult{RecordingInfoDto}}.</returns>
-        Task<QueryResult<BaseItemDto>> GetLiveTvRecordingsAsync(RecordingQuery query, CancellationToken cancellationToken = default(CancellationToken));
+        Task<QueryResult<BaseItemDto>> GetLiveTvRecordingsAsync(RecordingQuery query, CancellationToken cancellationToken = default);
 
         /// <summary>
         /// Gets the live tv recording asynchronous.
@@ -955,7 +923,7 @@ Task<AuthenticationResult> AuthenticateUserAsync(string username,
         /// <param name="userId">The user identifier.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>Task{RecordingInfoDto}.</returns>
-        Task<BaseItemDto> GetLiveTvRecordingAsync(string id, string userId, CancellationToken cancellationToken = default(CancellationToken));
+        Task<BaseItemDto> GetLiveTvRecordingAsync(string id, string userId, CancellationToken cancellationToken = default);
 
         /// <summary>
         /// Gets the live tv recording groups asynchronous.
@@ -963,7 +931,7 @@ Task<AuthenticationResult> AuthenticateUserAsync(string username,
         /// <param name="query">The query.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>Task{QueryResult{RecordingGroupDto}}.</returns>
-        Task<QueryResult<BaseItemDto>> GetLiveTvRecordingGroupsAsync(RecordingGroupQuery query, CancellationToken cancellationToken = default(CancellationToken));
+        Task<QueryResult<BaseItemDto>> GetLiveTvRecordingGroupsAsync(RecordingGroupQuery query, CancellationToken cancellationToken = default);
 
         /// <summary>
         /// Gets the live tv recording group asynchronous.
@@ -972,7 +940,7 @@ Task<AuthenticationResult> AuthenticateUserAsync(string username,
         /// <param name="userId">The user identifier.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>Task{RecordingGroupDto}.</returns>
-        Task<BaseItemDto> GetLiveTvRecordingGroupAsync(string id, string userId, CancellationToken cancellationToken = default(CancellationToken));
+        Task<BaseItemDto> GetLiveTvRecordingGroupAsync(string id, string userId, CancellationToken cancellationToken = default);
 
         /// <summary>
         /// Gets the live tv timers asynchronous.
@@ -980,7 +948,7 @@ Task<AuthenticationResult> AuthenticateUserAsync(string username,
         /// <param name="query">The query.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>Task{QueryResult{TimerInfoDto}}.</returns>
-        Task<QueryResult<TimerInfoDto>> GetLiveTvTimersAsync(TimerQuery query, CancellationToken cancellationToken = default(CancellationToken));
+        Task<QueryResult<TimerInfoDto>> GetLiveTvTimersAsync(TimerQuery query, CancellationToken cancellationToken = default);
 
         /// <summary>
         /// Gets the live tv programs asynchronous.
@@ -988,7 +956,7 @@ Task<AuthenticationResult> AuthenticateUserAsync(string username,
         /// <param name="query">The query.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>Task{QueryResult{ProgramInfoDto}}.</returns>
-        Task<QueryResult<BaseItemDto>> GetLiveTvProgramsAsync(ProgramQuery query, CancellationToken cancellationToken = default(CancellationToken));
+        Task<QueryResult<BaseItemDto>> GetLiveTvProgramsAsync(ProgramQuery query, CancellationToken cancellationToken = default);
 
         /// <summary>
         /// Gets the live tv program asynchronous.
@@ -997,7 +965,7 @@ Task<AuthenticationResult> AuthenticateUserAsync(string username,
         /// <param name="userId">The user identifier.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>Task{ProgramInfoDto}.</returns>
-        Task<BaseItemDto> GetLiveTvProgramAsync(string id, string userId, CancellationToken cancellationToken = default(CancellationToken));
+        Task<BaseItemDto> GetLiveTvProgramAsync(string id, string userId, CancellationToken cancellationToken = default);
 
         /// <summary>
         /// Gets the recommended live tv programs asynchronous.
@@ -1005,7 +973,7 @@ Task<AuthenticationResult> AuthenticateUserAsync(string username,
         /// <param name="query">The query.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>Task{QueryResult{ProgramInfoDto}}.</returns>
-        Task<QueryResult<BaseItemDto>> GetRecommendedLiveTvProgramsAsync(RecommendedProgramQuery query, CancellationToken cancellationToken = default(CancellationToken));
+        Task<QueryResult<BaseItemDto>> GetRecommendedLiveTvProgramsAsync(RecommendedProgramQuery query, CancellationToken cancellationToken = default);
 
         /// <summary>
         /// Creates the live tv timer asynchronous.
@@ -1013,7 +981,7 @@ Task<AuthenticationResult> AuthenticateUserAsync(string username,
         /// <param name="timer">The timer.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>Task.</returns>
-        Task CreateLiveTvTimerAsync(BaseTimerInfoDto timer, CancellationToken cancellationToken = default(CancellationToken));
+        Task CreateLiveTvTimerAsync(BaseTimerInfoDto timer, CancellationToken cancellationToken = default);
 
         /// <summary>
         /// Updates the live tv timer asynchronous.
@@ -1021,7 +989,7 @@ Task<AuthenticationResult> AuthenticateUserAsync(string username,
         /// <param name="timer">The timer.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>Task.</returns>
-        Task UpdateLiveTvTimerAsync(TimerInfoDto timer, CancellationToken cancellationToken = default(CancellationToken));
+        Task UpdateLiveTvTimerAsync(TimerInfoDto timer, CancellationToken cancellationToken = default);
 
         /// <summary>
         /// Creates the live tv series timer asynchronous.
@@ -1029,7 +997,7 @@ Task<AuthenticationResult> AuthenticateUserAsync(string username,
         /// <param name="timer">The timer.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>Task.</returns>
-        Task CreateLiveTvSeriesTimerAsync(SeriesTimerInfoDto timer, CancellationToken cancellationToken = default(CancellationToken));
+        Task CreateLiveTvSeriesTimerAsync(SeriesTimerInfoDto timer, CancellationToken cancellationToken = default);
 
         /// <summary>
         /// Updates the live tv series timer asynchronous.
@@ -1037,7 +1005,7 @@ Task<AuthenticationResult> AuthenticateUserAsync(string username,
         /// <param name="timer">The timer.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>Task.</returns>
-        Task UpdateLiveTvSeriesTimerAsync(SeriesTimerInfoDto timer, CancellationToken cancellationToken = default(CancellationToken));
+        Task UpdateLiveTvSeriesTimerAsync(SeriesTimerInfoDto timer, CancellationToken cancellationToken = default);
 
         /// <summary>
         /// Gets the live tv timer asynchronous.
@@ -1045,7 +1013,7 @@ Task<AuthenticationResult> AuthenticateUserAsync(string username,
         /// <param name="id">The identifier.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>Task{TimerInfoDto}.</returns>
-        Task<TimerInfoDto> GetLiveTvTimerAsync(string id, CancellationToken cancellationToken = default(CancellationToken));
+        Task<TimerInfoDto> GetLiveTvTimerAsync(string id, CancellationToken cancellationToken = default);
 
         /// <summary>
         /// Gets the live tv series timers asynchronous.
@@ -1053,7 +1021,7 @@ Task<AuthenticationResult> AuthenticateUserAsync(string username,
         /// <param name="query">The query.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>Task{QueryResult{SeriesTimerInfoDto}}.</returns>
-        Task<QueryResult<SeriesTimerInfoDto>> GetLiveTvSeriesTimersAsync(SeriesTimerQuery query, CancellationToken cancellationToken = default(CancellationToken));
+        Task<QueryResult<SeriesTimerInfoDto>> GetLiveTvSeriesTimersAsync(SeriesTimerQuery query, CancellationToken cancellationToken = default);
 
         /// <summary>
         /// Gets the live tv series timer asynchronous.
@@ -1061,7 +1029,7 @@ Task<AuthenticationResult> AuthenticateUserAsync(string username,
         /// <param name="id">The identifier.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>Task{SeriesTimerInfoDto}.</returns>
-        Task<SeriesTimerInfoDto> GetLiveTvSeriesTimerAsync(string id, CancellationToken cancellationToken = default(CancellationToken));
+        Task<SeriesTimerInfoDto> GetLiveTvSeriesTimerAsync(string id, CancellationToken cancellationToken = default);
 
         /// <summary>
         /// Cancels the live tv timer asynchronous.
@@ -1069,7 +1037,7 @@ Task<AuthenticationResult> AuthenticateUserAsync(string username,
         /// <param name="id">The identifier.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>Task.</returns>
-        Task CancelLiveTvTimerAsync(string id, CancellationToken cancellationToken = default(CancellationToken));
+        Task CancelLiveTvTimerAsync(string id, CancellationToken cancellationToken = default);
 
         /// <summary>
         /// Cancels the live tv series timer asynchronous.
@@ -1077,21 +1045,21 @@ Task<AuthenticationResult> AuthenticateUserAsync(string username,
         /// <param name="id">The identifier.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>Task.</returns>
-        Task CancelLiveTvSeriesTimerAsync(string id, CancellationToken cancellationToken = default(CancellationToken));
+        Task CancelLiveTvSeriesTimerAsync(string id, CancellationToken cancellationToken = default);
 
         /// <summary>
         /// Gets the default timer information.
         /// </summary>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>Task{SeriesTimerInfoDto}.</returns>
-        Task<SeriesTimerInfoDto> GetDefaultLiveTvTimerInfo(CancellationToken cancellationToken = default(CancellationToken));
+        Task<SeriesTimerInfoDto> GetDefaultLiveTvTimerInfo(CancellationToken cancellationToken = default);
 
         /// <summary>
         /// Gets the live tv guide information.
         /// </summary>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>Task{GuideInfo}.</returns>
-        Task<GuideInfo> GetLiveTvGuideInfo(CancellationToken cancellationToken = default(CancellationToken));
+        Task<GuideInfo> GetLiveTvGuideInfo(CancellationToken cancellationToken = default);
 
         /// <summary>
         /// Gets the default timer information.
@@ -1099,7 +1067,7 @@ Task<AuthenticationResult> AuthenticateUserAsync(string username,
         /// <param name="programId">The program identifier.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>Task{SeriesTimerInfoDto}.</returns>
-        Task<SeriesTimerInfoDto> GetDefaultLiveTvTimerInfo(string programId, CancellationToken cancellationToken = default(CancellationToken));
+        Task<SeriesTimerInfoDto> GetDefaultLiveTvTimerInfo(string programId, CancellationToken cancellationToken = default);
 
         /// <summary>
         /// Gets the channel features.
@@ -1107,7 +1075,7 @@ Task<AuthenticationResult> AuthenticateUserAsync(string username,
         /// <param name="channelId">The channel identifier.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>Task{ChannelFeatures}.</returns>
-        Task<ChannelFeatures> GetChannelFeatures(string channelId, CancellationToken cancellationToken = default(CancellationToken));
+        Task<ChannelFeatures> GetChannelFeatures(string channelId, CancellationToken cancellationToken = default);
 
         /// <summary>
         /// Gets the channel items.
@@ -1115,7 +1083,7 @@ Task<AuthenticationResult> AuthenticateUserAsync(string username,
         /// <param name="query">The query.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>Task{QueryResult{BaseItemDto}}.</returns>
-        Task<QueryResult<BaseItemDto>> GetChannelItems(ChannelItemQuery query, CancellationToken cancellationToken = default(CancellationToken));
+        Task<QueryResult<BaseItemDto>> GetChannelItems(ChannelItemQuery query, CancellationToken cancellationToken = default);
 
         /// <summary>
         /// Gets the channels.
@@ -1123,7 +1091,7 @@ Task<AuthenticationResult> AuthenticateUserAsync(string username,
         /// <param name="query">The query.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>Task{QueryResult{BaseItemDto}}.</returns>
-        Task<QueryResult<BaseItemDto>> GetChannels(ChannelQuery query, CancellationToken cancellationToken = default(CancellationToken));
+        Task<QueryResult<BaseItemDto>> GetChannels(ChannelQuery query, CancellationToken cancellationToken = default);
 
         /// <summary>
         /// Gets the latest channel items.
@@ -1131,7 +1099,7 @@ Task<AuthenticationResult> AuthenticateUserAsync(string username,
         /// <param name="query">The query.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>Task{QueryResult{BaseItemDto}}.</returns>
-        Task<QueryResult<BaseItemDto>> GetLatestChannelItems(AllChannelMediaQuery query, CancellationToken cancellationToken = default(CancellationToken));
+        Task<QueryResult<BaseItemDto>> GetLatestChannelItems(AllChannelMediaQuery query, CancellationToken cancellationToken = default);
 
         /// <summary>
         /// Creates the playlist.
@@ -1174,7 +1142,7 @@ Task<AuthenticationResult> AuthenticateUserAsync(string username,
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>Task.</returns>
         Task SendContextMessageAsync(string itemType, string itemId, string itemName, string context,
-            CancellationToken cancellationToken = default(CancellationToken));
+            CancellationToken cancellationToken = default);
 
         /// <summary>
         /// Gets the content upload history.
@@ -1192,7 +1160,7 @@ Task SendContextMessageAsync(string itemType, string itemId, string itemName, st
         /// <returns>Task.</returns>
         Task UploadFile(Stream stream,
             LocalFileInfo file,
-            CancellationToken cancellationToken = default(CancellationToken));
+            CancellationToken cancellationToken = default);
 
         /// <summary>
         /// Gets the devices options options.
@@ -1207,137 +1175,11 @@ Task UploadFile(Stream stream,
         /// <returns>Task.</returns>
         Task UpdateItem(BaseItemDto item);
 
-        /// <summary>
-        /// Creates the synchronize job.
-        /// </summary>
-        /// <param name="request">The request.</param>
-        /// <returns>Task&lt;SyncJob&gt;.</returns>
-        Task<SyncJob> CreateSyncJob(SyncJobRequest request);
-
-        /// <summary>
-        /// Updates the synchronize job.
-        /// </summary>
-        /// <param name="job">The job.</param>
-        /// <returns>Task.</returns>
-        Task UpdateSyncJob(SyncJob job);
-
-        /// <summary>
-        /// Gets the synchronize jobs.
-        /// </summary>
-        /// <param name="query">The query.</param>
-        /// <returns>Task&lt;QueryResult&lt;SyncJob&gt;&gt;.</returns>
-        Task<QueryResult<SyncJob>> GetSyncJobs(SyncJobQuery query);
-
-        /// <summary>
-        /// Gets the synchronize job items.
-        /// </summary>
-        /// <param name="query">The query.</param>
-        /// <returns>Task&lt;QueryResult&lt;SyncJobItem&gt;&gt;.</returns>
-        Task<QueryResult<SyncJobItem>> GetSyncJobItems(SyncJobItemQuery query);
-
-        /// <summary>
-        /// Reports the synchronize job item transferred.
-        /// </summary>
-        /// <param name="id">The identifier.</param>
-        /// <returns>Task.</returns>
-        Task ReportSyncJobItemTransferred(string id);
-
-        /// <summary>
-        /// Gets the synchronize job item file.
-        /// </summary>
-        /// <param name="id">The identifier.</param>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        /// <returns>Task&lt;Stream&gt;.</returns>
-        Task<Stream> GetSyncJobItemFile(string id, CancellationToken cancellationToken = default(CancellationToken));
-
-        /// <summary>
-        /// Gets the synchronize job item additional file.
-        /// </summary>
-        /// <param name="id">The identifier.</param>
-        /// <param name="name">The name.</param>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        /// <returns>Task&lt;Stream&gt;.</returns>
-        Task<Stream> GetSyncJobItemAdditionalFile(string id, string name, CancellationToken cancellationToken);
-
         /// <summary>
         /// Opens the web socket.
         /// </summary>
         void OpenWebSocket(Func<IClientWebSocket> webSocketFactory);
 
-        /// <summary>
-        /// Reports the offline actions.
-        /// </summary>
-        /// <param name="actions">The actions.</param>
-        /// <returns>Task.</returns>
-        Task ReportOfflineActions(List<UserAction> actions);
-
-        /// <summary>
-        /// Gets the ready synchronize items.
-        /// </summary>
-        /// <param name="targetId">The target identifier.</param>
-        /// <returns>List&lt;SyncedItem&gt;.</returns>
-        Task<List<SyncedItem>> GetReadySyncItems(string targetId);
-
-        /// <summary>
-        /// Synchronizes the data.
-        /// </summary>
-        /// <param name="request">The request.</param>
-        /// <returns>Task&lt;SyncDataResponse&gt;.</returns>
-        Task<SyncDataResponse> SyncData(SyncDataRequest request);
-        /// <summary>
-        /// Gets the synchronize job item file URL.
-        /// </summary>
-        /// <param name="id">The identifier.</param>
-        /// <returns>System.String.</returns>
-        string GetSyncJobItemFileUrl(string id);
-        /// <summary>
-        /// Marks the synchronize job item for removal.
-        /// </summary>
-        /// <param name="id">The identifier.</param>
-        /// <returns>Task.</returns>
-        Task MarkSyncJobItemForRemoval(string id);
-        /// <summary>
-        /// Unmarks the synchronize job item for removal.
-        /// </summary>
-        /// <param name="id">The identifier.</param>
-        /// <returns>Task.</returns>
-        Task UnmarkSyncJobItemForRemoval(string id);
-        /// <summary>
-        /// Queues the failed synchronize job item for retry.
-        /// </summary>
-        /// <param name="id">The identifier.</param>
-        /// <returns>Task.</returns>
-        Task QueueFailedSyncJobItemForRetry(string id);
-        /// <summary>
-        /// Cancels the synchronize job.
-        /// </summary>
-        /// <param name="id">The identifier.</param>
-        /// <returns>Task.</returns>
-        Task CancelSyncJob(string id);
-        /// <summary>
-        /// Cancels the synchronize job item.
-        /// </summary>
-        /// <param name="id">The identifier.</param>
-        /// <returns>Task.</returns>
-        Task CancelSyncJobItem(string id);
-        /// <summary>
-        /// Enables the cancelled synchronize job item.
-        /// </summary>
-        /// <param name="id">The identifier.</param>
-        /// <returns>Task.</returns>
-        Task EnableCancelledSyncJobItem(string id);
-        /// <summary>
-        /// Gets the synchronize options.
-        /// </summary>
-        /// <param name="jobInfo">The job information.</param>
-        /// <returns>Task&lt;SyncOptions&gt;.</returns>
-        Task<SyncDialogOptions> GetSyncOptions(SyncJobRequest jobInfo);
-        /// <summary>
-        /// Gets the synchronize options.
-        /// </summary>
-        /// <param name="jobInfo">The job information.</param>
-        /// <returns>Task&lt;SyncDialogOptions&gt;.</returns>
-        Task<SyncDialogOptions> GetSyncOptions(SyncJob jobInfo);
         /// <summary>
         /// Gets the movie recommendations.
         /// </summary>
@@ -1352,13 +1194,6 @@ Task UploadFile(Stream stream,
         /// <returns>Task&lt;LiveStreamResponse&gt;.</returns>
         Task<LiveStreamResponse> OpenLiveStream(LiveStreamRequest request, CancellationToken cancellationToken);
         /// <summary>
-        /// Cancels the synchronize library items.
-        /// </summary>
-        /// <param name="targetId">The target identifier.</param>
-        /// <param name="itemIds">The item ids.</param>
-        /// <returns>Task.</returns>
-        Task CancelSyncLibraryItems(string targetId, IEnumerable<string> itemIds);
-        /// <summary>
         /// Gets the supported bitrate.
         /// </summary>
         /// <param name="cancellationToken">The cancellation token.</param>
diff --git a/Emby.ApiClient/Model/IClientWebSocket.cs b/Jellyfin.ApiClient/Model/IClientWebSocket.cs
similarity index 91%
rename from Emby.ApiClient/Model/IClientWebSocket.cs
rename to Jellyfin.ApiClient/Model/IClientWebSocket.cs
index cce8731..24c8b70 100644
--- a/Emby.ApiClient/Model/IClientWebSocket.cs
+++ b/Jellyfin.ApiClient/Model/IClientWebSocket.cs
@@ -1,9 +1,9 @@
-using MediaBrowser.Model.Net;
+using Jellyfin.ApiClient.WebSocket;
 using System;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace Emby.ApiClient.Model
+namespace Jellyfin.ApiClient.Model
 {
     /// <summary>
     /// Interface IClientWebSocket
@@ -27,7 +27,7 @@ public interface IClientWebSocket : IDisposable
         /// <param name="url">The URL.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>Task.</returns>
-        Task ConnectAsync(string url, CancellationToken cancellationToken);
+        Task ConnectAsync(Uri url, CancellationToken cancellationToken);
 
         /// <summary>
         /// Gets or sets the receive action.
diff --git a/Emby.ApiClient/Model/IConnectionManager.cs b/Jellyfin.ApiClient/Model/IConnectionManager.cs
similarity index 65%
rename from Emby.ApiClient/Model/IConnectionManager.cs
rename to Jellyfin.ApiClient/Model/IConnectionManager.cs
index 7aa84fc..da3c519 100644
--- a/Emby.ApiClient/Model/IConnectionManager.cs
+++ b/Jellyfin.ApiClient/Model/IConnectionManager.cs
@@ -1,14 +1,12 @@
-using MediaBrowser.Model.Connect;
-using MediaBrowser.Model.Dto;
+using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Events;
 using MediaBrowser.Model.Session;
 using System;
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
-using MediaBrowser.Model.ApiClient;
 
-namespace Emby.ApiClient.Model
+namespace Jellyfin.ApiClient.Model
 {
     public interface IConnectionManager
     {
@@ -21,18 +19,10 @@ public interface IConnectionManager
         /// </summary>
         event EventHandler<GenericEventArgs<UserDto>> LocalUserSignIn;
         /// <summary>
-        /// Occurs when [connect user sign in].
-        /// </summary>
-        event EventHandler<GenericEventArgs<ConnectUser>> ConnectUserSignIn;
-        /// <summary>
         /// Occurs when [local user sign out].
         /// </summary>
         event EventHandler<GenericEventArgs<IApiClient>> LocalUserSignOut;
         /// <summary>
-        /// Occurs when [connect user sign out].
-        /// </summary>
-        event EventHandler<EventArgs> ConnectUserSignOut;
-        /// <summary>
         /// Occurs when [remote logged out].
         /// </summary>
         event EventHandler<EventArgs> RemoteLoggedOut;
@@ -43,12 +33,6 @@ public interface IConnectionManager
         /// <value>The device.</value>
         IDevice Device { get; }
 
-        /// <summary>
-        /// Gets the connect user.
-        /// </summary>
-        /// <value>The connect user.</value>
-        ConnectUser ConnectUser { get; }
-
         /// <summary>
         /// Gets or sets a value indicating whether [save local credentials].
         /// </summary>
@@ -80,7 +64,7 @@ public interface IConnectionManager
         /// </summary>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>Task&lt;ConnectionResult&gt;.</returns>
-        Task<ConnectionResult> Connect(CancellationToken cancellationToken = default(CancellationToken));
+        Task<ConnectionResult> Connect(CancellationToken cancellationToken = default);
 
         /// <summary>
         /// Connects the specified API client.
@@ -88,7 +72,7 @@ public interface IConnectionManager
         /// <param name="apiClient">The API client.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>Task&lt;ConnectionResult&gt;.</returns>
-        Task<ConnectionResult> Connect(IApiClient apiClient, CancellationToken cancellationToken = default(CancellationToken));
+        Task<ConnectionResult> Connect(IApiClient apiClient, CancellationToken cancellationToken = default);
         
         /// <summary>
         /// Connects the specified server.
@@ -96,7 +80,7 @@ public interface IConnectionManager
         /// <param name="server">The server.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>Task&lt;ConnectionResult&gt;.</returns>
-        Task<ConnectionResult> Connect(ServerInfo server, CancellationToken cancellationToken = default(CancellationToken));
+        Task<ConnectionResult> Connect(ServerInfo server, CancellationToken cancellationToken = default);
 
         /// <summary>
         /// Connects the specified server.
@@ -105,7 +89,7 @@ public interface IConnectionManager
         /// <param name="options">The options.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>Task&lt;ConnectionResult&gt;.</returns>
-        Task<ConnectionResult> Connect(ServerInfo server, ConnectionOptions options, CancellationToken cancellationToken = default(CancellationToken));
+        Task<ConnectionResult> Connect(ServerInfo server, ConnectionOptions options, CancellationToken cancellationToken = default);
 
         /// <summary>
         /// Connects the specified server.
@@ -113,7 +97,7 @@ public interface IConnectionManager
         /// <param name="address">The address.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>Task&lt;ConnectionResult&gt;.</returns>
-        Task<ConnectionResult> Connect(string address, CancellationToken cancellationToken = default(CancellationToken));
+        Task<ConnectionResult> Connect(Uri address, CancellationToken cancellationToken = default);
 
         /// <summary>
         /// Logouts this instance.
@@ -121,37 +105,11 @@ public interface IConnectionManager
         /// <returns>Task&lt;ConnectionResult&gt;.</returns>
         Task Logout();
 
-        /// <summary>
-        /// Logins to connect.
-        /// </summary>
-        /// <returns>Task.</returns>
-        Task LoginToConnect(string username, string password);
-
         /// <summary>
         /// Gets the active api client instance
         /// </summary>
         IApiClient CurrentApiClient { get; }
 
-        /// <summary>
-        /// Creates the pin.
-        /// </summary>
-        /// <returns>Task&lt;PinCreationResult&gt;.</returns>
-        Task<PinCreationResult> CreatePin();
-
-        /// <summary>
-        /// Gets the pin status.
-        /// </summary>
-        /// <param name="pin">The pin.</param>
-        /// <returns>Task&lt;PinStatusResult&gt;.</returns>
-        Task<PinStatusResult> GetPinStatus(PinCreationResult pin);
-
-        /// <summary>
-        /// Exchanges the pin.
-        /// </summary>
-        /// <param name="pin">The pin.</param>
-        /// <returns>Task.</returns>
-        Task ExchangePin(PinCreationResult pin);
-
         /// <summary>
         /// Gets the server information.
         /// </summary>
@@ -163,16 +121,6 @@ public interface IConnectionManager
         /// Gets the available servers.
         /// </summary>
         /// <param name="cancellationToken">The cancellation token.</param>
-        Task<List<ServerInfo>> GetAvailableServers(CancellationToken cancellationToken = default(CancellationToken));
-
-        /// <summary>
-        /// Signups for connect.
-        /// </summary>
-        /// <param name="email">The email.</param>
-        /// <param name="username">The username.</param>
-        /// <param name="password">The password.</param>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        /// <returns>Task.</returns>
-        Task<ConnectSignupResponse> SignupForConnect(string email, string username, string password, CancellationToken cancellationToken = default(CancellationToken));
+        Task<List<ServerInfo>> GetAvailableServers(CancellationToken cancellationToken = default);
     }
 }
diff --git a/Jellyfin.ApiClient/Model/IDevice.cs b/Jellyfin.ApiClient/Model/IDevice.cs
new file mode 100644
index 0000000..6cb76cc
--- /dev/null
+++ b/Jellyfin.ApiClient/Model/IDevice.cs
@@ -0,0 +1,16 @@
+namespace Jellyfin.ApiClient.Model
+{
+    public interface IDevice
+    {
+        /// <summary>
+        /// Gets the name of the device.
+        /// </summary>
+        /// <value>The name of the device.</value>
+        string DeviceName { get; }
+        /// <summary>
+        /// Gets the device identifier.
+        /// </summary>
+        /// <value>The device identifier.</value>
+        string DeviceId { get; }
+    }
+}
diff --git a/Emby.ApiClient/Model/IServerEvents.cs b/Jellyfin.ApiClient/Model/IServerEvents.cs
similarity index 85%
rename from Emby.ApiClient/Model/IServerEvents.cs
rename to Jellyfin.ApiClient/Model/IServerEvents.cs
index f1cfd67..986c7b5 100644
--- a/Emby.ApiClient/Model/IServerEvents.cs
+++ b/Jellyfin.ApiClient/Model/IServerEvents.cs
@@ -1,16 +1,14 @@
-using MediaBrowser.Model.Dto;
+using Jellyfin.ApiClient.Net;
+using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.Events;
 using MediaBrowser.Model.Plugins;
 using MediaBrowser.Model.Session;
-using MediaBrowser.Model.Sync;
 using MediaBrowser.Model.Tasks;
 using MediaBrowser.Model.Updates;
 using System;
-using System.Collections.Generic;
-using MediaBrowser.Model.ApiClient;
 
-namespace Emby.ApiClient.Model
+namespace Jellyfin.ApiClient.Model
 {
     /// <summary>
     /// Interface IServerEvents
@@ -133,21 +131,5 @@ public interface IServerEvents
         /// Occurs when [session ended].
         /// </summary>
         event EventHandler<GenericEventArgs<SessionInfoDto>> SessionEnded;
-        /// <summary>
-        /// Occurs when [synchronize job created].
-        /// </summary>
-        event EventHandler<GenericEventArgs<SyncJobCreationResult>> SyncJobCreated;
-        /// <summary>
-        /// Occurs when [synchronize job cancelled].
-        /// </summary>
-        event EventHandler<GenericEventArgs<SyncJob>> SyncJobCancelled;
-        /// <summary>
-        /// Occurs when [synchronize jobs updated].
-        /// </summary>
-        event EventHandler<GenericEventArgs<List<SyncJob>>> SyncJobsUpdated;
-        /// <summary>
-        /// Occurs when [synchronize job updated].
-        /// </summary>
-        event EventHandler<GenericEventArgs<CompleteSyncJobInfo>> SyncJobUpdated;
     }
 }
diff --git a/Jellyfin.ApiClient/Model/IgnoreDataMemberAttribute.cs b/Jellyfin.ApiClient/Model/IgnoreDataMemberAttribute.cs
new file mode 100644
index 0000000..90ec611
--- /dev/null
+++ b/Jellyfin.ApiClient/Model/IgnoreDataMemberAttribute.cs
@@ -0,0 +1,12 @@
+using System;
+
+namespace Jellyfin.ApiClient.Model
+{
+    [AttributeUsage(AttributeTargets.Field | AttributeTargets.Property, Inherited = false, AllowMultiple = false)]
+    public sealed class IgnoreDataMemberAttribute : Attribute
+    {
+        public IgnoreDataMemberAttribute()
+        {
+        }
+    }
+}
diff --git a/Emby.ApiClient/Model/ItemQuery.cs b/Jellyfin.ApiClient/Model/ItemQuery.cs
similarity index 98%
rename from Emby.ApiClient/Model/ItemQuery.cs
rename to Jellyfin.ApiClient/Model/ItemQuery.cs
index 7f23c1e..03eadd9 100644
--- a/Emby.ApiClient/Model/ItemQuery.cs
+++ b/Jellyfin.ApiClient/Model/ItemQuery.cs
@@ -1,8 +1,8 @@
 using MediaBrowser.Model.Entities;
-using System;
 using MediaBrowser.Model.Querying;
+using System;
 
-namespace Emby.ApiClient.Model
+namespace Jellyfin.ApiClient.Model
 {
     /// <summary>
     /// Contains all the possible parameters that can be used to query for items
@@ -13,7 +13,7 @@ public class ItemQuery
         /// The user to localize search results for
         /// </summary>
         /// <value>The user id.</value>
-        public string UserId { get; set; }
+        public Guid UserId { get; set; }
 
         /// <summary>
         /// Specify this to localize the search to a specific item or folder. Omit to use the root.
@@ -282,11 +282,8 @@ public class ItemQuery
         public int? ImageTypeLimit { get; set; }
         public ImageType[] EnableImageTypes { get; set; }
 
-        [Obsolete]
         public string[] Artists { get; set; }
-        [Obsolete]
         public string[] Studios { get; set; }
-        [Obsolete]
         public string Person { get; set; }
 
         public bool EnableTotalRecordCount { get; set; }
diff --git a/Jellyfin.ApiClient/Model/ItemReview.cs b/Jellyfin.ApiClient/Model/ItemReview.cs
new file mode 100644
index 0000000..05bf010
--- /dev/null
+++ b/Jellyfin.ApiClient/Model/ItemReview.cs
@@ -0,0 +1,52 @@
+using System;
+
+namespace Jellyfin.ApiClient.Model
+{
+    /// <summary>
+    /// Class ItemReview
+    /// </summary>
+    public class ItemReview
+    {
+        /// <summary>
+        /// Gets or sets the name of the reviewer.
+        /// </summary>
+        /// <value>The name of the reviewer.</value>
+        public string ReviewerName { get; set; }
+
+        /// <summary>
+        /// Gets or sets the publisher.
+        /// </summary>
+        /// <value>The publisher.</value>
+        public string Publisher { get; set; }
+
+        /// <summary>
+        /// Gets or sets the date.
+        /// </summary>
+        /// <value>The date.</value>
+        public DateTime Date { get; set; }
+
+        /// <summary>
+        /// Gets or sets the score.
+        /// </summary>
+        /// <value>The score.</value>
+        public float? Score { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether this <see cref="ItemReview"/> is likes.
+        /// </summary>
+        /// <value><c>null</c> if [likes] contains no value, <c>true</c> if [likes]; otherwise, <c>false</c>.</value>
+        public bool? Likes { get; set; }
+
+        /// <summary>
+        /// Gets or sets the URL.
+        /// </summary>
+        /// <value>The URL.</value>
+        public string Url { get; set; }
+
+        /// <summary>
+        /// Gets or sets the caption.
+        /// </summary>
+        /// <value>The caption.</value>
+        public string Caption { get; set; }
+    }
+}
diff --git a/Emby.ApiClient/Model/NetworkStatus.cs b/Jellyfin.ApiClient/Model/NetworkStatus.cs
similarity index 96%
rename from Emby.ApiClient/Model/NetworkStatus.cs
rename to Jellyfin.ApiClient/Model/NetworkStatus.cs
index cf8358b..d133ea9 100644
--- a/Emby.ApiClient/Model/NetworkStatus.cs
+++ b/Jellyfin.ApiClient/Model/NetworkStatus.cs
@@ -1,5 +1,4 @@
-
-namespace Emby.ApiClient.Model
+namespace Jellyfin.ApiClient.Model
 {
     public class NetworkStatus
     {
diff --git a/Jellyfin.ApiClient/Model/Notifications/Notification.cs b/Jellyfin.ApiClient/Model/Notifications/Notification.cs
new file mode 100644
index 0000000..f58ea88
--- /dev/null
+++ b/Jellyfin.ApiClient/Model/Notifications/Notification.cs
@@ -0,0 +1,16 @@
+using System;
+
+namespace Jellyfin.ApiClient.Model.Notifications
+{
+    public class Notification
+    {
+        public string Id { get; set; }
+        public string UserId { get; set; }
+        public DateTime Date { get; set; }
+        public bool IsRead { get; set; }
+        public string Name { get; set; }
+        public string Description { get; set; }
+        public string Url { get; set; }
+        public NotificationLevel Level { get; set; }
+    }
+}
diff --git a/Jellyfin.ApiClient/Model/Notifications/NotificationLevel.cs b/Jellyfin.ApiClient/Model/Notifications/NotificationLevel.cs
new file mode 100644
index 0000000..3012a88
--- /dev/null
+++ b/Jellyfin.ApiClient/Model/Notifications/NotificationLevel.cs
@@ -0,0 +1,9 @@
+namespace Jellyfin.ApiClient.Model.Notifications
+{
+    public enum NotificationLevel
+    {
+        Normal = 0,
+        Warning = 1,
+        Error = 2
+    }
+}
diff --git a/Jellyfin.ApiClient/Model/Notifications/NotificationQuery.cs b/Jellyfin.ApiClient/Model/Notifications/NotificationQuery.cs
new file mode 100644
index 0000000..2dd715e
--- /dev/null
+++ b/Jellyfin.ApiClient/Model/Notifications/NotificationQuery.cs
@@ -0,0 +1,10 @@
+namespace Jellyfin.ApiClient.Model.Notifications
+{
+    public class NotificationQuery
+    {
+        public string UserId { get; set; }
+        public bool? IsRead { get; set; }
+        public int? StartIndex { get; set; }
+        public int? Limit { get; set; }
+    }
+}
diff --git a/Jellyfin.ApiClient/Model/Notifications/NotificationResult.cs b/Jellyfin.ApiClient/Model/Notifications/NotificationResult.cs
new file mode 100644
index 0000000..0c5be2e
--- /dev/null
+++ b/Jellyfin.ApiClient/Model/Notifications/NotificationResult.cs
@@ -0,0 +1,8 @@
+namespace Jellyfin.ApiClient.Model.Notifications
+{
+    public class NotificationResult
+    {
+        public Notification[] Notifications { get; set; }
+        public int TotalRecordCount { get; set; }
+    }
+}
diff --git a/Jellyfin.ApiClient/Model/Notifications/NotificationsSummary.cs b/Jellyfin.ApiClient/Model/Notifications/NotificationsSummary.cs
new file mode 100644
index 0000000..2a475f8
--- /dev/null
+++ b/Jellyfin.ApiClient/Model/Notifications/NotificationsSummary.cs
@@ -0,0 +1,8 @@
+namespace Jellyfin.ApiClient.Model.Notifications
+{
+    public class NotificationsSummary
+    {
+        public int UnreadCount { get; set; }
+        public NotificationLevel MaxUnreadNotificationLevel { get; set; }
+    }
+}
diff --git a/Jellyfin.ApiClient/Model/Querying/AllChannelMediaQuery.cs b/Jellyfin.ApiClient/Model/Querying/AllChannelMediaQuery.cs
new file mode 100644
index 0000000..53de502
--- /dev/null
+++ b/Jellyfin.ApiClient/Model/Querying/AllChannelMediaQuery.cs
@@ -0,0 +1,61 @@
+using MediaBrowser.Model.Channels;
+using MediaBrowser.Model.Entities;
+using MediaBrowser.Model.Querying;
+
+namespace Jellyfin.ApiClient.Model.Querying
+{
+    public class AllChannelMediaQuery
+    {
+        /// <summary>
+        /// Gets or sets the channel ids.
+        /// </summary>
+        /// <value>The channel ids.</value>
+        public string[] ChannelIds { get; set; }
+
+        /// <summary>
+        /// Gets or sets the user identifier.
+        /// </summary>
+        /// <value>The user identifier.</value>
+        public string UserId { get; set; }
+
+        /// <summary>
+        /// Skips over a given number of items within the results. Use for paging.
+        /// </summary>
+        /// <value>The start index.</value>
+        public int? StartIndex { get; set; }
+
+        /// <summary>
+        /// The maximum number of items to return
+        /// </summary>
+        /// <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; }
+
+        /// <summary>
+        /// Gets or sets the extra types.
+        /// </summary>
+        /// <value>The extra types.</value>
+        public ExtraType[] ExtraTypes { get; set; }
+        public TrailerType[] TrailerTypes { get; set; }
+
+        public AllChannelMediaQuery()
+        {
+            ChannelIds = new string[] { };
+
+            ContentTypes = new ChannelMediaContentType[] { };
+            ExtraTypes = new ExtraType[] { };
+            TrailerTypes = new TrailerType[] { };
+
+            Filters = new ItemFilter[] { };
+            Fields = new ItemFields[] { };
+        }
+
+        public ItemFilter[] Filters { get; set; }
+        public ItemFields[] Fields { get; set; }
+    }
+}
diff --git a/Jellyfin.ApiClient/Model/Querying/ArtistsQuery.cs b/Jellyfin.ApiClient/Model/Querying/ArtistsQuery.cs
new file mode 100644
index 0000000..f4c39f6
--- /dev/null
+++ b/Jellyfin.ApiClient/Model/Querying/ArtistsQuery.cs
@@ -0,0 +1,14 @@
+namespace Jellyfin.ApiClient.Model.Querying
+{
+    /// <summary>
+    /// Class ArtistsQuery
+    /// </summary>
+    public class ArtistsQuery : ItemsByNameQuery
+    {
+        /// <summary>
+        /// Filter by artists that are on tour, or not
+        /// </summary>
+        /// <value><c>null</c> if [is on tour] contains no value, <c>true</c> if [is on tour]; otherwise, <c>false</c>.</value>
+        public bool? IsOnTour { get; set; }
+    }
+}
diff --git a/Jellyfin.ApiClient/Model/Querying/ChannelItemQuery.cs b/Jellyfin.ApiClient/Model/Querying/ChannelItemQuery.cs
new file mode 100644
index 0000000..43b5dbf
--- /dev/null
+++ b/Jellyfin.ApiClient/Model/Querying/ChannelItemQuery.cs
@@ -0,0 +1,50 @@
+using MediaBrowser.Model.Entities;
+using MediaBrowser.Model.Querying;
+using System;
+
+namespace Jellyfin.ApiClient.Model.Querying
+{
+    public class ChannelItemQuery
+    {
+        /// <summary>
+        /// Gets or sets the channel identifier.
+        /// </summary>
+        /// <value>The channel identifier.</value>
+        public string ChannelId { get; set; }
+
+        /// <summary>
+        /// Gets or sets the category identifier.
+        /// </summary>
+        /// <value>The category identifier.</value>
+        public string FolderId { get; set; }
+
+        /// <summary>
+        /// Gets or sets the user identifier.
+        /// </summary>
+        /// <value>The user identifier.</value>
+        public string UserId { get; set; }
+
+        /// <summary>
+        /// Skips over a given number of items within the results. Use for paging.
+        /// </summary>
+        /// <value>The start index.</value>
+        public int? StartIndex { get; set; }
+
+        /// <summary>
+        /// The maximum number of items to return
+        /// </summary>
+        /// <value>The limit.</value>
+        public int? Limit { get; set; }
+
+        public ItemFilter[] Filters { get; set; }
+        public ItemFields[] Fields { get; set; }
+        public Tuple<string, SortOrder>[] OrderBy { get; set; }
+
+        public ChannelItemQuery()
+        {
+            Filters = new ItemFilter[] { };
+            Fields = new ItemFields[] { };
+            OrderBy = new Tuple<string, SortOrder>[] { };
+        }
+    }
+}
diff --git a/Jellyfin.ApiClient/Model/Querying/ItemsByNameQuery.cs b/Jellyfin.ApiClient/Model/Querying/ItemsByNameQuery.cs
new file mode 100644
index 0000000..8582ae2
--- /dev/null
+++ b/Jellyfin.ApiClient/Model/Querying/ItemsByNameQuery.cs
@@ -0,0 +1,137 @@
+using MediaBrowser.Model.Entities;
+using MediaBrowser.Model.Querying;
+
+namespace Jellyfin.ApiClient.Model.Querying
+{
+    /// <summary>
+    /// Class ItemsByNameQuery
+    /// </summary>
+    public class ItemsByNameQuery
+    {
+        /// <summary>
+        /// Gets or sets the user id.
+        /// </summary>
+        /// <value>The user id.</value>
+        public string UserId { get; set; }
+        /// <summary>
+        /// Gets or sets the start index.
+        /// </summary>
+        /// <value>The start index.</value>
+        public int? StartIndex { get; set; }
+        /// <summary>
+        /// Gets or sets the size of the page.
+        /// </summary>
+        /// <value>The size of the page.</value>
+        public int? Limit { get; set; }
+        /// <summary>
+        /// Gets or sets a value indicating whether this <see cref="ItemsByNameQuery" /> is recursive.
+        /// </summary>
+        /// <value><c>true</c> if recursive; otherwise, <c>false</c>.</value>
+        public bool Recursive { get; set; }
+        /// <summary>
+        /// Gets or sets the sort order.
+        /// </summary>
+        /// <value>The sort order.</value>
+        public SortOrder? SortOrder { get; set; }
+        /// <summary>
+        /// Gets or sets the parent id.
+        /// </summary>
+        /// <value>The parent id.</value>
+        public string ParentId { get; set; }
+        /// <summary>
+        /// Fields to return within the items, in addition to basic information
+        /// </summary>
+        /// <value>The fields.</value>
+        public ItemFields[] Fields { get; set; }
+
+        /// <summary>
+        /// Gets or sets the filters.
+        /// </summary>
+        /// <value>The filters.</value>
+        public ItemFilter[] Filters { get; set; }
+
+        /// <summary>
+        /// Gets or sets the exclude item types.
+        /// </summary>
+        /// <value>The exclude item types.</value>
+        public string[] ExcludeItemTypes { get; set; }
+
+        /// <summary>
+        /// Gets or sets the include item types.
+        /// </summary>
+        /// <value>The include item types.</value>
+        public string[] IncludeItemTypes { get; set; }
+
+        /// <summary>
+        /// Gets or sets the media types.
+        /// </summary>
+        /// <value>The media types.</value>
+        public string[] MediaTypes { get; set; }
+
+        /// <summary>
+        /// What to sort the results by
+        /// </summary>
+        /// <value>The sort by.</value>
+        public string[] SortBy { get; set; }
+
+        /// <summary>
+        /// Gets or sets the image types.
+        /// </summary>
+        /// <value>The image types.</value>
+        public ImageType[] ImageTypes { get; set; }
+
+        /// <summary>
+        /// Gets or sets the name starts with or greater.
+        /// </summary>
+        /// <value>The name starts with or greater.</value>
+        public string NameStartsWithOrGreater { get; set; }
+
+        /// <summary>
+        /// Gets or sets the name starts with
+        /// </summary>
+        /// <value>The name starts with or greater.</value>
+        public string NameStartsWith { get; set; }
+        /// <summary>
+        /// Gets or sets the name less than.
+        /// </summary>
+        /// <value>The name less than.</value>
+        public string NameLessThan { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether this instance is played.
+        /// </summary>
+        /// <value><c>null</c> if [is played] contains no value, <c>true</c> if [is played]; otherwise, <c>false</c>.</value>
+        public bool? IsPlayed { get; set; }
+        /// <summary>
+        /// Gets or sets a value indicating whether [enable images].
+        /// </summary>
+        /// <value><c>null</c> if [enable images] contains no value, <c>true</c> if [enable images]; otherwise, <c>false</c>.</value>
+        public bool? EnableImages { get; set; }
+        /// <summary>
+        /// Gets or sets the image type limit.
+        /// </summary>
+        /// <value>The image type limit.</value>
+        public int? ImageTypeLimit { get; set; }
+        /// <summary>
+        /// Gets or sets the enable image types.
+        /// </summary>
+        /// <value>The enable image types.</value>
+        public ImageType[] EnableImageTypes { get; set; }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ItemsByNameQuery" /> class.
+        /// </summary>
+        public ItemsByNameQuery()
+        {
+            ImageTypes = new ImageType[] { };
+            Filters = new ItemFilter[] { };
+            Fields = new ItemFields[] { };
+            Recursive = true;
+            MediaTypes = new string[] { };
+            SortBy = new string[] { };
+            ExcludeItemTypes = new string[] { };
+            IncludeItemTypes = new string[] { };
+            EnableImageTypes = new ImageType[] { };
+        }
+    }
+}
diff --git a/Jellyfin.ApiClient/Model/Querying/PersonsQuery.cs b/Jellyfin.ApiClient/Model/Querying/PersonsQuery.cs
new file mode 100644
index 0000000..febaf3c
--- /dev/null
+++ b/Jellyfin.ApiClient/Model/Querying/PersonsQuery.cs
@@ -0,0 +1,22 @@
+namespace Jellyfin.ApiClient.Model.Querying
+{
+    /// <summary>
+    /// Class PersonsQuery
+    /// </summary>
+    public class PersonsQuery : ItemsByNameQuery
+    {
+        /// <summary>
+        /// Gets or sets the person types.
+        /// </summary>
+        /// <value>The person types.</value>
+        public string[] PersonTypes { get; set; }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="PersonsQuery"/> class.
+        /// </summary>
+        public PersonsQuery()
+        {
+            PersonTypes = new string[] { };
+        }
+    }
+}
diff --git a/Jellyfin.ApiClient/Model/Querying/ProgramQuery.cs b/Jellyfin.ApiClient/Model/Querying/ProgramQuery.cs
new file mode 100644
index 0000000..5e5509d
--- /dev/null
+++ b/Jellyfin.ApiClient/Model/Querying/ProgramQuery.cs
@@ -0,0 +1,117 @@
+using MediaBrowser.Model.Entities;
+using MediaBrowser.Model.Querying;
+using System;
+
+namespace Jellyfin.ApiClient.Model.Querying
+{
+    /// <summary>
+    /// Class ProgramQuery.
+    /// </summary>
+    public class ProgramQuery
+    {
+        public ProgramQuery()
+        {
+            ChannelIds = new string[] { };
+            OrderBy = new Tuple<string, SortOrder>[] { };
+            Genres = new string[] { };
+            GenreIds = new string[] { };
+            EnableTotalRecordCount = true;
+            EnableUserData = true;
+        }
+
+        public bool EnableTotalRecordCount { get; set; }
+        public bool EnableUserData { get; set; }
+
+        /// <summary>
+        /// Fields to return within the items, in addition to basic information
+        /// </summary>
+        /// <value>The fields.</value>
+        public ItemFields[] Fields { get; set; }
+        public bool? EnableImages { get; set; }
+        public int? ImageTypeLimit { get; set; }
+        public ImageType[] EnableImageTypes { get; set; }
+
+        /// <summary>
+        /// Gets or sets the channel ids.
+        /// </summary>
+        /// <value>The channel ids.</value>
+        public string[] ChannelIds { get; set; }
+
+        /// <summary>
+        /// Gets or sets the user identifier.
+        /// </summary>
+        /// <value>The user identifier.</value>
+        public string UserId { get; set; }
+        public string SeriesTimerId { get; set; }
+        public string Name { 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 news or not
+        /// </summary>
+        /// <remarks>If set to null, all programs will be returned</remarks>
+        public bool? IsNews { 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>
+        /// Gets or sets a value indicating whether this instance is kids.
+        /// </summary>
+        /// <value><c>null</c> if [is kids] contains no value, <c>true</c> if [is kids]; otherwise, <c>false</c>.</value>
+        public bool? IsKids { get; set; }
+        /// <summary>
+        /// Gets or sets a value indicating whether this instance is sports.
+        /// </summary>
+        /// <value><c>null</c> if [is sports] contains no value, <c>true</c> if [is sports]; otherwise, <c>false</c>.</value>
+        public bool? IsSports { get; set; }
+
+        /// <summary>
+        /// Skips over a given number of items within the results. Use for paging.
+        /// </summary>
+        public int? StartIndex { get; set; }
+        public bool? IsSeries { 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; }
+
+        /// <summary>
+        /// The maximum number of items to return
+        /// </summary>
+        public int? Limit { get; set; }
+
+        public Tuple<string, SortOrder>[] OrderBy { get; set; }
+
+        /// <summary>
+        /// Limit results to items containing specific genres
+        /// </summary>
+        /// <value>The genres.</value>
+        public string[] GenreIds { get; set; }
+        public string[] Genres { get; set; }
+    }
+}
diff --git a/Jellyfin.ApiClient/Model/Querying/RecommendedProgramQuery.cs b/Jellyfin.ApiClient/Model/Querying/RecommendedProgramQuery.cs
new file mode 100644
index 0000000..c78fc13
--- /dev/null
+++ b/Jellyfin.ApiClient/Model/Querying/RecommendedProgramQuery.cs
@@ -0,0 +1,70 @@
+using MediaBrowser.Model.Entities;
+using MediaBrowser.Model.Querying;
+
+namespace Jellyfin.ApiClient.Model.Querying
+{
+    public class RecommendedProgramQuery
+    {
+        /// <summary>
+        /// Fields to return within the items, in addition to basic information
+        /// </summary>
+        /// <value>The fields.</value>
+        public ItemFields[] Fields { get; set; }
+        public bool? EnableImages { get; set; }
+        public int? ImageTypeLimit { get; set; }
+        public ImageType[] EnableImageTypes { get; set; }
+
+        public bool EnableTotalRecordCount { get; set; }
+
+        public RecommendedProgramQuery()
+        {
+            EnableTotalRecordCount = true;
+        }
+
+        /// <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 this instance is airing.
+        /// </summary>
+        /// <value><c>true</c> if this instance is airing; otherwise, <c>false</c>.</value>
+        public bool? IsAiring { 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; }
+
+        /// <summary>
+        /// The maximum number of items to return
+        /// </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? IsNews { 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; }
+        public bool? IsSeries { get; set; }
+        /// <summary>
+        /// Gets or sets a value indicating whether this instance is kids.
+        /// </summary>
+        /// <value><c>null</c> if [is kids] contains no value, <c>true</c> if [is kids]; otherwise, <c>false</c>.</value>
+        public bool? IsKids { get; set; }
+        /// <summary>
+        /// Gets or sets a value indicating whether this instance is sports.
+        /// </summary>
+        /// <value><c>null</c> if [is sports] contains no value, <c>true</c> if [is sports]; otherwise, <c>false</c>.</value>
+        public bool? IsSports { get; set; }
+    }
+}
diff --git a/Jellyfin.ApiClient/Model/Querying/RecordingGroupQuery.cs b/Jellyfin.ApiClient/Model/Querying/RecordingGroupQuery.cs
new file mode 100644
index 0000000..bce2333
--- /dev/null
+++ b/Jellyfin.ApiClient/Model/Querying/RecordingGroupQuery.cs
@@ -0,0 +1,11 @@
+namespace Jellyfin.ApiClient.Model.Querying
+{
+    public class RecordingGroupQuery
+    {
+        /// <summary>
+        /// Gets or sets the user identifier.
+        /// </summary>
+        /// <value>The user identifier.</value>
+        public string UserId { get; set; }
+    }
+}
diff --git a/Emby.ApiClient/Model/RemoteLogoutReason.cs b/Jellyfin.ApiClient/Model/RemoteLogoutReason.cs
similarity index 76%
rename from Emby.ApiClient/Model/RemoteLogoutReason.cs
rename to Jellyfin.ApiClient/Model/RemoteLogoutReason.cs
index f94820c..9da2e61 100644
--- a/Emby.ApiClient/Model/RemoteLogoutReason.cs
+++ b/Jellyfin.ApiClient/Model/RemoteLogoutReason.cs
@@ -1,5 +1,4 @@
-
-namespace Emby.ApiClient.Model
+namespace Jellyfin.ApiClient.Model
 {
     public enum RemoteLogoutReason
     {
diff --git a/Emby.ApiClient/Model/SeasonQuery.cs b/Jellyfin.ApiClient/Model/SeasonQuery.cs
similarity index 92%
rename from Emby.ApiClient/Model/SeasonQuery.cs
rename to Jellyfin.ApiClient/Model/SeasonQuery.cs
index 878c967..f8e56b3 100644
--- a/Emby.ApiClient/Model/SeasonQuery.cs
+++ b/Jellyfin.ApiClient/Model/SeasonQuery.cs
@@ -1,21 +1,15 @@
 using MediaBrowser.Model.Querying;
 
-namespace Emby.ApiClient.Model
+namespace Jellyfin.ApiClient.Model
 {
     public class SeasonQuery
     {
         public string UserId { get; set; }
-
         public string SeriesId { get; set; }
-
         public bool? IsMissing { get; set; }
-
         public bool? IsVirtualUnaired { get; set; }
-
         public ItemFields[] Fields { get; set; }
-
         public bool? IsSpecialSeason { get; set; }
-
         public SeasonQuery()
         {
             Fields = new ItemFields[] { };
diff --git a/Emby.ApiClient/Model/ServerCredentials.cs b/Jellyfin.ApiClient/Model/ServerCredentials.cs
similarity index 61%
rename from Emby.ApiClient/Model/ServerCredentials.cs
rename to Jellyfin.ApiClient/Model/ServerCredentials.cs
index 4b1cd67..8e3bdc1 100644
--- a/Emby.ApiClient/Model/ServerCredentials.cs
+++ b/Jellyfin.ApiClient/Model/ServerCredentials.cs
@@ -1,14 +1,12 @@
 using MediaBrowser.Model.Extensions;
 using System;
 using System.Collections.Generic;
-using MediaBrowser.Model.ApiClient;
 
-namespace Emby.ApiClient.Model
+namespace Jellyfin.ApiClient.Model
 {
     public class ServerCredentials
     {
         public List<ServerInfo> Servers { get; set; }
-
         public string ConnectUserId { get; set; }
         public string ConnectAccessToken { get; set; }
 
@@ -42,50 +40,20 @@ public void AddOrUpdateServer(ServerInfo server)
                 {
                     existing.DateLastAccessed = server.DateLastAccessed;
                 }
-                
-                existing.UserLinkType = server.UserLinkType;
 
                 if (!string.IsNullOrEmpty(server.AccessToken))
                 {
                     existing.AccessToken = server.AccessToken;
                     existing.UserId = server.UserId;
                 }
-                if (!string.IsNullOrEmpty(server.ExchangeToken))
-                {
-                    existing.ExchangeToken = server.ExchangeToken;
-                }
-                if (!string.IsNullOrEmpty(server.RemoteAddress))
-                {
-                    existing.RemoteAddress = server.RemoteAddress;
-                }
-                if (!string.IsNullOrEmpty(server.ConnectServerId))
-                {
-                    existing.ConnectServerId = server.ConnectServerId;
-                }
-                if (!string.IsNullOrEmpty(server.LocalAddress))
+                if (!string.IsNullOrEmpty(server.Address.ToString()))
                 {
-                    existing.LocalAddress = server.LocalAddress;
-                }
-                if (!string.IsNullOrEmpty(server.ManualAddress))
-                {
-                    existing.ManualAddress = server.ManualAddress;
+                    existing.Address = server.Address;
                 }
                 if (!string.IsNullOrEmpty(server.Name))
                 {
                     existing.Name = server.Name;
                 }
-                if (server.WakeOnLanInfos != null && server.WakeOnLanInfos.Count > 0)
-                {
-                    existing.WakeOnLanInfos = new List<WakeOnLanInfo>();
-                    foreach (WakeOnLanInfo info in server.WakeOnLanInfos)
-                    {
-                        existing.WakeOnLanInfos.Add(info);
-                    }
-                }
-                if (server.LastConnectionMode.HasValue)
-                {
-                    existing.LastConnectionMode = server.LastConnectionMode;
-                }
             }
             else
             {
diff --git a/Jellyfin.ApiClient/Model/ServerInfo.cs b/Jellyfin.ApiClient/Model/ServerInfo.cs
new file mode 100644
index 0000000..3a8f7fe
--- /dev/null
+++ b/Jellyfin.ApiClient/Model/ServerInfo.cs
@@ -0,0 +1,35 @@
+using MediaBrowser.Model.System;
+using System;
+
+namespace Jellyfin.ApiClient.Model
+{
+    public class ServerInfo
+    {
+        public String Name { get; set; }
+        public String Id { get; set; }
+        public Uri Address { get; set; }
+        public Guid UserId { get; set; }
+        public String AccessToken { get; set; }
+        public DateTime DateLastAccessed { get; set; }
+
+        public ServerInfo()
+        {
+        }
+
+        public void ImportInfo(PublicSystemInfo systemInfo)
+        {
+            Name = systemInfo.ServerName;
+            Id = systemInfo.Id;
+
+            if (!string.IsNullOrEmpty(systemInfo.LocalAddress))
+            {
+                Address = new Uri(systemInfo.LocalAddress, UriKind.Relative);
+            }
+
+            if (!string.IsNullOrEmpty(systemInfo.LocalAddress))
+            {
+                Address = new Uri(systemInfo.LocalAddress, UriKind.Relative);
+            }
+        }
+    }
+}
diff --git a/Jellyfin.ApiClient/Model/SessionInfoDto.cs b/Jellyfin.ApiClient/Model/SessionInfoDto.cs
new file mode 100644
index 0000000..32c6e66
--- /dev/null
+++ b/Jellyfin.ApiClient/Model/SessionInfoDto.cs
@@ -0,0 +1,119 @@
+using MediaBrowser.Model.Dto;
+using MediaBrowser.Model.Session;
+using System;
+
+namespace Jellyfin.ApiClient.Model
+{
+    public class SessionInfoDto
+    {
+        /// <summary>
+        /// Gets or sets the supported commands.
+        /// </summary>
+        /// <value>The supported commands.</value>
+        public string[] SupportedCommands { get; set; }
+
+        /// <summary>
+        /// Gets or sets the playable media types.
+        /// </summary>
+        /// <value>The playable media types.</value>
+        public string[] PlayableMediaTypes { get; set; }
+
+        /// <summary>
+        /// Gets or sets the id.
+        /// </summary>
+        /// <value>The id.</value>
+        public string Id { get; set; }
+
+        public string ServerId { get; set; }
+
+        /// <summary>
+        /// Gets or sets the user id.
+        /// </summary>
+        /// <value>The user id.</value>
+        public string UserId { get; set; }
+
+        /// <summary>
+        /// Gets or sets the user primary image tag.
+        /// </summary>
+        /// <value>The user primary image tag.</value>
+        public string UserPrimaryImageTag { get; set; }
+
+        /// <summary>
+        /// Gets or sets the name of the user.
+        /// </summary>
+        /// <value>The name of the user.</value>
+        public string UserName { get; set; }
+
+        /// <summary>
+        /// Gets or sets the additional users present.
+        /// </summary>
+        /// <value>The additional users present.</value>
+        public SessionUserInfo[] AdditionalUsers { get; set; }
+
+        /// <summary>
+        /// Gets or sets the application version.
+        /// </summary>
+        /// <value>The application version.</value>
+        public string ApplicationVersion { get; set; }
+
+        /// <summary>
+        /// Gets or sets the type of the client.
+        /// </summary>
+        /// <value>The type of the client.</value>
+        public string Client { get; set; }
+
+        /// <summary>
+        /// Gets or sets the last activity date.
+        /// </summary>
+        /// <value>The last activity date.</value>
+        public DateTime LastActivityDate { get; set; }
+
+        /// <summary>
+        /// Gets or sets the now viewing item.
+        /// </summary>
+        /// <value>The now viewing item.</value>
+        public BaseItemDto NowViewingItem { get; set; }
+
+        /// <summary>
+        /// Gets or sets the name of the device.
+        /// </summary>
+        /// <value>The name of the device.</value>
+        public string DeviceName { get; set; }
+
+        /// <summary>
+        /// Gets or sets the now playing item.
+        /// </summary>
+        /// <value>The now playing item.</value>
+        public BaseItemDto NowPlayingItem { get; set; }
+
+        /// <summary>
+        /// Gets or sets the device id.
+        /// </summary>
+        /// <value>The device id.</value>
+        public string DeviceId { get; set; }
+
+        /// <summary>
+        /// Gets or sets the application icon URL.
+        /// </summary>
+        /// <value>The application icon URL.</value>
+        public string AppIconUrl { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether [supports remote control].
+        /// </summary>
+        /// <value><c>true</c> if [supports remote control]; otherwise, <c>false</c>.</value>
+        public bool SupportsRemoteControl { get; set; }
+
+        public PlayerStateInfo PlayState { get; set; }
+
+        public TranscodingInfo TranscodingInfo { get; set; }
+
+        public SessionInfoDto()
+        {
+            AdditionalUsers = new SessionUserInfo[] { };
+
+            PlayableMediaTypes = new string[] { };
+            SupportedCommands = new string[] { };
+        }
+    }
+}
diff --git a/Emby.ApiClient/QueryStringDictionary.cs b/Jellyfin.ApiClient/NameValueCollectionExtensions.cs
similarity index 57%
rename from Emby.ApiClient/QueryStringDictionary.cs
rename to Jellyfin.ApiClient/NameValueCollectionExtensions.cs
index 7444338..62083e9 100644
--- a/Emby.ApiClient/QueryStringDictionary.cs
+++ b/Jellyfin.ApiClient/NameValueCollectionExtensions.cs
@@ -1,31 +1,25 @@
 using System;
 using System.Collections.Generic;
+using System.Collections.Specialized;
 using System.Globalization;
 using System.Linq;
+using System.Web;
 
-namespace Emby.ApiClient
+namespace Jellyfin.ApiClient
 {
     /// <summary>
-    /// Class QueryStringDictionary
+    /// Extensions for NameValueCollection
     /// </summary>
-    public class QueryStringDictionary : Dictionary<string, string>
+    public static class NameValueCollectionExtensions
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="QueryStringDictionary" /> class.
-        /// </summary>
-        public QueryStringDictionary()
-            : base(StringComparer.OrdinalIgnoreCase)
-        {
-        }
-
         /// <summary>
         /// Adds the specified name.
         /// </summary>
         /// <param name="name">The name.</param>
         /// <param name="value">The value.</param>
-        public void Add(string name, int value)
+        public static void Add(this NameValueCollection col, string name, int value)
         {
-            Add(name, value.ToString(CultureInfo.InvariantCulture));
+            col.Add(name, value.ToString(CultureInfo.InvariantCulture));
         }
 
         /// <summary>
@@ -33,9 +27,9 @@ public void Add(string name, int value)
         /// </summary>
         /// <param name="name">The name.</param>
         /// <param name="value">The value.</param>
-        public void Add(string name, long value)
+        public static void Add(this NameValueCollection col, string name, long value)
         {
-            Add(name, value.ToString(CultureInfo.InvariantCulture));
+            col.Add(name, value.ToString(CultureInfo.InvariantCulture));
         }
 
         /// <summary>
@@ -43,9 +37,9 @@ public void Add(string name, long value)
         /// </summary>
         /// <param name="name">The name.</param>
         /// <param name="value">The value.</param>
-        public void Add(string name, double value)
+        public static void Add(this NameValueCollection col, string name, double value)
         {
-            Add(name, value.ToString(CultureInfo.InvariantCulture));
+            col.Add(name, value.ToString(CultureInfo.InvariantCulture));
         }
 
         /// <summary>
@@ -53,11 +47,11 @@ public void Add(string name, double value)
         /// </summary>
         /// <param name="name">The name.</param>
         /// <param name="value">The value.</param>
-        public void AddIfNotNullOrEmpty(string name, string value)
+        public static void AddIfNotNullOrEmpty(this NameValueCollection col, string name, string value)
         {
             if (!string.IsNullOrEmpty(value))
             {
-                Add(name, value);
+                col.Add(name, value);
             }
         }
 
@@ -66,11 +60,11 @@ public void AddIfNotNullOrEmpty(string name, string value)
         /// </summary>
         /// <param name="name">The name.</param>
         /// <param name="value">The value.</param>
-        public void AddIfNotNull(string name, int? value)
+        public static void AddIfNotNull(this NameValueCollection col, string name, int? value)
         {
             if (value.HasValue)
             {
-                Add(name, value.Value);
+                col.Add(name, value.Value);
             }
         }
 
@@ -79,11 +73,11 @@ public void AddIfNotNull(string name, int? value)
         /// </summary>
         /// <param name="name">The name.</param>
         /// <param name="value">The value.</param>
-        public void AddIfNotNull(string name, double? value)
+        public static void AddIfNotNull(this NameValueCollection col, string name, double? value)
         {
             if (value.HasValue)
             {
-                Add(name, value.Value);
+                col.Add(name, value.Value);
             }
         }
 
@@ -92,11 +86,11 @@ public void AddIfNotNull(string name, double? value)
         /// </summary>
         /// <param name="name">The name.</param>
         /// <param name="value">The value.</param>
-        public void AddIfNotNull(string name, long? value)
+        public static void AddIfNotNull(this NameValueCollection col, string name, long? value)
         {
             if (value.HasValue)
             {
-                Add(name, value.Value);
+                col.Add(name, value.Value);
             }
         }
 
@@ -105,9 +99,9 @@ public void AddIfNotNull(string name, long? value)
         /// </summary>
         /// <param name="name">The name.</param>
         /// <param name="value">if set to <c>true</c> [value].</param>
-        public void Add(string name, bool value)
+        public static void Add(this NameValueCollection col, string name, bool value)
         {
-            Add(name, value.ToString());
+            col.Add(name, value.ToString(CultureInfo.InvariantCulture));
         }
 
         /// <summary>
@@ -115,11 +109,11 @@ public void Add(string name, bool value)
         /// </summary>
         /// <param name="name">The name.</param>
         /// <param name="value">if set to <c>true</c> [value].</param>
-        public void AddIfNotNull(string name, bool? value)
+        public static void AddIfNotNull(this NameValueCollection col, string name, bool? value)
         {
             if (value.HasValue)
             {
-                Add(name, value.Value);
+                col.Add(name, value.Value);
             }
         }
 
@@ -129,14 +123,14 @@ public void AddIfNotNull(string name, bool? value)
         /// <param name="name">The name.</param>
         /// <param name="value">The value.</param>
         /// <exception cref="System.ArgumentNullException">value</exception>
-        public void Add(string name, IEnumerable<int> value)
+        public static void Add(this NameValueCollection col, string name, IEnumerable<int> value)
         {
             if (value == null)
             {
                 throw new ArgumentNullException("value");
             }
 
-            Add(name, string.Join(",", value.Select(v => v.ToString(CultureInfo.InvariantCulture)).ToArray()));
+            col.Add(name, string.Join(",", value.Select(v => v.ToString(CultureInfo.InvariantCulture)).ToArray()));
         }
 
         /// <summary>
@@ -144,11 +138,11 @@ public void Add(string name, IEnumerable<int> value)
         /// </summary>
         /// <param name="name">The name.</param>
         /// <param name="value">The value.</param>
-        public void AddIfNotNull(string name, IEnumerable<int> value)
+        public static void AddIfNotNull(this NameValueCollection col, string name, IEnumerable<int> value)
         {
             if (value != null)
             {
-                Add(name, value);
+                col.Add(name, value);
             }
         }
 
@@ -158,16 +152,14 @@ public void AddIfNotNull(string name, IEnumerable<int> value)
         /// <param name="name">The name.</param>
         /// <param name="value">The value.</param>
         /// <exception cref="System.ArgumentNullException">value</exception>
-        public void Add(string name, IEnumerable<string> value)
+        public static void Add(this NameValueCollection col, string name, IEnumerable<string> value)
         {
             if (value == null)
             {
                 throw new ArgumentNullException("value");
             }
 
-            string paramValue = string.Join(",", value.ToArray());
-
-            Add(name, paramValue);
+            col.Add(name, string.Join(",", value.ToArray()));
         }
 
         /// <summary>
@@ -175,11 +167,11 @@ public void Add(string name, IEnumerable<string> value)
         /// </summary>
         /// <param name="name">The name.</param>
         /// <param name="value">The value.</param>
-        public void AddIfNotNull(string name, IEnumerable<string> value)
+        public static void AddIfNotNull(this NameValueCollection col, string name, IEnumerable<string> value)
         {
             if (value != null)
             {
-                Add(name, value);
+                col.Add(name, value);
             }
         }
 
@@ -190,16 +182,14 @@ public void AddIfNotNull(string name, IEnumerable<string> value)
         /// <param name="value">The value.</param>
         /// <param name="delimiter">The delimiter.</param>
         /// <exception cref="ArgumentNullException">value</exception>
-        public void Add(string name, IEnumerable<string> value, string delimiter)
+        public static void Add(this NameValueCollection col, string name, IEnumerable<string> value, string delimiter)
         {
             if (value == null)
             {
                 throw new ArgumentNullException("value");
             }
 
-            string paramValue = string.Join(delimiter, value.ToArray());
-
-            Add(name, paramValue);
+            col.Add(name, string.Join(delimiter, value.ToArray()));
         }
 
         /// <summary>
@@ -208,50 +198,22 @@ public void Add(string name, IEnumerable<string> value, string delimiter)
         /// <param name="name">The name.</param>
         /// <param name="value">The value.</param>
         /// <param name="delimiter">The delimiter.</param>
-        public void AddIfNotNull(string name, IEnumerable<string> value, string delimiter)
+        public static void AddIfNotNull(this NameValueCollection col, string name, IEnumerable<string> value, string delimiter)
         {
             if (value != null)
             {
-                Add(name, value, delimiter);
+                col.Add(name, value, delimiter);
             }
         }
 
-        /// <summary>
-        /// Gets the query string.
-        /// </summary>
-        /// <returns>System.String.</returns>
-        public string GetQueryString()
+        public static string ToQueryString(this NameValueCollection col)
         {
-            string[] queryParams = this.Select(i => string.Format("{0}={1}", i.Key, GetEncodedValue(i.Value))).ToArray();
-
-            return string.Join("&", queryParams);
-        }
-
-        /// <summary>
-        /// Gets the encoded value.
-        /// </summary>
-        /// <param name="value">The value.</param>
-        /// <returns>System.String.</returns>
-        private string GetEncodedValue(string value)
-        {
-            return value;
-        }
-
-        /// <summary>
-        /// Gets the URL.
-        /// </summary>
-        /// <param name="prefix">The prefix.</param>
-        /// <returns>System.String.</returns>
-        public string GetUrl(string prefix)
-        {
-            string query = GetQueryString();
-
-            if (string.IsNullOrEmpty(query))
-            {
-                return prefix;
-            }
-
-            return prefix + "?" + query;
+            var queryArray = (
+                from key in col.AllKeys
+                from value in col.GetValues(key)
+                select string.Format("{0}={1}", HttpUtility.UrlEncode(key), HttpUtility.UrlEncode(value))
+            ).ToArray();
+            return string.Join("&", queryArray);
         }
     }
 }
diff --git a/Jellyfin.ApiClient/Net/GeneralCommandEventArgs.cs b/Jellyfin.ApiClient/Net/GeneralCommandEventArgs.cs
new file mode 100644
index 0000000..9958ee7
--- /dev/null
+++ b/Jellyfin.ApiClient/Net/GeneralCommandEventArgs.cs
@@ -0,0 +1,22 @@
+using MediaBrowser.Model.Session;
+
+namespace Jellyfin.ApiClient.Net
+{
+    /// <summary>	
+    /// Class SystemCommandEventArgs	
+    /// </summary>	
+    public class GeneralCommandEventArgs
+    {
+        /// <summary>	
+        /// Gets or sets the command.	
+        /// </summary>	
+        /// <value>The command.</value>	
+        public GeneralCommand Command { get; set; }
+
+        /// <summary>	
+        /// Gets or sets the type of the known command.	
+        /// </summary>	
+        /// <value>The type of the known command.</value>	
+        public GeneralCommandType? KnownCommandType { get; set; }
+    }
+}
diff --git a/Emby.ApiClient/Net/HttpHeaders.cs b/Jellyfin.ApiClient/Net/HttpHeaders.cs
similarity index 96%
rename from Emby.ApiClient/Net/HttpHeaders.cs
rename to Jellyfin.ApiClient/Net/HttpHeaders.cs
index f9b5a0d..b545526 100644
--- a/Emby.ApiClient/Net/HttpHeaders.cs
+++ b/Jellyfin.ApiClient/Net/HttpHeaders.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace Emby.ApiClient.Net
+namespace Jellyfin.ApiClient.Net
 {
     public class HttpHeaders : Dictionary<string,string>
     {
diff --git a/Emby.ApiClient/Net/HttpRequest.cs b/Jellyfin.ApiClient/Net/HttpRequest.cs
similarity index 83%
rename from Emby.ApiClient/Net/HttpRequest.cs
rename to Jellyfin.ApiClient/Net/HttpRequest.cs
index 1c3e9c2..8742012 100644
--- a/Emby.ApiClient/Net/HttpRequest.cs
+++ b/Jellyfin.ApiClient/Net/HttpRequest.cs
@@ -1,9 +1,10 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Threading;
 
-namespace Emby.ApiClient.Net
+namespace Jellyfin.ApiClient.Net
 {
     public class HttpRequest
     {
@@ -12,7 +13,7 @@ public class HttpRequest
         public string RequestContent { get; set; }
         public string RequestContentType { get; set; }
         public HttpHeaders RequestHeaders { get; set; }
-        public string Url { get; set; }
+        public Uri Url { get; set; }
         public Stream RequestStream { get; set; }
 
         public int Timeout { get; set; }
@@ -29,7 +30,7 @@ public void SetPostData(IDictionary<string, string> values)
             var postContent = string.Join("&", strings.ToArray());
 
             RequestContent = postContent;
-            RequestContentType = "application/x-www-form-urlencoded";
+            RequestContentType = "application/json";
         }
     }
 }
diff --git a/Emby.ApiClient/Net/HttpWebRequestClient.cs b/Jellyfin.ApiClient/Net/HttpWebRequestClient.cs
similarity index 69%
rename from Emby.ApiClient/Net/HttpWebRequestClient.cs
rename to Jellyfin.ApiClient/Net/HttpWebRequestClient.cs
index b757477..934ae8e 100644
--- a/Emby.ApiClient/Net/HttpWebRequestClient.cs
+++ b/Jellyfin.ApiClient/Net/HttpWebRequestClient.cs
@@ -1,6 +1,5 @@
-using MediaBrowser.Model.ApiClient;
-using MediaBrowser.Model.Logging;
-using MediaBrowser.Model.Net;
+using MediaBrowser.Model.Net;
+using Microsoft.Extensions.Logging;
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -10,14 +9,14 @@
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace Emby.ApiClient.Net
+namespace Jellyfin.ApiClient.Net
 {
     /// <summary>
     /// Class HttpWebRequestClient
     /// </summary>
     public class HttpWebRequestClient : IAsyncHttpClient
     {
-        public event EventHandler<HttpResponseEventArgs> HttpResponseReceived;
+        public event EventHandler<HttpWebResponse> HttpResponseReceived;
         private readonly IHttpWebRequestFactory _requestFactory;
 
         /// <summary>
@@ -28,32 +27,16 @@ public class HttpWebRequestClient : IAsyncHttpClient
         /// <param name="statusCode">The status code.</param>
         /// <param name="headers">The headers.</param>
         /// <param name="requestTime">The request time.</param>
-        private void OnResponseReceived(string url, 
+        private void OnResponseReceived(Uri url, 
             string verb, 
-            HttpStatusCode statusCode, 
-            Dictionary<string,string> headers,
+            HttpWebResponse response,
             DateTime requestTime)
         {
             var duration = DateTime.Now - requestTime;
 
-            Logger.Debug("Received {0} status code after {1} ms from {2}: {3}", (int)statusCode, duration.TotalMilliseconds, verb, url);
+            Logger.LogDebug("Received {0} status code after {1} ms from {2}: {3}", (int)response.StatusCode, duration.TotalMilliseconds, verb, url);
 
-            if (HttpResponseReceived != null)
-            {
-                try
-                {
-                    HttpResponseReceived(this, new HttpResponseEventArgs
-                    {
-                        Url = url,
-                        StatusCode = statusCode,
-                        Headers = headers
-                    });
-                }
-                catch (Exception ex)
-                {
-                    Logger.ErrorException("Error in HttpResponseReceived event handler", ex);
-                }
-            }
+            HttpResponseReceived?.Invoke(this, response);
         }
 
         /// <summary>
@@ -73,7 +56,7 @@ public HttpWebRequestClient(ILogger logger, IHttpWebRequestFactory requestFactor
             _requestFactory = requestFactory;
         }
 
-        public async Task<HttpResponse> GetResponse(HttpRequest options, bool sendFailureResponse = false)
+        public async Task<HttpWebResponse> GetResponse(HttpRequest options, bool sendFailureResponse = false)
         {
             options.CancellationToken.ThrowIfCancellationRequested();
 
@@ -105,7 +88,7 @@ public async Task<HttpResponse> GetResponse(HttpRequest options, bool sendFailur
                 }
             }
 
-            Logger.Debug(options.Method + " {0}", options.Url);
+            Logger.LogDebug(options.Method + " {0}", options.Url);
 
             var requestTime = DateTime.Now;
 
@@ -117,14 +100,13 @@ public async Task<HttpResponse> GetResponse(HttpRequest options, bool sendFailur
 
                 var httpResponse = (HttpWebResponse)response;
 
-                var headers = ConvertHeaders(response);
-                OnResponseReceived(options.Url, options.Method, httpResponse.StatusCode, headers, requestTime);
+                OnResponseReceived(options.Url, options.Method, httpResponse, requestTime);
 
                 EnsureSuccessStatusCode(httpResponse);
 
                 options.CancellationToken.ThrowIfCancellationRequested();
 
-                return GetResponse(httpResponse, headers);
+                return httpResponse;
             }
             catch (OperationCanceledException ex)
             {
@@ -139,11 +121,9 @@ public async Task<HttpResponse> GetResponse(HttpRequest options, bool sendFailur
                     var webException = ex as WebException ?? ex.InnerException as WebException;
                     if (webException != null)
                     {
-                        var response = webException.Response as HttpWebResponse;
-                        if (response != null)
+                        if (webException.Response is HttpWebResponse response)
                         {
-                            var headers = ConvertHeaders(response);
-                            return GetResponse(response, headers);
+                            return response;
                         }
                     }
                 }
@@ -152,53 +132,11 @@ public async Task<HttpResponse> GetResponse(HttpRequest options, bool sendFailur
             }
         }
 
-        private HttpResponse GetResponse(HttpWebResponse httpResponse, Dictionary<string,string> headers)
-        {
-            return new HttpResponse(httpResponse)
-            {
-                Content = httpResponse.GetResponseStream(),
-
-                StatusCode = httpResponse.StatusCode,
-
-                ContentType = httpResponse.ContentType,
-
-                Headers = headers,
-
-                ContentLength = GetContentLength(httpResponse),
-
-                ResponseUrl = httpResponse.ResponseUri.ToString()
-            };
-        }
-
-        private long? GetContentLength(HttpWebResponse response)
-        {
-            var length = response.ContentLength;
-
-            if (length == 0)
-            {
-                return null;
-            }
-
-            return length;
-        }
-
         public async Task<Stream> SendAsync(HttpRequest options)
         {
             var response = await GetResponse(options).ConfigureAwait(false);
 
-            return response.Content;
-        }
-
-        /// <summary>
-        /// Converts the headers.
-        /// </summary>
-        /// <param name="response">The response.</param>
-        /// <returns>Dictionary&lt;System.String, System.String&gt;.</returns>
-        private Dictionary<string, string> ConvertHeaders(WebResponse response)
-        {
-            var headers = response.Headers;
-
-            return headers.Cast<string>().ToDictionary(p => p, p => headers[p]);
+            return response.GetResponseStream();
         }
 
         private Exception GetExceptionToThrow(Exception ex, HttpRequest options, DateTime requestTime)
@@ -207,15 +145,14 @@ private Exception GetExceptionToThrow(Exception ex, HttpRequest options, DateTim
 
             if (webException != null)
             {
-                Logger.ErrorException("Error getting response from " + options.Url, ex);
+                Logger.LogError("Error getting response from " + options.Url, ex);
 
                 var httpException = new HttpException(ex.Message, ex);
-                
-                var response = webException.Response as HttpWebResponse;
-                if (response != null)
+
+                if (webException.Response is HttpWebResponse response)
                 {
                     httpException.StatusCode = response.StatusCode;
-                    OnResponseReceived(options.Url, options.Method, response.StatusCode, ConvertHeaders(response), requestTime);
+                    OnResponseReceived(options.Url, options.Method, response, requestTime);
                 }
 
                 return httpException;
@@ -224,7 +161,7 @@ private Exception GetExceptionToThrow(Exception ex, HttpRequest options, DateTim
             var timeoutException = ex as TimeoutException ?? ex.InnerException as TimeoutException;
             if (timeoutException != null)
             {
-                Logger.ErrorException("Request timeout to " + options.Url, ex);
+                Logger.LogError("Request timeout to " + options.Url, ex);
                 
                 var httpException = new HttpException(ex.Message, ex)
                 {
@@ -234,7 +171,7 @@ private Exception GetExceptionToThrow(Exception ex, HttpRequest options, DateTim
                 return httpException;
             }
 
-            Logger.ErrorException("Error getting response from " + options.Url, ex);
+            Logger.LogError("Error getting response from " + options.Url, ex);
             return ex;
         }
 
@@ -259,14 +196,14 @@ private void ApplyHeaders(HttpHeaders headers, HttpWebRequest request)
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <param name="exception">The exception.</param>
         /// <returns>Exception.</returns>
-        private Exception GetCancellationException(string url, CancellationToken cancellationToken, OperationCanceledException exception)
+        private Exception GetCancellationException(Uri url, CancellationToken cancellationToken, OperationCanceledException exception)
         {
             // If the HttpClient's timeout is reached, it will cancel the Task internally
             if (!cancellationToken.IsCancellationRequested)
             {
                 var msg = string.Format("Connection to {0} timed out", url);
 
-                Logger.Error(msg);
+                Logger.LogError(msg);
 
                 // Throw an HttpException so that the caller doesn't think it was cancelled by user code
                 return new HttpException(msg, exception)
diff --git a/Emby.ApiClient/Net/HttpWebRequestFactory.cs b/Jellyfin.ApiClient/Net/HttpWebRequestFactory.cs
similarity index 83%
rename from Emby.ApiClient/Net/HttpWebRequestFactory.cs
rename to Jellyfin.ApiClient/Net/HttpWebRequestFactory.cs
index 8a7b54c..7c2e56c 100644
--- a/Emby.ApiClient/Net/HttpWebRequestFactory.cs
+++ b/Jellyfin.ApiClient/Net/HttpWebRequestFactory.cs
@@ -2,19 +2,17 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Net;
-using System.Reflection;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace Emby.ApiClient.Net
+namespace Jellyfin.ApiClient.Net
 {
     public class HttpWebRequestFactory : IHttpWebRequestFactory
     {
-        private static PropertyInfo _httpBehaviorPropertyInfo;
         public HttpWebRequest Create(HttpRequest options)
         {
-            var request = HttpWebRequest.CreateHttp(options.Url);
+            var request = WebRequest.CreateHttp(options.Url);
 
             request.AutomaticDecompression = DecompressionMethods.Deflate;
             request.CachePolicy = new System.Net.Cache.RequestCachePolicy(System.Net.Cache.RequestCacheLevel.Revalidate);
@@ -23,14 +21,6 @@ public HttpWebRequest Create(HttpRequest options)
             request.Pipelined = true;
             request.Timeout = options.Timeout;
 
-            // This is a hack to prevent KeepAlive from getting disabled internally by the HttpWebRequest
-            /*var sp = request.ServicePoint;
-            if (_httpBehaviorPropertyInfo == null)
-            {
-                _httpBehaviorPropertyInfo = sp.GetType().GetProperty("HttpBehaviour", BindingFlags.Instance | BindingFlags.NonPublic);
-            }
-            _httpBehaviorPropertyInfo?.SetValue(sp, (byte)0, null);*/
-
             if (!string.IsNullOrEmpty(options.RequestContent) ||
                 string.Equals(options.Method, "post", StringComparison.OrdinalIgnoreCase))
             {
diff --git a/Emby.ApiClient/Net/IAsyncHttpClient.cs b/Jellyfin.ApiClient/Net/IAsyncHttpClient.cs
similarity index 74%
rename from Emby.ApiClient/Net/IAsyncHttpClient.cs
rename to Jellyfin.ApiClient/Net/IAsyncHttpClient.cs
index 03bc9cb..5bafff4 100644
--- a/Emby.ApiClient/Net/IAsyncHttpClient.cs
+++ b/Jellyfin.ApiClient/Net/IAsyncHttpClient.cs
@@ -1,10 +1,9 @@
-using MediaBrowser.Model.ApiClient;
-using MediaBrowser.Model.Net;
-using System;
+using System;
 using System.IO;
+using System.Net;
 using System.Threading.Tasks;
 
-namespace Emby.ApiClient.Net
+namespace Jellyfin.ApiClient.Net
 {
     /// <summary>
     /// Interface IHttpClient
@@ -14,7 +13,7 @@ public interface IAsyncHttpClient : IDisposable
         /// <summary>
         /// Occurs when [HTTP response received].
         /// </summary>
-        event EventHandler<HttpResponseEventArgs> HttpResponseReceived;
+        event EventHandler<HttpWebResponse> HttpResponseReceived;
 
         /// <summary>
         /// Sends the asynchronous.
@@ -31,6 +30,6 @@ public interface IAsyncHttpClient : IDisposable
         /// <returns>
         /// Task&lt;HttpResponse&gt;.
         /// </returns>
-        Task<HttpResponse> GetResponse(HttpRequest options, bool sendFailureResponse = false);
+        Task<HttpWebResponse> GetResponse(HttpRequest options, bool sendFailureResponse = false);
     }
 }
diff --git a/Jellyfin.ApiClient/Net/INetworkConnection.cs b/Jellyfin.ApiClient/Net/INetworkConnection.cs
new file mode 100644
index 0000000..fd2d4ae
--- /dev/null
+++ b/Jellyfin.ApiClient/Net/INetworkConnection.cs
@@ -0,0 +1,25 @@
+using Jellyfin.ApiClient.Model;
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Jellyfin.ApiClient.Net
+{
+    public interface INetworkConnection
+    {
+        /// <summary>
+        /// Occurs when [network changed].
+        /// </summary>
+        event EventHandler<EventArgs> NetworkChanged;
+
+        /// <summary>
+        /// Gets the network status.
+        /// </summary>
+        /// <returns>NetworkStatus.</returns>
+        NetworkStatus GetNetworkStatus();
+
+#if WINDOWS_UWP
+        bool HasUnmeteredConnection();
+#endif
+    }
+}
diff --git a/Emby.ApiClient/Net/IServerLocator.cs b/Jellyfin.ApiClient/Net/IServerLocator.cs
similarity index 78%
rename from Emby.ApiClient/Net/IServerLocator.cs
rename to Jellyfin.ApiClient/Net/IServerLocator.cs
index dc534fe..a872572 100644
--- a/Emby.ApiClient/Net/IServerLocator.cs
+++ b/Jellyfin.ApiClient/Net/IServerLocator.cs
@@ -3,13 +3,13 @@
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace Emby.ApiClient.Net
+namespace Jellyfin.ApiClient.Net
 {
     public interface IServerLocator
     {
         /// <summary>
         /// Attemps to discover the server within a local network
         /// </summary>
-        Task<List<ServerDiscoveryInfo>> FindServers(int timeoutMs, CancellationToken cancellationToken = default(CancellationToken));
+        Task<List<ServerDiscoveryInfo>> FindServers(int timeoutMs, CancellationToken cancellationToken = default);
     }
 }
\ No newline at end of file
diff --git a/Emby.ApiClient/Net/NetworkConnection.cs b/Jellyfin.ApiClient/Net/NetworkConnection.cs
similarity index 67%
rename from Emby.ApiClient/Net/NetworkConnection.cs
rename to Jellyfin.ApiClient/Net/NetworkConnection.cs
index 35d9590..518306f 100644
--- a/Emby.ApiClient/Net/NetworkConnection.cs
+++ b/Jellyfin.ApiClient/Net/NetworkConnection.cs
@@ -1,14 +1,13 @@
-using MediaBrowser.Model.ApiClient;
-using MediaBrowser.Model.Logging;
+using Jellyfin.ApiClient.Model;
+using Microsoft.Extensions.Logging;
 using System;
 using System.Net;
 using System.Net.NetworkInformation;
 using System.Net.Sockets;
 using System.Threading;
 using System.Threading.Tasks;
-using Emby.ApiClient.Model;
 
-namespace Emby.ApiClient.Net
+namespace Jellyfin.ApiClient.Net
 {
     public class NetworkConnection : INetworkConnection
     {
@@ -38,43 +37,6 @@ void NetworkChange_NetworkAvailabilityChanged(object sender, NetworkAvailability
 
         public event EventHandler<EventArgs> NetworkChanged;
         
-        public Task SendWakeOnLan(string macAddress, string ipAddress, int port, CancellationToken cancellationToken)
-        {
-            return SendWakeOnLan(macAddress, new IPEndPoint(IPAddress.Parse(ipAddress), port), cancellationToken);
-        }
-
-        public Task SendWakeOnLan(string macAddress, int port, CancellationToken cancellationToken)
-        {
-            return SendWakeOnLan(macAddress, new IPEndPoint(IPAddress.Broadcast, port), cancellationToken);
-        }
-
-        private async Task SendWakeOnLan(string macAddress, IPEndPoint endPoint, CancellationToken cancellationToken)
-        {
-            const int payloadSize = 102;
-
-            var macBytes = PhysicalAddress.Parse(macAddress).GetAddressBytes();
-            _logger.Debug(string.Format("Sending magic packet to {0}", macAddress));
-
-            // Construct magic packet
-            var payload = new byte[payloadSize];
-            Buffer.BlockCopy(new byte[] { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF }, 0, payload, 0, 6);
-
-            for (var i = 1; i < 17; i++) 
-            { 
-                Buffer.BlockCopy(macBytes, 0, payload, 6 * i, 6);
-            }
-
-            // Send packet LAN
-            using (var udp = new UdpClient())
-            {
-                udp.Connect(endPoint);
-
-                cancellationToken.ThrowIfCancellationRequested();
-
-                await udp.SendAsync(payload, payloadSize).ConfigureAwait(false);
-            }
-        }
-        
         public NetworkStatus GetNetworkStatus()
         {
             return new NetworkStatus
@@ -92,8 +54,7 @@ public NetworkStatus GetNetworkStatus()
         /// </returns>
         private bool IsNetworkAvailable()
         {
-            return true;
-            //return IsNetworkAvailable(0);
+            return IsNetworkAvailable(0);
         }
 
         /// <summary>
diff --git a/Emby.ApiClient/Net/ServerLocator.cs b/Jellyfin.ApiClient/Net/ServerLocator.cs
similarity index 90%
rename from Emby.ApiClient/Net/ServerLocator.cs
rename to Jellyfin.ApiClient/Net/ServerLocator.cs
index 364f2da..e82c3e3 100644
--- a/Emby.ApiClient/Net/ServerLocator.cs
+++ b/Jellyfin.ApiClient/Net/ServerLocator.cs
@@ -1,6 +1,7 @@
 using MediaBrowser.Model.ApiClient;
-using MediaBrowser.Model.Logging;
 using MediaBrowser.Model.Serialization;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging.Abstractions;
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
@@ -11,7 +12,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace Emby.ApiClient.Net
+namespace Jellyfin.ApiClient.Net
 {
     public class ServerLocator : IServerLocator
     {
@@ -19,7 +20,7 @@ public class ServerLocator : IServerLocator
         private readonly ILogger _logger;
 
         public ServerLocator()
-            : this(new NullLogger())
+            : this(NullLogger.Instance)
         {
         }
 
@@ -28,12 +29,12 @@ public ServerLocator(ILogger logger)
             _logger = logger;
         }
 
-        public Task<List<ServerDiscoveryInfo>> FindServers(int timeoutMs, CancellationToken cancellationToken = default(CancellationToken))
+        public Task<List<ServerDiscoveryInfo>> FindServers(int timeoutMs, CancellationToken cancellationToken = default)
         {
             var taskCompletionSource = new TaskCompletionSource<List<ServerDiscoveryInfo>>();
             var serversFound = new ConcurrentBag<ServerDiscoveryInfo>();
 
-            _logger.Debug("Searching for servers with timeout of {0} ms", timeoutMs);
+            _logger.LogDebug("Searching for servers with timeout of {0} ms", timeoutMs);
 
             var innerCancellationSource = new CancellationTokenSource();
             var linkedCancellationSource = CancellationTokenSource.CreateLinkedTokenSource(
@@ -95,7 +96,7 @@ private async void FindServers(Action<ServerDiscoveryInfo> serverFound, Action<E
                             // Convert bytes to text
                             var json = Encoding.UTF8.GetString(result.Buffer);
 
-                            _logger.Debug("Received response from endpoint: " + result.RemoteEndPoint + ". Response: " + json);
+                            _logger.LogDebug("Received response from endpoint: " + result.RemoteEndPoint + ". Response: " + json);
 
                             if (!string.IsNullOrEmpty(json))
                             {
@@ -112,7 +113,7 @@ private async void FindServers(Action<ServerDiscoveryInfo> serverFound, Action<E
                                 }
                                 catch (Exception ex)
                                 {
-                                    _logger.ErrorException("Error parsing server discovery info", ex);
+                                    _logger.LogError("Error parsing server discovery info", ex);
                                 }
                             }
                         }
diff --git a/Jellyfin.ApiClient/Net/SessionUpdatesEventArgs.cs b/Jellyfin.ApiClient/Net/SessionUpdatesEventArgs.cs
new file mode 100644
index 0000000..7d1d7c7
--- /dev/null
+++ b/Jellyfin.ApiClient/Net/SessionUpdatesEventArgs.cs
@@ -0,0 +1,12 @@
+using Jellyfin.ApiClient.Model;
+
+namespace Jellyfin.ApiClient.Net
+{
+    /// <summary>	
+    /// Class SessionUpdatesEventArgs	
+    /// </summary>	
+    public class SessionUpdatesEventArgs
+    {
+        public SessionInfoDto[] Sessions { get; set; }
+    }
+}
diff --git a/Emby.ApiClient/NewtonsoftJsonSerializer.cs b/Jellyfin.ApiClient/NewtonsoftJsonSerializer.cs
similarity index 84%
rename from Emby.ApiClient/NewtonsoftJsonSerializer.cs
rename to Jellyfin.ApiClient/NewtonsoftJsonSerializer.cs
index a044a8e..4b41240 100644
--- a/Emby.ApiClient/NewtonsoftJsonSerializer.cs
+++ b/Jellyfin.ApiClient/NewtonsoftJsonSerializer.cs
@@ -2,8 +2,9 @@
 using Newtonsoft.Json;
 using System;
 using System.IO;
+using System.Threading.Tasks;
 
-namespace Emby.ApiClient
+namespace Jellyfin.ApiClient
 {
     /// <summary>
     /// Class NewtonsoftJsonSerializer
@@ -26,6 +27,18 @@ public void SerializeToStream(object obj, Stream stream)
             }
         }
 
+        /// <summary>
+        /// Serializes to stream.
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="obj">The obj.</param>
+        /// <param name="stream">The stream.</param>
+        /// <exception cref="System.ArgumentNullException">obj</exception>
+        public void SerializeToStream<T>(T obj, Stream stream)
+        {
+            SerializeToStream((object)obj, stream);
+        }
+
         /// <summary>
         /// Deserializes from stream.
         /// </summary>
@@ -131,5 +144,15 @@ public T DeserializeFromFile<T>(string file) where T : class
         {
             throw new NotImplementedException();
         }
+
+        public Task<object> DeserializeFromStreamAsync(Stream stream, Type type)
+        {
+            return Task.FromResult(DeserializeFromStream(stream, type));
+        }
+
+        public Task<T> DeserializeFromStreamAsync<T>(Stream stream)
+        {
+            return Task.FromResult(DeserializeFromStream<T>(stream));
+        }
     }
 }
diff --git a/Emby.ApiClient/Playback/IPlaybackManager.cs b/Jellyfin.ApiClient/Playback/IPlaybackManager.cs
similarity index 96%
rename from Emby.ApiClient/Playback/IPlaybackManager.cs
rename to Jellyfin.ApiClient/Playback/IPlaybackManager.cs
index 3d9d527..96443bf 100644
--- a/Emby.ApiClient/Playback/IPlaybackManager.cs
+++ b/Jellyfin.ApiClient/Playback/IPlaybackManager.cs
@@ -1,12 +1,12 @@
-using MediaBrowser.Model.ApiClient;
+using Jellyfin.ApiClient.Model;
 using MediaBrowser.Model.Dlna;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.Session;
+using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using Emby.ApiClient.Model;
 
-namespace Emby.ApiClient.Playback
+namespace Jellyfin.ApiClient.Playback
 {
     public interface IPlaybackManager
     {
@@ -99,6 +99,6 @@ public interface IPlaybackManager
         /// <param name="isOffline">if set to <c>true</c> [is offline].</param>
         /// <param name="apiClient">The current apiClient. It can be null if offline</param>
         /// <returns>Task.</returns>
-        Task ReportPlaybackStopped(PlaybackStopInfo info, StreamInfo streamInfo, string serverId, string userId, bool isOffline, IApiClient apiClient);
+        Task ReportPlaybackStopped(PlaybackStopInfo info, StreamInfo streamInfo, string serverId, Guid userId, bool isOffline, IApiClient apiClient);
     }
 }
\ No newline at end of file
diff --git a/Jellyfin.ApiClient/Playback/PlaybackException.cs b/Jellyfin.ApiClient/Playback/PlaybackException.cs
new file mode 100644
index 0000000..9abedcd
--- /dev/null
+++ b/Jellyfin.ApiClient/Playback/PlaybackException.cs
@@ -0,0 +1,10 @@
+using MediaBrowser.Model.Dlna;
+using System;
+
+namespace Jellyfin.ApiClient.Playback
+{
+    public class PlaybackException : Exception
+    {
+        public PlaybackErrorCode ErrorCode { get; set; }
+    }
+}
diff --git a/Emby.ApiClient/Playback/PlaybackManager.cs b/Jellyfin.ApiClient/Playback/PlaybackManager.cs
similarity index 72%
rename from Emby.ApiClient/Playback/PlaybackManager.cs
rename to Jellyfin.ApiClient/Playback/PlaybackManager.cs
index 4b8f8b8..8ddb91c 100644
--- a/Emby.ApiClient/Playback/PlaybackManager.cs
+++ b/Jellyfin.ApiClient/Playback/PlaybackManager.cs
@@ -1,46 +1,34 @@
-using MediaBrowser.Model.ApiClient;
+using Jellyfin.ApiClient.Model;
 using MediaBrowser.Model.Dlna;
 using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Entities;
-using MediaBrowser.Model.Logging;
 using MediaBrowser.Model.MediaInfo;
 using MediaBrowser.Model.Session;
 using MediaBrowser.Model.Users;
+using Microsoft.Extensions.Logging;
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
-using Emby.ApiClient.Data;
-using Emby.ApiClient.Model;
-using Emby.ApiClient.Net;
 
-namespace Emby.ApiClient.Playback
+namespace Jellyfin.ApiClient.Playback
 {
     public class PlaybackManager : IPlaybackManager
     {
-        private readonly ILocalAssetManager _localAssetManager;
         private readonly ILogger _logger;
         private readonly IDevice _device;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="PlaybackManager" /> class.
         /// </summary>
-        /// <param name="localAssetManager">The local asset manager.</param>
         /// <param name="device">The device.</param>
         /// <param name="logger">The logger.</param>
-        public PlaybackManager(ILocalAssetManager localAssetManager, IDevice device, ILogger logger)
+        public PlaybackManager(IDevice device, ILogger logger)
         {
-            _localAssetManager = localAssetManager;
             _device = device;
             _logger = logger;
         }
 
-        public PlaybackManager(ILocalAssetManager localAssetManager, IDevice device, ILogger logger, INetworkConnection network)
-            : this(localAssetManager, device, logger)
-        {
-        }
-
         /// <summary>
         /// Gets the pre playback selectable audio streams.
         /// </summary>
@@ -49,7 +37,7 @@ public PlaybackManager(ILocalAssetManager localAssetManager, IDevice device, ILo
         /// <returns>Task&lt;IEnumerable&lt;MediaStream&gt;&gt;.</returns>
         public async Task<IEnumerable<MediaStream>> GetPrePlaybackSelectableAudioStreams(string serverId, VideoOptions options)
         {
-            var info = await GetVideoStreamInfoInternal(serverId, options).ConfigureAwait(false);
+            var info = await GetVideoStreamInfoInternal(options).ConfigureAwait(false);
 
             return info.GetSelectableAudioStreams();
         }
@@ -62,7 +50,7 @@ public async Task<IEnumerable<MediaStream>> GetPrePlaybackSelectableAudioStreams
         /// <returns>Task&lt;IEnumerable&lt;MediaStream&gt;&gt;.</returns>
         public async Task<IEnumerable<MediaStream>> GetPrePlaybackSelectableSubtitleStreams(string serverId, VideoOptions options)
         {
-            var info = await GetVideoStreamInfoInternal(serverId, options).ConfigureAwait(false);
+            var info = await GetVideoStreamInfoInternal(options).ConfigureAwait(false);
 
             return info.GetSelectableSubtitleStreams();
         }
@@ -108,36 +96,6 @@ public async Task<StreamInfo> GetAudioStreamInfo(string serverId, AudioOptions o
         {
             var streamBuilder = GetStreamBuilder();
 
-            var localItem = await _localAssetManager.GetLocalItem(serverId, options.ItemId);
-            if (localItem != null)
-            {
-                var localMediaSource = localItem.Item.MediaSources[0];
-
-                // Use the local media source, unless a specific server media source was requested
-                if (string.IsNullOrWhiteSpace(options.MediaSourceId) ||
-                    string.Equals(localMediaSource.Id, options.MediaSourceId,
-                    StringComparison.OrdinalIgnoreCase))
-                {
-                    // Finally, check to make sure the local file is actually available at this time
-                    var fileExists = await _localAssetManager.FileExists(localMediaSource.Path).ConfigureAwait(false);
-
-                    if (fileExists)
-                    {
-                        options.MediaSources = localItem.Item.MediaSources.ToArray();
-
-                        var result = streamBuilder.BuildAudioItem(options);
-                        if (result == null)
-                        {
-                            _logger.Warn("LocalItem returned no compatible streams. Will dummy up a StreamInfo to force it to direct play.");
-                            var mediaSource = localItem.Item.MediaSources.First();
-                            result = GetForcedDirectPlayStreamInfo(DlnaProfileType.Audio, options, mediaSource);
-                        }
-                        result.PlayMethod = PlayMethod.DirectPlay;
-                        return result;
-                    }
-                }
-            }
-
             PlaybackInfoResponse playbackInfo = null;
             string playSessionId = null;
             if (!isOffline)
@@ -177,7 +135,7 @@ public async Task<StreamInfo> GetAudioStreamInfo(string serverId, AudioOptions o
 
             if (playbackInfo != null)
             {
-                streamInfo.AllMediaSources = playbackInfo.MediaSources.ToList();
+                //streamInfo.AllMediaSources = playbackInfo.MediaSources.ToList();
                 streamInfo.PlaySessionId = playbackInfo.PlaySessionId;
             }
 
@@ -222,14 +180,14 @@ public async Task<StreamInfo> ChangeVideoStream(StreamInfo currentInfo, string s
         {
             await StopStranscoding(currentInfo, apiClient).ConfigureAwait(false);
 
-            if (currentInfo.AllMediaSources != null)
-            {
-                options.MediaSources = currentInfo.AllMediaSources.ToArray();
-            }
+            //if (currentInfo.AllMediaSources != null)
+            //{
+            //    options.MediaSources = currentInfo.AllMediaSources.ToArray();
+            //}
 
-            var streamInfo = await GetVideoStreamInfoInternal(serverId, options).ConfigureAwait(false);
+            var streamInfo = await GetVideoStreamInfoInternal(options).ConfigureAwait(false);
             streamInfo.PlaySessionId = currentInfo.PlaySessionId;
-            streamInfo.AllMediaSources = currentInfo.AllMediaSources;
+            //streamInfo.AllMediaSources = currentInfo.AllMediaSources;
             return streamInfo;
         }
 
@@ -268,7 +226,7 @@ public async Task<StreamInfo> GetVideoStreamInfo(string serverId, VideoOptions o
                 playSessionId = playbackInfo.PlaySessionId;
             }
 
-            var streamInfo = await GetVideoStreamInfoInternal(serverId, options).ConfigureAwait(false);
+            var streamInfo = await GetVideoStreamInfoInternal(options).ConfigureAwait(false);
 
             if (!isOffline)
             {
@@ -284,51 +242,20 @@ public async Task<StreamInfo> GetVideoStreamInfo(string serverId, VideoOptions o
 
             if (playbackInfo != null)
             {
-                streamInfo.AllMediaSources = playbackInfo.MediaSources.ToList();
+                //streamInfo.AllMediaSources = playbackInfo.MediaSources.ToList();
                 streamInfo.PlaySessionId = playbackInfo.PlaySessionId;
             }
 
             return streamInfo;
         }
 
-        private async Task<StreamInfo> GetVideoStreamInfoInternal(string serverId, VideoOptions options)
+        private Task<StreamInfo> GetVideoStreamInfoInternal(VideoOptions options)
         {
             var streamBuilder = GetStreamBuilder();
 
-            var localItem = await _localAssetManager.GetLocalItem(serverId, options.ItemId);
-
-            if (localItem != null)
-            {
-                var localMediaSource = localItem.Item.MediaSources[0];
-
-                // Use the local media source, unless a specific server media source was requested
-                if (string.IsNullOrWhiteSpace(options.MediaSourceId) ||
-                    string.Equals(localMediaSource.Id, options.MediaSourceId,
-                    StringComparison.OrdinalIgnoreCase))
-                {
-                    // Finally, check to make sure the local file is actually available at this time
-                    var fileExists = await _localAssetManager.FileExists(localMediaSource.Path).ConfigureAwait(false);
-
-                    if (fileExists)
-                    {
-                        options.MediaSources = localItem.Item.MediaSources.ToArray();
-
-                        var result = streamBuilder.BuildVideoItem(options);
-                        if (result == null)
-                        {
-                            _logger.Warn("LocalItem returned no compatible streams. Will dummy up a StreamInfo to force it to direct play.");
-                            var mediaSource = localItem.Item.MediaSources.First();
-                            result = GetForcedDirectPlayStreamInfo(DlnaProfileType.Video, options, mediaSource);
-                        }
-                        result.PlayMethod = PlayMethod.DirectPlay;
-                        return result;
-                    }
-                }
-            }
-
             var streamInfo = streamBuilder.BuildVideoItem(options);
             EnsureSuccess(streamInfo);
-            return streamInfo;
+            return Task.FromResult(streamInfo);
         }
 
         private StreamInfo GetForcedDirectPlayStreamInfo(DlnaProfileType mediaType, AudioOptions options, MediaSourceInfo mediaSource)
@@ -408,11 +335,11 @@ public async Task ReportPlaybackProgress(PlaybackProgressInfo info, StreamInfo s
         /// <param name="isOffline">if set to <c>true</c> [is offline].</param>
         /// <param name="apiClient">The current apiClient. It can be null if offline</param>
         /// <returns>Task.</returns>
-        public async Task ReportPlaybackStopped(PlaybackStopInfo info, StreamInfo streamInfo, string serverId, string userId, bool isOffline, IApiClient apiClient)
+        public async Task ReportPlaybackStopped(PlaybackStopInfo info, StreamInfo streamInfo, string serverId, Guid userId, bool isOffline, IApiClient apiClient)
         {
             if (isOffline)
             {
-                var action = new UserAction
+                var _ = new UserAction
                 {
                     Date = DateTime.UtcNow,
                     ItemId = info.ItemId,
@@ -422,7 +349,6 @@ public async Task ReportPlaybackStopped(PlaybackStopInfo info, StreamInfo stream
                     UserId = userId
                 };
 
-                await _localAssetManager.RecordUserAction(action).ConfigureAwait(false);
                 return;
             }
 
@@ -443,7 +369,7 @@ public async Task ReportPlaybackStopped(PlaybackStopInfo info, StreamInfo stream
             }
             catch (Exception ex)
             {
-                _logger.ErrorException("Error in ReportPlaybackStoppedAsync", ex);
+                _logger.LogError("Error in ReportPlaybackStoppedAsync", ex);
             }
         }
 
@@ -467,7 +393,7 @@ private async Task StopStranscoding(StreamInfo streamInfo, IApiClient apiClient)
             }
             catch (Exception ex)
             {
-                _logger.ErrorException("Error in StopStranscoding", ex);
+                _logger.LogError("Error in StopStranscoding", ex);
             }
         }
     }
diff --git a/Emby.ApiClient/PortableHttpWebRequestFactory.cs b/Jellyfin.ApiClient/PortableHttpWebRequestFactory.cs
similarity index 92%
rename from Emby.ApiClient/PortableHttpWebRequestFactory.cs
rename to Jellyfin.ApiClient/PortableHttpWebRequestFactory.cs
index ea513cd..e5a3754 100644
--- a/Emby.ApiClient/PortableHttpWebRequestFactory.cs
+++ b/Jellyfin.ApiClient/PortableHttpWebRequestFactory.cs
@@ -1,10 +1,11 @@
-using System;
+using Jellyfin.ApiClient.Net;
+using System;
+using System.Globalization;
 using System.IO;
 using System.Net;
 using System.Threading.Tasks;
-using Emby.ApiClient.Net;
 
-namespace Emby.ApiClient
+namespace Jellyfin.ApiClient
 {
     public class PortableHttpWebRequestFactory : IHttpWebRequestFactory
     {
@@ -19,7 +20,7 @@ public HttpWebRequest Create(HttpRequest options)
 
         public void SetContentLength(HttpWebRequest request, long length)
         {
-            //request.Headers["Content-Length"] = length.ToString(CultureInfo.InvariantCulture);
+            request.Headers["Content-Length"] = length.ToString(CultureInfo.InvariantCulture);
         }
 
         public Task<WebResponse> GetResponseAsync(HttpWebRequest request, int timeoutMs)
diff --git a/Emby.ApiClient/ServerLocator.cs b/Jellyfin.ApiClient/ServerLocator.cs
similarity index 90%
rename from Emby.ApiClient/ServerLocator.cs
rename to Jellyfin.ApiClient/ServerLocator.cs
index b025647..e52006d 100644
--- a/Emby.ApiClient/ServerLocator.cs
+++ b/Jellyfin.ApiClient/ServerLocator.cs
@@ -1,6 +1,7 @@
 using MediaBrowser.Model.ApiClient;
-using MediaBrowser.Model.Logging;
 using MediaBrowser.Model.Serialization;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging.Abstractions;
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
@@ -10,9 +11,8 @@
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
-using Emby.ApiClient.Net;
 
-namespace Emby.ApiClient
+namespace Jellyfin.ApiClient
 {
     public class ServerLocator : IServerLocator
     {
@@ -20,7 +20,7 @@ public class ServerLocator : IServerLocator
         private readonly ILogger _logger;
 
         public ServerLocator()
-            : this(new NullLogger())
+            : this(NullLogger.Instance)
         {
         }
 
@@ -29,12 +29,12 @@ public ServerLocator(ILogger logger)
             _logger = logger;
         }
 
-        public Task<List<ServerDiscoveryInfo>> FindServers(int timeoutMs, CancellationToken cancellationToken = default(CancellationToken))
+        public Task<List<ServerDiscoveryInfo>> FindServers(int timeoutMs, CancellationToken cancellationToken = default)
         {
             var taskCompletionSource = new TaskCompletionSource<List<ServerDiscoveryInfo>>();
             var serversFound = new ConcurrentBag<ServerDiscoveryInfo>();
 
-            _logger.Debug("Searching for servers with timeout of {0} ms", timeoutMs);
+            _logger.LogDebug("Searching for servers with timeout of {0} ms", timeoutMs);
 
             var innerCancellationSource = new CancellationTokenSource();
             var linkedCancellationSource = CancellationTokenSource.CreateLinkedTokenSource(
@@ -96,7 +96,7 @@ private async void FindServers(Action<ServerDiscoveryInfo> serverFound, Action<E
                             // Convert bytes to text
                             var json = Encoding.UTF8.GetString(result.Buffer);
 
-                            _logger.Debug("Received response from endpoint: " + result.RemoteEndPoint + ". Response: " + json);
+                            _logger.LogDebug("Received response from endpoint: " + result.RemoteEndPoint + ". Response: " + json);
 
                             if (!string.IsNullOrEmpty(json))
                             {
@@ -113,7 +113,7 @@ private async void FindServers(Action<ServerDiscoveryInfo> serverFound, Action<E
                                 }
                                 catch (Exception ex)
                                 {
-                                    _logger.ErrorException("Error parsing server discovery info", ex);
+                                    _logger.LogError("Error parsing server discovery info", ex);
                                 }
                             }
                         }
diff --git a/Emby.ApiClient/WebSocket/ClientWebSocketFactory.cs b/Jellyfin.ApiClient/WebSocket/ClientWebSocketFactory.cs
similarity index 83%
rename from Emby.ApiClient/WebSocket/ClientWebSocketFactory.cs
rename to Jellyfin.ApiClient/WebSocket/ClientWebSocketFactory.cs
index edc6159..de32ce0 100644
--- a/Emby.ApiClient/WebSocket/ClientWebSocketFactory.cs
+++ b/Jellyfin.ApiClient/WebSocket/ClientWebSocketFactory.cs
@@ -1,8 +1,9 @@
-using MediaBrowser.Model.Logging;
+using Jellyfin.ApiClient.Model;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging.Abstractions;
 using System;
-using Emby.ApiClient.Model;
 
-namespace Emby.ApiClient.WebSocket
+namespace Jellyfin.ApiClient.WebSocket
 {
     /// <summary>
     /// Class ClientWebSocketFactory
@@ -35,7 +36,7 @@ public static IClientWebSocket CreateWebSocket(ILogger logger)
         /// <returns>IClientWebSocket.</returns>
         public static IClientWebSocket CreateWebSocket()
         {
-            return CreateWebSocket(new NullLogger());
+            return CreateWebSocket(NullLogger.Instance);
         }
     }
 
@@ -43,7 +44,7 @@ public static class SocketExtensions
     {
         public static void OpenWebSocket(this ApiClient client)
         {
-            client.OpenWebSocket(() => ClientWebSocketFactory.CreateWebSocket(new NullLogger()));
+            client.OpenWebSocket(() => ClientWebSocketFactory.CreateWebSocket(NullLogger.Instance));
         }
     }
 }
diff --git a/Emby.ApiClient/WebSocket/NativeClientWebSocket.cs b/Jellyfin.ApiClient/WebSocket/NativeClientWebSocket.cs
similarity index 79%
rename from Emby.ApiClient/WebSocket/NativeClientWebSocket.cs
rename to Jellyfin.ApiClient/WebSocket/NativeClientWebSocket.cs
index a3eab2b..8af4d67 100644
--- a/Emby.ApiClient/WebSocket/NativeClientWebSocket.cs
+++ b/Jellyfin.ApiClient/WebSocket/NativeClientWebSocket.cs
@@ -1,12 +1,11 @@
-using MediaBrowser.Model.ApiClient;
-using MediaBrowser.Model.Logging;
+using Jellyfin.ApiClient.Model;
+using Microsoft.Extensions.Logging;
 using System;
 using System.Net.WebSockets;
 using System.Threading;
 using System.Threading.Tasks;
-using Emby.ApiClient.Model;
 
-namespace Emby.ApiClient.WebSocket
+namespace Jellyfin.ApiClient.WebSocket
 {
     /// <summary>
     /// Class NativeClientWebSocket
@@ -62,15 +61,15 @@ public NativeClientWebSocket(ILogger logger)
         /// <param name="url">The URL.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>Task.</returns>
-        public async Task ConnectAsync(string url, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task ConnectAsync(Uri url, CancellationToken cancellationToken = default)
         {
             try
             {
-                await _client.ConnectAsync(new Uri(url), cancellationToken).ConfigureAwait(false);
+                await _client.ConnectAsync(url, cancellationToken).ConfigureAwait(false);
             }
             catch (Exception ex)
             {
-                _logger.ErrorException("Error connecting to {0}", ex, url);
+                _logger.LogError("Error connecting to {0}", ex, url);
 
                 throw;
             }
@@ -98,7 +97,7 @@ private async void Receive()
                 }
                 catch (Exception ex)
                 {
-                    _logger.ErrorException("Error receiving web socket message", ex);
+                    _logger.LogError("Error receiving web socket message", ex);
 
                     break;
                 }
@@ -109,10 +108,7 @@ private async void Receive()
                     break;
                 }
 
-                if (OnReceiveBytes != null)
-                {
-                    OnReceiveBytes(bytes);
-                }
+                OnReceiveBytes?.Invoke(bytes);
             }
         }
 
@@ -146,17 +142,16 @@ private async Task<byte[]> ReceiveBytesAsync(CancellationToken cancellationToken
         /// <param name="endOfMessage">if set to <c>true</c> [end of message].</param>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>Task.</returns>
-        public async Task SendAsync(byte[] bytes, MediaBrowser.Model.Net.WebSocketMessageType type, bool endOfMessage, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task SendAsync(byte[] bytes, WebSocketMessageType type, bool endOfMessage, CancellationToken cancellationToken = default)
         {
             await _sendResource.WaitAsync(cancellationToken).ConfigureAwait(false);
 
             try
             {
-                WebSocketMessageType nativeType;
 
-                if (!Enum.TryParse(type.ToString(), true, out nativeType))
+                if (!Enum.TryParse(type.ToString(), true, out System.Net.WebSockets.WebSocketMessageType nativeType))
                 {
-                    _logger.Warn("Unrecognized WebSocketMessageType: {0}", type.ToString());
+                    _logger.LogWarning("Unrecognized WebSocketMessageType: {0}", type.ToString());
                 }
 
                 var linkedTokenSource = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken, _cancellationTokenSource.Token);
@@ -173,20 +168,19 @@ private async Task<byte[]> ReceiveBytesAsync(CancellationToken cancellationToken
         /// Gets or sets the state.
         /// </summary>
         /// <value>The state.</value>
-        public MediaBrowser.Model.Net.WebSocketState State
+        public WebSocketState State
         {
             get
             {
                 if (_client == null)
                 {
-                    return MediaBrowser.Model.Net.WebSocketState.None;
+                    return WebSocketState.None;
                 }
 
-                MediaBrowser.Model.Net.WebSocketState commonState;
 
-                if (!Enum.TryParse(_client.State.ToString(), true, out commonState))
+                if (!Enum.TryParse(_client.State.ToString(), true, out WebSocketState commonState))
                 {
-                    _logger.Warn("Unrecognized WebSocketState: {0}", _client.State.ToString());
+                    _logger.LogWarning("Unrecognized WebSocketState: {0}", _client.State.ToString());
                 }
 
                 return commonState;
@@ -198,10 +192,7 @@ public MediaBrowser.Model.Net.WebSocketState State
         /// </summary>
         void OnClosed()
         {
-            if (Closed != null)
-            {
-                Closed(this, EventArgs.Empty);
-            }
+            Closed?.Invoke(this, EventArgs.Empty);
         }
 
         /// <summary>
@@ -224,9 +215,9 @@ protected virtual void Dispose(bool dispose)
                 
                 if (_client != null)
                 {
-                    if (_client.State == WebSocketState.Open)
+                    if (_client.State == System.Net.WebSockets.WebSocketState.Open)
                     {
-                        _logger.Info("Sending web socket close message.");
+                        _logger.LogInformation("Sending web socket close message.");
 
                         // Can't wait on this. Try to close gracefully though.
                         _client.CloseAsync(WebSocketCloseStatus.NormalClosure, string.Empty, CancellationToken.None);
diff --git a/Emby.ApiClient/WebSocket/WebSocket4NetClientWebSocket.cs b/Jellyfin.ApiClient/WebSocket/WebSocket4NetClientWebSocket.cs
similarity index 65%
rename from Emby.ApiClient/WebSocket/WebSocket4NetClientWebSocket.cs
rename to Jellyfin.ApiClient/WebSocket/WebSocket4NetClientWebSocket.cs
index 36a72a5..ec3cca2 100644
--- a/Emby.ApiClient/WebSocket/WebSocket4NetClientWebSocket.cs
+++ b/Jellyfin.ApiClient/WebSocket/WebSocket4NetClientWebSocket.cs
@@ -1,12 +1,11 @@
-using MediaBrowser.Model.ApiClient;
-using MediaBrowser.Model.Logging;
+using Jellyfin.ApiClient.Model;
+using Microsoft.Extensions.Logging;
 using System;
 using System.Threading;
 using System.Threading.Tasks;
-using Emby.ApiClient.Model;
 using WebSocket4Net;
 
-namespace Emby.ApiClient.WebSocket
+namespace Jellyfin.ApiClient.WebSocket
 {
     /// <summary>
     /// Class WebSocket4NetClientWebSocket
@@ -29,25 +28,25 @@ public WebSocket4NetClientWebSocket(ILogger logger)
         /// Gets or sets the state.
         /// </summary>
         /// <value>The state.</value>
-        public MediaBrowser.Model.Net.WebSocketState State
+        public WebSocketState State
         {
             get
             {
 
                 switch (_socket.State)
                 {
-                    case WebSocketState.Closed:
-                        return MediaBrowser.Model.Net.WebSocketState.Closed;
-                    case WebSocketState.Closing:
-                        return MediaBrowser.Model.Net.WebSocketState.Closed;
-                    case WebSocketState.Connecting:
-                        return MediaBrowser.Model.Net.WebSocketState.Connecting;
-                    case WebSocketState.None:
-                        return MediaBrowser.Model.Net.WebSocketState.None;
-                    case WebSocketState.Open:
-                        return MediaBrowser.Model.Net.WebSocketState.Open;
+                    case WebSocket4Net.WebSocketState.Closed:
+                        return WebSocketState.Closed;
+                    case WebSocket4Net.WebSocketState.Closing:
+                        return WebSocketState.Closed;
+                    case WebSocket4Net.WebSocketState.Connecting:
+                        return WebSocketState.Connecting;
+                    case WebSocket4Net.WebSocketState.None:
+                        return WebSocketState.None;
+                    case WebSocket4Net.WebSocketState.Open:
+                        return WebSocketState.Open;
                     default:
-                        return MediaBrowser.Model.Net.WebSocketState.None;
+                        return WebSocketState.None;
                 }
             }
         }
@@ -58,20 +57,20 @@ public MediaBrowser.Model.Net.WebSocketState State
         /// <param name="url">The URL.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>Task.</returns>
-        public Task ConnectAsync(string url, CancellationToken cancellationToken = default(CancellationToken))
+        public Task ConnectAsync(Uri url, CancellationToken cancellationToken = default)
         {
             var taskCompletionSource = new TaskCompletionSource<bool>();
 
             try
             {
-                _socket = new WebSocket4Net.WebSocket(url);
+                _socket = new WebSocket4Net.WebSocket(url.ToString());
 
-                _socket.MessageReceived += websocket_MessageReceived;
+                _socket.MessageReceived += Websocket_MessageReceived;
 
                 _socket.Open();
 
                 _socket.Opened += (sender, args) => taskCompletionSource.TrySetResult(true);
-                _socket.Closed += _socket_Closed;
+                _socket.Closed += Socket_Closed;
             }
             catch (Exception ex)
             {
@@ -88,12 +87,9 @@ public MediaBrowser.Model.Net.WebSocketState State
         /// </summary>
         /// <param name="sender">The source of the event.</param>
         /// <param name="e">The <see cref="EventArgs"/> instance containing the event data.</param>
-        void _socket_Closed(object sender, EventArgs e)
+        void Socket_Closed(object sender, EventArgs e)
         {
-            if (Closed != null)
-            {
-                Closed(this, EventArgs.Empty);
-            }
+            Closed?.Invoke(this, EventArgs.Empty);
         }
 
         /// <summary>
@@ -101,12 +97,9 @@ void _socket_Closed(object sender, EventArgs e)
         /// </summary>
         /// <param name="sender">The source of the event.</param>
         /// <param name="e">The <see cref="MessageReceivedEventArgs" /> instance containing the event data.</param>
-        void websocket_MessageReceived(object sender, MessageReceivedEventArgs e)
+        void Websocket_MessageReceived(object sender, MessageReceivedEventArgs e)
         {
-            if (OnReceive != null)
-            {
-                OnReceive(e.Message);
-            }
+            OnReceive?.Invoke(e.Message);
         }
 
         /// <summary>
@@ -129,7 +122,7 @@ void websocket_MessageReceived(object sender, MessageReceivedEventArgs e)
         /// <param name="endOfMessage">if set to <c>true</c> [end of message].</param>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>Task.</returns>
-        public Task SendAsync(byte[] bytes, MediaBrowser.Model.Net.WebSocketMessageType type, bool endOfMessage, CancellationToken cancellationToken = default(CancellationToken))
+        public Task SendAsync(byte[] bytes, WebSocketMessageType type, bool endOfMessage, CancellationToken cancellationToken = default)
         {
             return Task.Run(() => _socket.Send(bytes, 0, bytes.Length), cancellationToken);
         }
@@ -143,9 +136,9 @@ public void Dispose()
             {
                 var state = State;
 
-                if (state == MediaBrowser.Model.Net.WebSocketState.Open || state == MediaBrowser.Model.Net.WebSocketState.Connecting)
+                if (state == WebSocketState.Open || state == WebSocketState.Connecting)
                 {
-                    _logger.Info("Sending web socket close message");
+                    _logger.LogInformation("Sending web socket close message");
 
                     _socket.Close();
                 }
diff --git a/Jellyfin.ApiClient/WebSocket/WebSocketMessageType.cs b/Jellyfin.ApiClient/WebSocket/WebSocketMessageType.cs
new file mode 100644
index 0000000..56765ac
--- /dev/null
+++ b/Jellyfin.ApiClient/WebSocket/WebSocketMessageType.cs
@@ -0,0 +1,9 @@
+namespace Jellyfin.ApiClient.WebSocket
+{
+    public enum WebSocketMessageType
+    {
+        Text,
+        Binary,
+        Close
+    }
+}
diff --git a/Jellyfin.ApiClient/WebSocket/WebSocketState.cs b/Jellyfin.ApiClient/WebSocket/WebSocketState.cs
new file mode 100644
index 0000000..4ff631f
--- /dev/null
+++ b/Jellyfin.ApiClient/WebSocket/WebSocketState.cs
@@ -0,0 +1,13 @@
+namespace Jellyfin.ApiClient.WebSocket
+{
+    public enum WebSocketState
+    {
+        None,
+        Connecting,
+        Open,
+        CloseSent,
+        CloseReceived,
+        Closed,
+        Aborted
+    }
+}
diff --git a/README.md b/README.md
index 2605832..3a9c827 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,7 @@
-Emby.ApiClient
+Jellyfin.ApiClient
 ======================
 
-This portable class library makes it very easy to harness the power of the Embyr API. This is available as a Nuget package:
-
-[Emby.ApiClient](https://www.nuget.org/packages/MediaBrowser.ApiClient/)
+This portable class library makes it very easy to harness the power of the Jellyfin API.
 
 # Single Server Example #