diff --git a/Synology.TestWebApplication/Controllers/HomeController.cs b/Synology.TestWebApplication/Controllers/HomeController.cs
index 3880c17..26100df 100644
--- a/Synology.TestWebApplication/Controllers/HomeController.cs
+++ b/Synology.TestWebApplication/Controllers/HomeController.cs
@@ -11,90 +11,93 @@
 using Synology.TestWebApplication.Models;
 
 namespace Synology.TestWebApplication.Controllers
-{
-	using IOFile = System.IO.File;
-
-	public class HomeController : Controller
-	{
-		private readonly IServiceProvider _serviceProvider;
-
-		public HomeController(IServiceProvider serviceProvider)
-		{
-			_serviceProvider = serviceProvider;
-		}
-
-		public IActionResult Index()
-		{
-			if (!IOFile.Exists("synosettings.json")) return RedirectToAction(nameof(Settings));
-
-			var settings = JsonConvert.DeserializeObject<SettingsViewModel>(IOFile.ReadAllText("synosettings.json"));
-
-			return View();
-		}
-
-		public IActionResult Settings()
-		{
-			SettingsViewModel model = null;
-
-			if (IOFile.Exists("synosettings.json"))
-				model = JsonConvert.DeserializeObject<SettingsViewModel>(IOFile.ReadAllText("synosettings.json"));
-
-			return View(model);
-		}
-
-		[HttpPost]
-		public async Task<IActionResult> Settings(SettingsViewModel model)
-		{
-			if (ModelState.IsValid)
-			{
-				var settings = _serviceProvider.GetService<ISynologyConnectionSettings>();
-
-				settings.BaseHost = model.SynologyHost;
-				settings.Password = model.SynologyPass;
-				settings.Port = model.SynologyPort;
-				settings.Ssl = model.UseSsl;
-				settings.SslPort = model.SynologyPort;
-				settings.Username = model.SynologyUser;
-
-				using (var syno = _serviceProvider.GetService<ISynologyConnection>())
-				{
-					var result = await syno.Api().Auth().LoginAsync();
-
-					if (!result.Success && result.Error.Code != 403)
-					{
-						ModelState.AddModelError("", "Invalid connection settings.");
-					}
-					else
-					{
-						var json = JsonConvert.SerializeObject(model, Formatting.Indented);
-
-						IOFile.WriteAllText("synosettings.json", json);
-
-						return RedirectToAction("Index");
-					}
-				}
-			}
-
-			return View(model);
-		}
-
-		public IActionResult About()
-		{
-			ViewData["Message"] = "Your application description page.";
-
-			return View();
-		}
-
-		public IActionResult Contact()
-		{
-			ViewData["Message"] = "Your contact page.";
-
-			return View();
-		}
-
-		public IActionResult Error()
-		{
-			return View(new ErrorViewModel { RequestId = Activity.Current?.Id ?? HttpContext.TraceIdentifier });
-		}
-	}
+{
+    using IOFile = System.IO.File;
+
+    public class HomeController : Controller
+    {
+        private readonly IServiceProvider _serviceProvider;
+
+        public HomeController(IServiceProvider serviceProvider)
+        {
+            _serviceProvider = serviceProvider;
+        }
+
+        public IActionResult Index()
+        {
+            if (!IOFile.Exists("synosettings.json")) return RedirectToAction(nameof(Settings));
+
+            var settings = JsonConvert.DeserializeObject<SettingsViewModel>(IOFile.ReadAllText("synosettings.json"));
+
+            return View();
+        }
+
+        public IActionResult Settings()
+        {
+            SettingsViewModel model = null;
+
+            if (IOFile.Exists("synosettings.json"))
+                model = JsonConvert.DeserializeObject<SettingsViewModel>(IOFile.ReadAllText("synosettings.json"));
+
+            return View(model);
+        }
+
+        [HttpPost]
+        public async Task<IActionResult> Settings(SettingsViewModel model)
+        {
+            if (ModelState.IsValid)
+            {
+                var settings = _serviceProvider.GetService<ISynologyConnectionSettings>();
+
+                settings.BaseHost = model.SynologyHost;
+                settings.Password = model.SynologyPass;
+                settings.Port = model.SynologyPort;
+                settings.Ssl = model.UseSsl;
+                settings.SslPort = model.SynologyPort;
+                settings.Username = model.SynologyUser;
+
+                using (var syno = _serviceProvider.GetService<ISynologyConnection>())
+                {
+                    var result = await syno.Api().Auth().LoginAsync();
+
+                    if (!result.Success && result.Error.Code != 403)
+                    {
+                        ModelState.AddModelError("", "Invalid connection settings.");
+                    }
+                    else
+                    {
+                        var json = JsonConvert.SerializeObject(model, Formatting.Indented);
+
+                        IOFile.WriteAllText("synosettings.json", json);
+
+                        return RedirectToAction("Index");
+                    }
+                }
+            }
+
+            return View(model);
+        }
+
+        public IActionResult About()
+        {
+            ViewData["Message"] = "Your application description page.";
+
+            return View();
+        }
+
+        public IActionResult Contact()
+        {
+            ViewData["Message"] = "Your contact page.";
+
+            return View();
+        }
+
+        public IActionResult Error()
+        {
+            return View(new ErrorViewModel
+            {
+                RequestId = Activity.Current?.Id ?? HttpContext.TraceIdentifier
+            });
+        }
+    }
 }
diff --git a/Synology.TestWebApplication/Views/Home/Settings.cshtml b/Synology.TestWebApplication/Views/Home/Settings.cshtml
index 2369bde..e50d167 100644
--- a/Synology.TestWebApplication/Views/Home/Settings.cshtml
+++ b/Synology.TestWebApplication/Views/Home/Settings.cshtml
@@ -2,6 +2,8 @@
 @{
     ViewData["Title"] = "Settings";
 }
+<div asp-validation-summary="All" class="text-danger">
+</div>
 <form asp-controller="Home" asp-action="Settings" method="post">
   <div class="form-group">
     <label asp-for="SynologyHost">Hostname</label>
diff --git a/Synology/Classes/SynologyBuilder.cs b/Synology/Classes/SynologyBuilder.cs
index e901410..f1fb87c 100644
--- a/Synology/Classes/SynologyBuilder.cs
+++ b/Synology/Classes/SynologyBuilder.cs
@@ -31,73 +31,78 @@ public SynologyBuilder(IServiceCollection services)
             Services = services;
         }
 
-        public IServiceCollection Services { get; }
+        private IServiceCollection Services { get; }
         
         public ISynologyBuilder AddApi()
         {
-            Services.AddTransient<IApi, Api.Api>();
-            Services.AddTransient<Api.Info.IInfoRequest, Api.Info.InfoRequest>();
-            Services.AddTransient<IAuthRequest, AuthRequest>();
+            Services.AddApi<IApi, Api.Api>();
+
+            Services.AddRequest<Api.Info.IInfoRequest, Api.Info.InfoRequest>();
+            Services.AddRequest<IAuthRequest, AuthRequest>();
 
             return this;
         }
 
         public ISynologyBuilder AddAudioStation()
         {
-            Services.AddTransient<IAudioStationApi, AudioStationApi>();
+            Services.AddApi<IAudioStationApi, AudioStationApi>();
 
             return this;
         }
 
         public ISynologyBuilder AddDownloadStation()
         {
-            Services.AddTransient<IDownloadStationApi, DownloadStationApi>();
-            Services.AddTransient<DownloadStation.Info.IInfoRequest, DownloadStation.Info.InfoRequest>();
-            Services.AddTransient<IScheduleRequest, ScheduleRequest>();
-            Services.AddTransient<DownloadStation.Task.ITaskRequest, DownloadStation.Task.TaskRequest>();
+            Services.AddApi<IDownloadStationApi, DownloadStationApi>();
+
+            Services.AddRequest<DownloadStation.Info.IInfoRequest, DownloadStation.Info.InfoRequest>();
+            Services.AddRequest<IScheduleRequest, ScheduleRequest>();
+            Services.AddRequest<DownloadStation.Task.ITaskRequest, DownloadStation.Task.TaskRequest>();
 
             return this;
         }
 
         public ISynologyBuilder AddDownloadStation2()
         {
-            Services.AddTransient<IDownloadStation2Api, DownloadStation2Api>();
-            Services.AddTransient<DownloadStation2.Task.ITaskRequest, DownloadStation2.Task.TaskRequest>();
+            Services.AddApi<IDownloadStation2Api, DownloadStation2Api>();
+
+            Services.AddRequest<DownloadStation2.Task.ITaskRequest, DownloadStation2.Task.TaskRequest>();
 
             return this;
         }
 
         public ISynologyBuilder AddFileStation()
         {
-            Services.AddTransient<IFileStationApi, FileStationApi>();
-            Services.AddTransient<FileStation.Info.IInfoRequest, FileStation.Info.InfoRequest>();
-            Services.AddTransient<ICheckPermissionRequest, CheckPermissionRequest>();
-            Services.AddTransient<ICopyMoveRequest, CopyMoveRequest>();
-            Services.AddTransient<IDirSizeRequest, DirSizeRequest>();
-            Services.AddTransient<IFavoriteRequest, FavoriteRequest>();
-            Services.AddTransient<IFileShareRequest, FileShareRequest>();
-            Services.AddTransient<IListRequest, ListRequest>();
-            Services.AddTransient<IMD5Request, MD5Request>();
-            Services.AddTransient<IRenameRequest, RenameRequest>();
-            Services.AddTransient<ISearchRequest, SearchRequest>();
-            Services.AddTransient<IThumbRequest, ThumbRequest>();
-            Services.AddTransient<IUploadRequest, UploadRequest>();
-            Services.AddTransient<IVirtualFolderRequest, VirtualFolderRequest>();
+            Services.AddApi<IFileStationApi, FileStationApi>();
+
+            Services.AddRequest<FileStation.Info.IInfoRequest, FileStation.Info.InfoRequest>();
+            Services.AddRequest<ICheckPermissionRequest, CheckPermissionRequest>();
+            Services.AddRequest<ICopyMoveRequest, CopyMoveRequest>();
+            Services.AddRequest<IDirSizeRequest, DirSizeRequest>();
+            Services.AddRequest<IFavoriteRequest, FavoriteRequest>();
+            Services.AddRequest<IFileShareRequest, FileShareRequest>();
+            Services.AddRequest<IListRequest, ListRequest>();
+            Services.AddRequest<IMD5Request, MD5Request>();
+            Services.AddRequest<IRenameRequest, RenameRequest>();
+            Services.AddRequest<ISearchRequest, SearchRequest>();
+            Services.AddRequest<IThumbRequest, ThumbRequest>();
+            Services.AddRequest<IUploadRequest, UploadRequest>();
+            Services.AddRequest<IVirtualFolderRequest, VirtualFolderRequest>();
 
             return this;
         }
 
         public ISynologyBuilder AddSurveillanceStation()
         {
-            Services.AddTransient<ISurveillanceStationApi, SurveillanceStationApi>();
-            Services.AddTransient<SurveillanceStation.Info.IInfoRequest, SurveillanceStation.Info.InfoRequest>();
+            Services.AddApi<ISurveillanceStationApi, SurveillanceStationApi>();
+
+            Services.AddRequest<SurveillanceStation.Info.IInfoRequest, SurveillanceStation.Info.InfoRequest>();
 
             return this;
         }
 
         public ISynologyBuilder AddVideoStation()
         {
-            Services.AddTransient<IVideoStationApi, VideoStationApi>();
+            Services.AddApi<IVideoStationApi, VideoStationApi>();
 
             return this;
         }
diff --git a/Synology/Extensions/ServiceCollectionExtension.cs b/Synology/Extensions/ServiceCollectionExtension.cs
index ad82813..11e6b2c 100644
--- a/Synology/Extensions/ServiceCollectionExtension.cs
+++ b/Synology/Extensions/ServiceCollectionExtension.cs
@@ -1,5 +1,7 @@
 using System;
+using System.Net.Http;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
 using Synology.Classes;
 using Synology.Interfaces;
 using Synology.Settings;
@@ -36,13 +38,28 @@ public static IServiceCollection AddSynology(this IServiceCollection services, A
             if (configure == null) throw new ArgumentNullException(nameof(configure));
 
             services.AddOptions();
-            services.AddSingleton<ISynologyConnectionSettings, SynologyConnectionSettings>();
-            services.AddSingleton<SidContainer, SidContainer>();
-            services.AddTransient<ISynologyConnection, SynologyConnection>();
+            services.AddScoped<ISynologyConnectionSettings, SynologyConnectionSettings>();
+            services.AddScoped<SidContainer>();
+            services.AddScoped<HttpClient>();
+            services.AddScoped<ISynologyConnection, SynologyConnection>(t => new SynologyConnection(t.GetService<ISynologyConnectionSettings>(), t.GetService<SidContainer>(), t.GetService<ILoggerFactory>(), t, t.GetService<HttpClient>()));
 
             configure(new SynologyBuilder(services));
 
             return services;
         }
+
+        internal static IServiceCollection AddRequest<TRequestInterface, TRequest>(this IServiceCollection services)
+            where TRequestInterface : class, ISynologyRequest
+            where TRequest : SynologyRequest, TRequestInterface
+        {
+            return services.AddTransient<TRequestInterface, TRequest>();
+        }
+
+        internal static IServiceCollection AddApi<TApiInterface, TApi>(this IServiceCollection services)
+            where TApiInterface : class, ISynologyApi
+            where TApi : SynologyApi, TApiInterface
+        {
+            return services.AddTransient<TApiInterface, TApi>();
+        }
     }
 }
diff --git a/Synology/Extensions/SynologyConnectionExtension.cs b/Synology/Extensions/SynologyConnectionExtension.cs
index 7ef862e..89da606 100644
--- a/Synology/Extensions/SynologyConnectionExtension.cs
+++ b/Synology/Extensions/SynologyConnectionExtension.cs
@@ -6,6 +6,7 @@
 using System.Text;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.DependencyInjection;
 using Newtonsoft.Json;
 using Synology.Classes;
 using Synology.Interfaces;
@@ -183,14 +184,14 @@ private static async Task<T> GenericPostDataFromApiAsync<T>(this ISynologyConnec
 
         internal static string GetSid(this ISynologyConnection connection)
         {
-            var sidContainer = connection.ServiceProvider.GetService(typeof(SidContainer)) as SidContainer;
+            var sidContainer = connection.ServiceProvider.GetService<SidContainer>() as SidContainer;
 
             return sidContainer?.Sid;
         }
 
         internal static void SetSid(this ISynologyConnection connection, string value)
         {
-            if (connection.ServiceProvider.GetService(typeof(SidContainer)) is SidContainer sidContainer)
+            if (connection.ServiceProvider.GetService<SidContainer>() is SidContainer sidContainer)
                 sidContainer.Sid = value;
         }
     }
diff --git a/Synology/SynologyConnection.cs b/Synology/SynologyConnection.cs
index c830295..e1e635d 100644
--- a/Synology/SynologyConnection.cs
+++ b/Synology/SynologyConnection.cs
@@ -2,6 +2,7 @@
 using System.Net.Http;
 using Microsoft.Extensions.Logging;
 using Synology.Interfaces;
+using Synology.Utilities;
 
 namespace Synology
 {
@@ -31,28 +32,29 @@ internal sealed class SynologyConnection : ISynologyConnection
         /// </summary>
         public IServiceProvider ServiceProvider { get; }
 
+        public SidContainer SidContainer { get; }
+
         /// <summary>
-        /// 
+        /// Initializes a new instance of the <see cref="T:Synology.SynologyConnection"/> class.
         /// </summary>
-        /// <param name="settings"></param>
-        /// <param name="loggerFactory"></param>
-        /// <param name="serviceProvider"></param>
-        public SynologyConnection(ISynologyConnectionSettings settings, ILoggerFactory loggerFactory, IServiceProvider serviceProvider)
+        /// <param name="settings">Settings.</param>
+        /// <param name="sidContainer">Sid container.</param>
+        /// <param name="loggerFactory">Logger factory.</param>
+        /// <param name="serviceProvider">Service provider.</param>
+        /// <param name="client">Client.</param>
+        public SynologyConnection(ISynologyConnectionSettings settings, SidContainer sidContainer, ILoggerFactory loggerFactory, IServiceProvider serviceProvider, HttpClient client)
         {
             Settings = settings;
+            SidContainer = sidContainer;
             ServiceProvider = serviceProvider;
             Logger = loggerFactory.CreateLogger<SynologyConnection>();
 
             Logger.LogDebug($"Creating new connection to {Settings.BaseHost} with{(Settings.Ssl ? "" : "out")} SSL to port {Settings.Port}");
 
-            Client = new HttpClient
-            {
-                BaseAddress = new Uri(Settings.WebApiUrl),
-                DefaultRequestHeaders =
-                {
-                    ExpectContinue = false
-                }
-            };
+            Client = client;
+
+            Client.BaseAddress = new Uri(Settings.WebApiUrl);
+            Client.DefaultRequestHeaders.ExpectContinue = false;
         }
 
         /// <inheritdoc />
@@ -61,6 +63,7 @@ public SynologyConnection(ISynologyConnectionSettings settings, ILoggerFactory l
         public void Dispose()
         {
             Logger.LogDebug("Closing connection");
+
             Client?.Dispose();
         }
     }