diff --git a/Pilz.Networking.CloudProviders.Nextcloud/Client/Apps/FilesRetentionClient.cs b/Pilz.Networking.CloudProviders.Nextcloud/Client/Apps/FilesRetentionClient.cs
index e258a45..ff9eb8c 100644
--- a/Pilz.Networking.CloudProviders.Nextcloud/Client/Apps/FilesRetentionClient.cs
+++ b/Pilz.Networking.CloudProviders.Nextcloud/Client/Apps/FilesRetentionClient.cs
@@ -14,21 +14,21 @@ namespace Pilz.Networking.CloudProviders.Nextcloud.Client.Apps
         {
         }
 
-        public Task<bool> CreateRetentionRule(RetentionRule rule)
+        public bool CreateRetentionRule(RetentionRuleInfo rule)
         {
             var entry = rule.ToOcsData();
             return Client.Ocs.GetApi<OcsApiFilesRetention>().CreateRetentionRule(entry);
         }
 
-        public Task<bool> DeleteRetentionRule(int ruleID)
+        public bool DeleteRetentionRule(int ruleID)
         {
             return Client.Ocs.GetApi<OcsApiFilesRetention>().DeleteRetentionRule(ruleID);
         }
 
-        public async Task<RetentionRule[]?> GetRetentionRules()
+        public RetentionRule[]? GetRetentionRules()
         {
             var api = Client.Ocs.GetApi<OcsApiFilesRetention>();
-            var response = await api.GetRetentionRules();
+            var response = api.GetRetentionRules();
 
             if (response?.Data is not null)
             {
diff --git a/Pilz.Networking.CloudProviders.Nextcloud/Client/ClientBase.cs b/Pilz.Networking.CloudProviders.Nextcloud/Client/ClientBase.cs
index 94eb24d..33cd7e0 100644
--- a/Pilz.Networking.CloudProviders.Nextcloud/Client/ClientBase.cs
+++ b/Pilz.Networking.CloudProviders.Nextcloud/Client/ClientBase.cs
@@ -8,7 +8,7 @@ namespace Pilz.Networking.CloudProviders.Nextcloud.Client
 {
     public abstract class ClientBase
     {
-        public NextcloudClient Client { get; init; }
+        protected NextcloudClient Client { get; init; }
 
         public ClientBase(NextcloudClient client)
         {
diff --git a/Pilz.Networking.CloudProviders.Nextcloud/Client/CloudClient.cs b/Pilz.Networking.CloudProviders.Nextcloud/Client/CloudClient.cs
index 361e8c7..cc35a5b 100644
--- a/Pilz.Networking.CloudProviders.Nextcloud/Client/CloudClient.cs
+++ b/Pilz.Networking.CloudProviders.Nextcloud/Client/CloudClient.cs
@@ -13,17 +13,17 @@ namespace Pilz.Networking.CloudProviders.Nextcloud.Client
         {
         }
 
-        public Task<UserInfo?> GetUserInfo()
+        public UserInfo? GetUserInfo()
         {
             if (!string.IsNullOrEmpty(Client.CurrentLogin?.LoginName))
                 return GetUserInfo(Client.CurrentLogin.LoginName);
             else
-                return Task.FromResult<UserInfo?>(null);
+                return null;
         }
 
-        public async Task<UserInfo?> GetUserInfo(string username)
+        public UserInfo? GetUserInfo(string username)
         {
-            var result = await Client.Ocs.Cloud.GetUserMeta(username);
+            var result = Client.Ocs.Cloud.GetUserMeta(username);
 
             if (result?.Data != null)
                 return new UserInfo(result.Data);
diff --git a/Pilz.Networking.CloudProviders.Nextcloud/Model/Apps/FilesRetention/RetentionRule.cs b/Pilz.Networking.CloudProviders.Nextcloud/Model/Apps/FilesRetention/RetentionRule.cs
index 088b760..73c81a5 100644
--- a/Pilz.Networking.CloudProviders.Nextcloud/Model/Apps/FilesRetention/RetentionRule.cs
+++ b/Pilz.Networking.CloudProviders.Nextcloud/Model/Apps/FilesRetention/RetentionRule.cs
@@ -8,46 +8,20 @@ using System.Threading.Tasks;
 
 namespace Pilz.Networking.CloudProviders.Nextcloud.Model.Apps.FilesRetention
 {
-    public class RetentionRule
+    public class RetentionRule : RetentionRuleInfo
     {
         /// <summary>
         /// The ID for the retention rule.
         /// </summary>
         public int ID { get; init; }
 
-        /// <summary>
-        /// The ID for the tag that is used for this rule.
-        /// </summary>
-        public int TagID { get; init; }
-
-        /// <summary>
-        /// The unit used for the time.
-        /// </summary>
-        public RetentionTimeUnit TimeUnit { get; init; }
-
-        /// <summary>
-        /// Represents numer of days/weeks/months/years.
-        /// </summary>
-        public int TimeAmount { get; init; }
-
-        /// <summary>
-        /// The time used for the rule.
-        /// </summary>
-        public RetentionTimeAfter TimeAfter { get; init; }
-
         /// <summary>
         /// Defines if a background job has been generated
         /// </summary>
         public bool HasJob { get; init; }
 
-        public RetentionRule(int iD, int tagID, RetentionTimeUnit timeUnit, int timeAmount, RetentionTimeAfter timeAfter, bool hasJob)
+        public RetentionRule()
         {
-            ID = iD;
-            TagID = tagID;
-            TimeUnit = timeUnit;
-            TimeAmount = timeAmount;
-            TimeAfter = timeAfter;
-            HasJob = hasJob;
         }
 
         public RetentionRule(OcsResponseDataEntryRetention data)
@@ -58,16 +32,5 @@ namespace Pilz.Networking.CloudProviders.Nextcloud.Model.Apps.FilesRetention
             TimeAmount = data.TimeAmount ?? -1;
             TimeAfter = (RetentionTimeAfter)(data.TimeAfter ?? 0);
         }
-
-        public OcsDataRetentionRule ToOcsData()
-        {
-            return new OcsDataRetentionRule
-            {
-                TagID = TagID,
-                TimeUnit = (int)TimeUnit,
-                TimeAmount = TimeAmount,
-                TimeAfter = (int)TimeAfter
-            };
-        }
     }
 }
diff --git a/Pilz.Networking.CloudProviders.Nextcloud/Model/Apps/FilesRetention/RetentionRuleInfo.cs b/Pilz.Networking.CloudProviders.Nextcloud/Model/Apps/FilesRetention/RetentionRuleInfo.cs
new file mode 100644
index 0000000..d77aa59
--- /dev/null
+++ b/Pilz.Networking.CloudProviders.Nextcloud/Model/Apps/FilesRetention/RetentionRuleInfo.cs
@@ -0,0 +1,43 @@
+using Pilz.Networking.CloudProviders.Nextcloud.OCS.Data.Apps.FileRetention;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Pilz.Networking.CloudProviders.Nextcloud.Model.Apps.FilesRetention
+{
+    public class RetentionRuleInfo
+    {
+        /// <summary>
+        /// The ID for the tag that is used for this rule.
+        /// </summary>
+        public int TagID { get; init; }
+
+        /// <summary>
+        /// The unit used for the time.
+        /// </summary>
+        public RetentionTimeUnit TimeUnit { get; init; }
+
+        /// <summary>
+        /// Represents numer of days/weeks/months/years.
+        /// </summary>
+        public int TimeAmount { get; init; }
+
+        /// <summary>
+        /// The time used for the rule.
+        /// </summary>
+        public RetentionTimeAfter TimeAfter { get; init; }
+
+        public OcsDataRetentionRule ToOcsData()
+        {
+            return new OcsDataRetentionRule
+            {
+                TagID = TagID,
+                TimeUnit = (int)TimeUnit,
+                TimeAmount = TimeAmount,
+                TimeAfter = (int)TimeAfter
+            };
+        }
+    }
+}
diff --git a/Pilz.Networking.CloudProviders.Nextcloud/Model/Cloud/UserInfo.cs b/Pilz.Networking.CloudProviders.Nextcloud/Model/Cloud/UserInfo.cs
index 30d2e3d..d003a5c 100644
--- a/Pilz.Networking.CloudProviders.Nextcloud/Model/Cloud/UserInfo.cs
+++ b/Pilz.Networking.CloudProviders.Nextcloud/Model/Cloud/UserInfo.cs
@@ -99,7 +99,7 @@ namespace Pilz.Networking.CloudProviders.Nextcloud.Model.Cloud
             Enabled = Convert.ToBoolean(responseData.Enabled);
             StorageLocation = responseData.StorageLocation;
             ID = responseData.ID;
-            LastLogin = Convert.ToDateTime(responseData.LastLogin);
+            LastLogin = DateTimeOffset.FromUnixTimeMilliseconds(responseData.LastLogin ?? 0).LocalDateTime;
             Backend = responseData.Backend;
             Email = responseData.Email;
             Displayname = responseData.Displayname;
diff --git a/Pilz.Networking.CloudProviders.Nextcloud/Model/Cloud/UserQuota.cs b/Pilz.Networking.CloudProviders.Nextcloud/Model/Cloud/UserQuota.cs
index 921092a..fb711ea 100644
--- a/Pilz.Networking.CloudProviders.Nextcloud/Model/Cloud/UserQuota.cs
+++ b/Pilz.Networking.CloudProviders.Nextcloud/Model/Cloud/UserQuota.cs
@@ -12,17 +12,17 @@ namespace Pilz.Networking.CloudProviders.Nextcloud.Model.Cloud
         /// <summary>
         /// Amount of free bytes left.
         /// </summary>
-        public ulong Free { get; set; }
+        public long Free { get; set; }
 
         /// <summary>
         /// Amount of already used bytes.
         /// </summary>
-        public ulong Used { get; set; }
+        public long Used { get; set; }
 
         /// <summary>
         /// Total amount of all bytes (free + used).
         /// </summary>
-        public ulong Total { get; set; }
+        public long Total { get; set; }
 
         /// <summary>
         /// Relative amount of used quota in percent.
@@ -32,6 +32,6 @@ namespace Pilz.Networking.CloudProviders.Nextcloud.Model.Cloud
         /// <summary>
         /// Total amount of bytes available.
         /// </summary>
-        public ulong Quota { get; set; }
+        public long Quota { get; set; }
     }
 }
diff --git a/Pilz.Networking.CloudProviders.Nextcloud/NextcloudClient.cs b/Pilz.Networking.CloudProviders.Nextcloud/NextcloudClient.cs
index dae0f21..a0be030 100644
--- a/Pilz.Networking.CloudProviders.Nextcloud/NextcloudClient.cs
+++ b/Pilz.Networking.CloudProviders.Nextcloud/NextcloudClient.cs
@@ -17,9 +17,19 @@ namespace Pilz.Networking.CloudProviders.Nextcloud
     public class NextcloudClient : IDisposable
     {
         private readonly List<ClientBase> clients = new();
+        private NextcloudLogin? currentLogin;
 
         public OcsApi Ocs { get; init; } = new();
-        public NextcloudLogin? CurrentLogin { get; private set; }
+
+        public NextcloudLogin? CurrentLogin
+        {
+            get => currentLogin;
+            private set
+            {
+                currentLogin = value;
+                Ocs.BaseUrl = value?.Server ?? string.Empty;
+            }
+        }
 
         public CloudClient Cloud => GetClient<CloudClient>();
 
@@ -52,16 +62,16 @@ namespace Pilz.Networking.CloudProviders.Nextcloud
             return instance;
         }
 
-        public async Task<UserInfo?> Login(NextcloudLogin login)
+        public UserInfo? Login(NextcloudLogin login)
         {
             // Ensure we are logged out 
-            await Logout();
+            Logout(false);
 
             // Temporary set user login
             CurrentLogin = login;
 
             // Try get user info & check if user is enabled
-            var userInfo = await Cloud.GetUserInfo();
+            var userInfo = Cloud.GetUserInfo();
             var isValid = userInfo != null && userInfo.Enabled;
 
             // If invalid, reset login credentials
@@ -71,13 +81,13 @@ namespace Pilz.Networking.CloudProviders.Nextcloud
             return userInfo;
         }
 
-        public async Task<NextcloudLogin?> Login(string baseUrl, CancellationToken cancellationToken)
+        public NextcloudLogin? Login(string baseUrl, CancellationToken cancellationToken)
         {
             // Ensure we are logged out
-            await Logout();
+            Logout(false);
 
             // Init the login process
-            var initResponse = await Ocs.LoginFlowV2.Init(baseUrl);
+            var initResponse = Ocs.LoginFlowV2.Init(baseUrl);
 
             if (!string.IsNullOrEmpty(initResponse?.LoginUrl) && initResponse.Poll != null)
             {
@@ -97,7 +107,7 @@ namespace Pilz.Networking.CloudProviders.Nextcloud
 
                     // Poll the credentials
                     if (!cancellationToken.IsCancellationRequested)
-                        pollResponse = await Ocs.LoginFlowV2.Poll(initResponse.Poll);
+                        pollResponse = Ocs.LoginFlowV2.Poll(initResponse.Poll);
                 }
 
                 // Check login credentials
@@ -108,18 +118,18 @@ namespace Pilz.Networking.CloudProviders.Nextcloud
             return CurrentLogin;
         }
 
-        public Task Logout()
+        public void Logout()
         {
-            return Logout(true);
+            Logout(true);
         }
 
-        public async Task Logout(bool logoutOnServer)
+        public void Logout(bool logoutOnServer)
         {
             if (CurrentLogin != null)
             {
                 // Delete currently used app password
                 if (logoutOnServer)
-                    await Ocs.Core.DeleteAppPassword();
+                    Ocs.Core.DeleteAppPassword();
 
                 // Reset current login infos
                 CurrentLogin = null;
diff --git a/Pilz.Networking.CloudProviders.Nextcloud/OCS/APIs/Apps/OcsApiFilesRetention.cs b/Pilz.Networking.CloudProviders.Nextcloud/OCS/APIs/Apps/OcsApiFilesRetention.cs
index 7897bf2..4a50eb3 100644
--- a/Pilz.Networking.CloudProviders.Nextcloud/OCS/APIs/Apps/OcsApiFilesRetention.cs
+++ b/Pilz.Networking.CloudProviders.Nextcloud/OCS/APIs/Apps/OcsApiFilesRetention.cs
@@ -19,21 +19,21 @@ namespace Pilz.Networking.CloudProviders.Nextcloud.OCS.APIs.Apps
         {
         }
 
-        public async Task<bool> CreateRetentionRule(OcsDataRetentionRule rule)
+        public bool CreateRetentionRule(OcsDataRetentionRule rule)
         {
-            var response = await Manager.MakeRequest(HttpMethod.Post, OCS_FILE_RETENTION_RULES, content: rule);
+            var response = Manager.MakeRequest(HttpMethod.Post, OCS_FILE_RETENTION_RULES, content: rule);
             return response.IsSuccessStatusCode;
         }
 
-        public async Task<bool> DeleteRetentionRule(int ruleID)
+        public bool DeleteRetentionRule(int ruleID)
         {
-            var response = await Manager.MakeRequest(HttpMethod.Delete, OCS_FILE_RETENTION_RULE.FillParameters(ruleID));
+            var response = Manager.MakeRequest(HttpMethod.Delete, OCS_FILE_RETENTION_RULE.FillParameters(ruleID));
             return response.IsSuccessStatusCode;
         }
 
-        public Task<OcsResponseRetention?> GetRetentionRules()
+        public OcsResponseRetention? GetRetentionRules()
         {
-            return Manager.MakeRequest<OcsResponseRetention>(HttpMethod.Get, OCS_FILE_RETENTION_RULES);
+            return Manager.MakeRequestOcs<OcsResponseRetention>(HttpMethod.Get, OCS_FILE_RETENTION_RULES);
         }
     }
 }
diff --git a/Pilz.Networking.CloudProviders.Nextcloud/OCS/APIs/OcsApiBase.cs b/Pilz.Networking.CloudProviders.Nextcloud/OCS/APIs/OcsApiBase.cs
index a0ec4ed..d1d9952 100644
--- a/Pilz.Networking.CloudProviders.Nextcloud/OCS/APIs/OcsApiBase.cs
+++ b/Pilz.Networking.CloudProviders.Nextcloud/OCS/APIs/OcsApiBase.cs
@@ -8,7 +8,7 @@ namespace Pilz.Networking.CloudProviders.Nextcloud.OCS.APIs
 {
     public abstract class OcsApiBase
     {
-        public OcsApi Manager { get; init; }
+        protected OcsApi Manager { get; init; }
 
         protected OcsApiBase(OcsApi manager)
         {
diff --git a/Pilz.Networking.CloudProviders.Nextcloud/OCS/APIs/OcsApiCloud.cs b/Pilz.Networking.CloudProviders.Nextcloud/OCS/APIs/OcsApiCloud.cs
index 1f32186..d74fcd8 100644
--- a/Pilz.Networking.CloudProviders.Nextcloud/OCS/APIs/OcsApiCloud.cs
+++ b/Pilz.Networking.CloudProviders.Nextcloud/OCS/APIs/OcsApiCloud.cs
@@ -15,9 +15,9 @@ namespace Pilz.Networking.CloudProviders.Nextcloud.OCS.APIs
         {
         }
 
-        public Task<OcsResponseUser?> GetUserMeta(string username)
+        public OcsResponseUser? GetUserMeta(string username)
         {
-            return Manager.MakeRequest<OcsResponseUser>(HttpMethod.Get, OCS_CLOUD_USER_METADATA.FillParameters(username));
+            return Manager.MakeRequestOcs<OcsResponseUser>(HttpMethod.Get, OCS_CLOUD_USER_METADATA.FillParameters(username));
         }
     }
 }
diff --git a/Pilz.Networking.CloudProviders.Nextcloud/OCS/APIs/OcsApiCore.cs b/Pilz.Networking.CloudProviders.Nextcloud/OCS/APIs/OcsApiCore.cs
index 2c53cbe..2ed8e33 100644
--- a/Pilz.Networking.CloudProviders.Nextcloud/OCS/APIs/OcsApiCore.cs
+++ b/Pilz.Networking.CloudProviders.Nextcloud/OCS/APIs/OcsApiCore.cs
@@ -14,9 +14,9 @@ namespace Pilz.Networking.CloudProviders.Nextcloud.OCS.APIs
         {
         }
 
-        public async Task<bool> DeleteAppPassword()
+        public bool DeleteAppPassword()
         {
-            using var msg = await Manager.MakeRequest(HttpMethod.Delete, OCS_CORE_APPPASSWORD);
+            using var msg = Manager.MakeRequest(HttpMethod.Delete, OCS_CORE_APPPASSWORD);
             return msg != null && msg.IsSuccessStatusCode;
         }
     }
diff --git a/Pilz.Networking.CloudProviders.Nextcloud/OCS/APIs/OcsApiLoginFlowV2.cs b/Pilz.Networking.CloudProviders.Nextcloud/OCS/APIs/OcsApiLoginFlowV2.cs
index 824dc4b..62d27ee 100644
--- a/Pilz.Networking.CloudProviders.Nextcloud/OCS/APIs/OcsApiLoginFlowV2.cs
+++ b/Pilz.Networking.CloudProviders.Nextcloud/OCS/APIs/OcsApiLoginFlowV2.cs
@@ -15,12 +15,12 @@ namespace Pilz.Networking.CloudProviders.Nextcloud.OCS.APIs
         {
         }
 
-        public Task<OcsResponseLoginFlowV2?> Init(string url)
+        public OcsResponseLoginFlowV2? Init(string url)
         {
             return Manager.MakeRequest<OcsResponseLoginFlowV2>(HttpMethod.Get, url + OCS_LOGIN_INIT);
         }
 
-        public Task<OcsResponseLoginFlowV2Credentials?> Poll(OcsResponseLoginFlowV2.PollData poll)
+        public OcsResponseLoginFlowV2Credentials? Poll(OcsResponseLoginFlowV2.PollData poll)
         {
             ArgumentNullException.ThrowIfNull(poll?.Endpoint);
             ArgumentNullException.ThrowIfNull(poll?.Token);
diff --git a/Pilz.Networking.CloudProviders.Nextcloud/OCS/OcsApi.cs b/Pilz.Networking.CloudProviders.Nextcloud/OCS/OcsApi.cs
index 43091a0..9007d46 100644
--- a/Pilz.Networking.CloudProviders.Nextcloud/OCS/OcsApi.cs
+++ b/Pilz.Networking.CloudProviders.Nextcloud/OCS/OcsApi.cs
@@ -10,6 +10,8 @@ using System.Net;
 using Pilz.Networking.CloudProviders.Nextcloud.OCS.APIs;
 using System.Net.Sockets;
 using Pilz.Networking.CloudProviders.Nextcloud.OCS.Data;
+using Pilz.Networking.CloudProviders.Nextcloud.OCS.Responses;
+using System.Xml.Linq;
 
 namespace Pilz.Networking.CloudProviders.Nextcloud.OCS
 {
@@ -51,30 +53,103 @@ namespace Pilz.Networking.CloudProviders.Nextcloud.OCS
             return BaseUrl + path;
         }
 
-        public Task<TResponse?> MakeRequest<TResponse>(HttpMethod httpMethod, OcsApiUrlPath url, bool useAuthentication = true, Dictionary<string, string>? parameters = null, object? content = null)
+        /// <summary>
+        /// Makes an request with the given arguments and deserialize it to the given type.
+        /// </summary>
+        /// <typeparam name="TResponse"></typeparam>
+        /// <param name="httpMethod"></param>
+        /// <param name="url"></param>
+        /// <param name="useAuthentication"></param>
+        /// <param name="parameters"></param>
+        /// <param name="content"></param>
+        /// <returns>Returns the given OcsResponse type from the deserialized OcsApiResponse content.</returns>
+        public TResponse? MakeRequestOcs<TResponse>(HttpMethod httpMethod, OcsApiUrlPath url, bool useAuthentication = true, Dictionary<string, string>? parameters = null, object? content = null) where TResponse : IOcsResponse
+        {
+            return MakeRequestOcs<TResponse>(httpMethod, BuildFullUrl(url), useAuthentication: useAuthentication, parameters: parameters, content: content);
+        }
+
+        /// <summary>
+        /// Makes an request with the given arguments and deserialize it to the given type.
+        /// </summary>
+        /// <typeparam name="TResponse"></typeparam>
+        /// <param name="httpMethod"></param>
+        /// <param name="url"></param>
+        /// <param name="useAuthentication"></param>
+        /// <param name="parameters"></param>
+        /// <param name="content"></param>
+        /// <returns>Returns the given OcsResponse type from the deserialized OcsApiResponse content.</returns>
+        public TResponse? MakeRequestOcs<TResponse>(HttpMethod httpMethod, string url, bool useAuthentication = true, Dictionary<string, string>? parameters = null, object? content = null) where TResponse : IOcsResponse
+        {
+            var response = MakeRequest<OcsApiResponse<TResponse>?>(httpMethod, url, useAuthentication: useAuthentication, parameters: parameters, content: content);
+
+            if (response != null)
+                return response.Ocs;
+
+            return default;
+        }
+
+        /// <summary>
+        /// Makes an request with the given arguments and deserialize it to the given type.
+        /// </summary>
+        /// <typeparam name="TResponse"></typeparam>
+        /// <param name="httpMethod"></param>
+        /// <param name="url"></param>
+        /// <param name="useAuthentication"></param>
+        /// <param name="parameters"></param>
+        /// <param name="content"></param>
+        /// <returns>Returns the deserialized content of type given type.</returns>
+        public TResponse? MakeRequest<TResponse>(HttpMethod httpMethod, OcsApiUrlPath url, bool useAuthentication = true, Dictionary<string, string>? parameters = null, object? content = null)
         {
             return MakeRequest<TResponse>(httpMethod, BuildFullUrl(url), useAuthentication: useAuthentication, parameters: parameters, content: content);
         }
 
-        public Task<HttpResponseMessage> MakeRequest(HttpMethod httpMethod, OcsApiUrlPath url, bool useAuthentication = true, Dictionary<string, string>? parameters = null, object? content = null)
+        /// <summary>
+        /// Makes an request with the given arguments and deserialize it to the given type.
+        /// </summary>
+        /// <typeparam name="TResponse"></typeparam>
+        /// <param name="httpMethod"></param>
+        /// <param name="url"></param>
+        /// <param name="useAuthentication"></param>
+        /// <param name="parameters"></param>
+        /// <param name="content"></param>
+        /// <returns>Returns the deserialized content of type given type.</returns>
+        public TResponse? MakeRequest<TResponse>(HttpMethod httpMethod, string url, bool useAuthentication = true, Dictionary<string, string>? parameters = null, object? content = null)
         {
-            return MakeRequest(httpMethod, BuildFullUrl(url), useAuthentication: useAuthentication, parameters: parameters, content: content);
-        }
-
-        public async Task<TResponse?> MakeRequest<TResponse>(HttpMethod httpMethod, string url, bool useAuthentication = true, Dictionary<string, string>? parameters = null, object? content = null)
-        {
-            using var responseInit = await MakeRequest(httpMethod, url, useAuthentication: useAuthentication, parameters: parameters, content: content);
+            using var responseInit = MakeRequest(httpMethod, url, useAuthentication: useAuthentication, parameters: parameters, content: content);
 
             if (responseInit != null)
             {
-                var bodyInit = await responseInit.Content.ReadAsStringAsync();
+                var bodyInit = responseInit.Content.ReadAsStringAsync().Result;
                 return JsonConvert.DeserializeObject<TResponse>(bodyInit);
             }
 
             return default;
         }
 
-        public async Task<HttpResponseMessage> MakeRequest(HttpMethod httpMethod, string url, bool useAuthentication = true, Dictionary<string, string>? parameters = null, object? content = null)
+        /// <summary>
+        /// Makes an request with the given arguments.
+        /// </summary>
+        /// <param name="httpMethod"></param>
+        /// <param name="url"></param>
+        /// <param name="useAuthentication"></param>
+        /// <param name="parameters"></param>
+        /// <param name="content"></param>
+        /// <returns>Returns a HttpResponseMessage as result.</returns>
+        public HttpResponseMessage MakeRequest(HttpMethod httpMethod, OcsApiUrlPath url, bool useAuthentication = true, Dictionary<string, string>? parameters = null, object? content = null)
+        {
+            return MakeRequest(httpMethod, BuildFullUrl(url), useAuthentication: useAuthentication, parameters: parameters, content: content);
+        }
+
+        /// <summary>
+        /// Makes an request with the given arguments.
+        /// </summary>
+        /// <param name="httpMethod"></param>
+        /// <param name="url"></param>
+        /// <param name="useAuthentication"></param>
+        /// <param name="parameters"></param>
+        /// <param name="content"></param>
+        /// <returns>Returns a HttpResponseMessage as result.</returns>
+        public HttpResponseMessage MakeRequest(HttpMethod httpMethod, string url, bool useAuthentication = true, Dictionary<string, string>? parameters = null, object? content = null)
         {
             OcsApiAuthCredentials? authentication;
             string @params;
@@ -118,7 +193,7 @@ namespace Pilz.Networking.CloudProviders.Nextcloud.OCS
                 Content = httpContent
             };
 
-            return await client.SendAsync(request);
+            return client.Send(request);
         }
 
         public void Dispose()
diff --git a/Pilz.Networking.CloudProviders.Nextcloud/OCS/OcsApiResponse.cs b/Pilz.Networking.CloudProviders.Nextcloud/OCS/OcsApiResponse.cs
new file mode 100644
index 0000000..4189d18
--- /dev/null
+++ b/Pilz.Networking.CloudProviders.Nextcloud/OCS/OcsApiResponse.cs
@@ -0,0 +1,17 @@
+using Newtonsoft.Json;
+using Pilz.Networking.CloudProviders.Nextcloud.OCS.Responses;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Xml.Linq;
+
+namespace Pilz.Networking.CloudProviders.Nextcloud.OCS
+{
+    public class OcsApiResponse<TOcsResponse> where TOcsResponse : IOcsResponse
+    {
+        [JsonProperty("ocs")]
+        public TOcsResponse? Ocs { get; set; }
+    }
+}
diff --git a/Pilz.Networking.CloudProviders.Nextcloud/OCS/Responses/Cloud/OcsResponseDataUser.cs b/Pilz.Networking.CloudProviders.Nextcloud/OCS/Responses/Cloud/OcsResponseDataUser.cs
index 0000713..331be95 100644
--- a/Pilz.Networking.CloudProviders.Nextcloud/OCS/Responses/Cloud/OcsResponseDataUser.cs
+++ b/Pilz.Networking.CloudProviders.Nextcloud/OCS/Responses/Cloud/OcsResponseDataUser.cs
@@ -12,32 +12,32 @@ namespace Pilz.Networking.CloudProviders.Nextcloud.OCS.Responses.Cloud
         public class ResponseQuota
         {
             [JsonProperty("free")]
-            public ulong? Free { get; set; }
+            public long? Free { get; set; }
 
             [JsonProperty("used")]
-            public ulong? Used { get; set; }
+            public long? Used { get; set; }
 
             [JsonProperty("total")]
-            public ulong? Total { get; set; }
+            public long? Total { get; set; }
 
             [JsonProperty("relative")]
             public float? Relative { get; set; }
 
             [JsonProperty("quota")]
-            public ulong? Quota { get; set; }
+            public long? Quota { get; set; }
         }
 
         public class ResponseBackendCapabilities
         {
             [JsonProperty("setDisplayName")]
-            public int? SetDisplayName { get; set; }
+            public bool? SetDisplayName { get; set; }
 
             [JsonProperty("setPassword")]
-            public int? SetPassword { get; set; }
+            public bool? SetPassword { get; set; }
         }
 
         [JsonProperty("enabled")]
-        public int? Enabled { get; set; }
+        public bool? Enabled { get; set; }
 
         [JsonProperty("storageLocation")]
         public string? StorageLocation { get; set; }
@@ -46,7 +46,7 @@ namespace Pilz.Networking.CloudProviders.Nextcloud.OCS.Responses.Cloud
         public string? ID { get; set; }
 
         [JsonProperty("lastLogin")]
-        public ulong? LastLogin { get; set; }
+        public long? LastLogin { get; set; }
 
         [JsonProperty("backend")]
         public string? Backend { get; set; }
diff --git a/Pilz.Networking.CloudProviders.Nextcloud/OCS/Responses/IOcsResponse.cs b/Pilz.Networking.CloudProviders.Nextcloud/OCS/Responses/IOcsResponse.cs
new file mode 100644
index 0000000..fda24f6
--- /dev/null
+++ b/Pilz.Networking.CloudProviders.Nextcloud/OCS/Responses/IOcsResponse.cs
@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Pilz.Networking.CloudProviders.Nextcloud.OCS.Responses
+{
+    public interface IOcsResponse
+    {
+    }
+}
diff --git a/Pilz.Networking.CloudProviders.Nextcloud/OCS/Responses/IOcsResponseMeta.cs b/Pilz.Networking.CloudProviders.Nextcloud/OCS/Responses/IOcsResponseMeta.cs
new file mode 100644
index 0000000..54d08e1
--- /dev/null
+++ b/Pilz.Networking.CloudProviders.Nextcloud/OCS/Responses/IOcsResponseMeta.cs
@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Pilz.Networking.CloudProviders.Nextcloud.OCS.Responses
+{
+    public interface IOcsResponseMeta
+    {
+    }
+}
diff --git a/Pilz.Networking.CloudProviders.Nextcloud/OCS/Responses/OcsResponse.cs b/Pilz.Networking.CloudProviders.Nextcloud/OCS/Responses/OcsResponse.cs
index 2003436..4d8154e 100644
--- a/Pilz.Networking.CloudProviders.Nextcloud/OCS/Responses/OcsResponse.cs
+++ b/Pilz.Networking.CloudProviders.Nextcloud/OCS/Responses/OcsResponse.cs
@@ -7,7 +7,7 @@ using System.Threading.Tasks;
 
 namespace Pilz.Networking.CloudProviders.Nextcloud.OCS.Responses
 {
-    public class OcsResponse<TMeta, TData> where TMeta : OcsResponseMeta where TData : IOcsResponseData
+    public class OcsResponse<TMeta, TData> : IOcsResponse where TMeta : IOcsResponseMeta where TData : IOcsResponseData
     {
         [JsonProperty("meta")]
         public TMeta? Meta { get; set; }
@@ -20,7 +20,7 @@ namespace Pilz.Networking.CloudProviders.Nextcloud.OCS.Responses
     {
     }
 
-    public class OcsResponse : OcsResponse<OcsResponseMeta, IOcsResponseData>
+    public class OcsResponse : OcsResponse<OcsResponseMeta, OcsResponseData>
     {
     }
 }
diff --git a/Pilz.Networking.CloudProviders.Nextcloud/OCS/Responses/OcsResponseMeta.cs b/Pilz.Networking.CloudProviders.Nextcloud/OCS/Responses/OcsResponseMeta.cs
index 049eeb7..b3d9c5a 100644
--- a/Pilz.Networking.CloudProviders.Nextcloud/OCS/Responses/OcsResponseMeta.cs
+++ b/Pilz.Networking.CloudProviders.Nextcloud/OCS/Responses/OcsResponseMeta.cs
@@ -7,7 +7,7 @@ using System.Threading.Tasks;
 
 namespace Pilz.Networking.CloudProviders.Nextcloud.OCS.Responses
 {
-    public class OcsResponseMeta
+    public class OcsResponseMeta : IOcsResponseMeta
     {
         [JsonProperty("status")]
         public string? Status { get; set; }
diff --git a/Pilz.Networking.CloudProviders.Nextcloud/Pilz.Networking.CloudProviders.Nextcloud.csproj b/Pilz.Networking.CloudProviders.Nextcloud/Pilz.Networking.CloudProviders.Nextcloud.csproj
index b280cb9..a0a8ce4 100644
--- a/Pilz.Networking.CloudProviders.Nextcloud/Pilz.Networking.CloudProviders.Nextcloud.csproj
+++ b/Pilz.Networking.CloudProviders.Nextcloud/Pilz.Networking.CloudProviders.Nextcloud.csproj
@@ -9,7 +9,7 @@
   <PropertyGroup>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
     <IncrementVersionOnBuild>1.yyyy.Mdd.Hmm</IncrementVersionOnBuild>
-    <Version>1.2023.1001.1650</Version>
+    <Version>1.2023.1002.1520</Version>
   </PropertyGroup>
 
   <ItemGroup>