diff --git a/Marechai.App/Services/Client/ApiClient.cs b/Marechai.App/Services/Client/ApiClient.cs
index d19bf5e7..c03efe3c 100644
--- a/Marechai.App/Services/Client/ApiClient.cs
+++ b/Marechai.App/Services/Client/ApiClient.cs
@@ -279,7 +279,7 @@ namespace Marechai.App
             ApiClientBuilder.RegisterDefaultDeserializer<FormParseNodeFactory>();
             if (string.IsNullOrEmpty(RequestAdapter.BaseUrl))
             {
-                RequestAdapter.BaseUrl = "https://localhost:7163";
+                RequestAdapter.BaseUrl = "http://localhost:5023";
             }
             PathParameters.TryAdd("baseurl", RequestAdapter.BaseUrl);
         }
diff --git a/Marechai.App/Services/Client/Books/BooksRequestBuilder.cs b/Marechai.App/Services/Client/Books/BooksRequestBuilder.cs
index 52484a9f..bbb41c8a 100644
--- a/Marechai.App/Services/Client/Books/BooksRequestBuilder.cs
+++ b/Marechai.App/Services/Client/Books/BooksRequestBuilder.cs
@@ -92,7 +92,7 @@ namespace Marechai.App.Books
             var collectionResult = await RequestAdapter.SendCollectionAsync<global::Marechai.App.Models.BookDto>(requestInfo, global::Marechai.App.Models.BookDto.CreateFromDiscriminatorValue, errorMapping, cancellationToken).ConfigureAwait(false);
             return collectionResult?.AsList();
         }
-        /// <returns>A <see cref="UntypedNode"/></returns>
+        /// <returns>A <see cref="long"/></returns>
         /// <param name="body">The request body</param>
         /// <param name="cancellationToken">Cancellation token to use when cancelling requests</param>
         /// <param name="requestConfiguration">Configuration for the request such as headers, query parameters, and middleware options.</param>
@@ -100,11 +100,11 @@ namespace Marechai.App.Books
         /// <exception cref="global::Marechai.App.Models.ProblemDetails">When receiving a 401 status code</exception>
 #if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
 #nullable enable
-        public async Task<UntypedNode?> PostAsync(global::Marechai.App.Models.BookDto body, Action<RequestConfiguration<DefaultQueryParameters>>? requestConfiguration = default, CancellationToken cancellationToken = default)
+        public async Task<long?> PostAsync(global::Marechai.App.Models.BookDto body, Action<RequestConfiguration<DefaultQueryParameters>>? requestConfiguration = default, CancellationToken cancellationToken = default)
         {
 #nullable restore
 #else
-        public async Task<UntypedNode> PostAsync(global::Marechai.App.Models.BookDto body, Action<RequestConfiguration<DefaultQueryParameters>> requestConfiguration = default, CancellationToken cancellationToken = default)
+        public async Task<long?> PostAsync(global::Marechai.App.Models.BookDto body, Action<RequestConfiguration<DefaultQueryParameters>> requestConfiguration = default, CancellationToken cancellationToken = default)
         {
 #endif
             if(ReferenceEquals(body, null)) throw new ArgumentNullException(nameof(body));
@@ -114,7 +114,7 @@ namespace Marechai.App.Books
                 { "400", global::Marechai.App.Models.ProblemDetails.CreateFromDiscriminatorValue },
                 { "401", global::Marechai.App.Models.ProblemDetails.CreateFromDiscriminatorValue },
             };
-            return await RequestAdapter.SendAsync<UntypedNode>(requestInfo, UntypedNode.CreateFromDiscriminatorValue, errorMapping, cancellationToken).ConfigureAwait(false);
+            return await RequestAdapter.SendPrimitiveAsync<long?>(requestInfo, errorMapping, cancellationToken).ConfigureAwait(false);
         }
         /// <returns>A <see cref="RequestInformation"/></returns>
         /// <param name="requestConfiguration">Configuration for the request such as headers, query parameters, and middleware options.</param>
diff --git a/Marechai.App/Services/Client/Books/Companies/CompaniesRequestBuilder.cs b/Marechai.App/Services/Client/Books/Companies/CompaniesRequestBuilder.cs
index 9dd5cec7..08f9fe40 100644
--- a/Marechai.App/Services/Client/Books/Companies/CompaniesRequestBuilder.cs
+++ b/Marechai.App/Services/Client/Books/Companies/CompaniesRequestBuilder.cs
@@ -59,7 +59,7 @@ namespace Marechai.App.Books.Companies
         public CompaniesRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) : base(requestAdapter, "{+baseurl}/books/companies", rawUrl)
         {
         }
-        /// <returns>A <see cref="UntypedNode"/></returns>
+        /// <returns>A <see cref="long"/></returns>
         /// <param name="body">The request body</param>
         /// <param name="cancellationToken">Cancellation token to use when cancelling requests</param>
         /// <param name="requestConfiguration">Configuration for the request such as headers, query parameters, and middleware options.</param>
@@ -67,11 +67,11 @@ namespace Marechai.App.Books.Companies
         /// <exception cref="global::Marechai.App.Models.ProblemDetails">When receiving a 401 status code</exception>
 #if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
 #nullable enable
-        public async Task<UntypedNode?> PostAsync(global::Marechai.App.Models.CompanyByBookDto body, Action<RequestConfiguration<DefaultQueryParameters>>? requestConfiguration = default, CancellationToken cancellationToken = default)
+        public async Task<long?> PostAsync(global::Marechai.App.Models.CompanyByBookDto body, Action<RequestConfiguration<DefaultQueryParameters>>? requestConfiguration = default, CancellationToken cancellationToken = default)
         {
 #nullable restore
 #else
-        public async Task<UntypedNode> PostAsync(global::Marechai.App.Models.CompanyByBookDto body, Action<RequestConfiguration<DefaultQueryParameters>> requestConfiguration = default, CancellationToken cancellationToken = default)
+        public async Task<long?> PostAsync(global::Marechai.App.Models.CompanyByBookDto body, Action<RequestConfiguration<DefaultQueryParameters>> requestConfiguration = default, CancellationToken cancellationToken = default)
         {
 #endif
             if(ReferenceEquals(body, null)) throw new ArgumentNullException(nameof(body));
@@ -81,7 +81,7 @@ namespace Marechai.App.Books.Companies
                 { "400", global::Marechai.App.Models.ProblemDetails.CreateFromDiscriminatorValue },
                 { "401", global::Marechai.App.Models.ProblemDetails.CreateFromDiscriminatorValue },
             };
-            return await RequestAdapter.SendAsync<UntypedNode>(requestInfo, UntypedNode.CreateFromDiscriminatorValue, errorMapping, cancellationToken).ConfigureAwait(false);
+            return await RequestAdapter.SendPrimitiveAsync<long?>(requestInfo, errorMapping, cancellationToken).ConfigureAwait(false);
         }
         /// <returns>A <see cref="RequestInformation"/></returns>
         /// <param name="body">The request body</param>
diff --git a/Marechai.App/Services/Client/Companies/CompaniesRequestBuilder.cs b/Marechai.App/Services/Client/Companies/CompaniesRequestBuilder.cs
index 071f2bca..2e84991a 100644
--- a/Marechai.App/Services/Client/Companies/CompaniesRequestBuilder.cs
+++ b/Marechai.App/Services/Client/Companies/CompaniesRequestBuilder.cs
@@ -92,7 +92,7 @@ namespace Marechai.App.Companies
             var collectionResult = await RequestAdapter.SendCollectionAsync<global::Marechai.App.Models.CompanyDto>(requestInfo, global::Marechai.App.Models.CompanyDto.CreateFromDiscriminatorValue, errorMapping, cancellationToken).ConfigureAwait(false);
             return collectionResult?.AsList();
         }
-        /// <returns>A <see cref="UntypedNode"/></returns>
+        /// <returns>A <see cref="int"/></returns>
         /// <param name="body">The request body</param>
         /// <param name="cancellationToken">Cancellation token to use when cancelling requests</param>
         /// <param name="requestConfiguration">Configuration for the request such as headers, query parameters, and middleware options.</param>
@@ -100,11 +100,11 @@ namespace Marechai.App.Companies
         /// <exception cref="global::Marechai.App.Models.ProblemDetails">When receiving a 401 status code</exception>
 #if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
 #nullable enable
-        public async Task<UntypedNode?> PostAsync(global::Marechai.App.Models.CompanyDto body, Action<RequestConfiguration<DefaultQueryParameters>>? requestConfiguration = default, CancellationToken cancellationToken = default)
+        public async Task<int?> PostAsync(global::Marechai.App.Models.CompanyDto body, Action<RequestConfiguration<DefaultQueryParameters>>? requestConfiguration = default, CancellationToken cancellationToken = default)
         {
 #nullable restore
 #else
-        public async Task<UntypedNode> PostAsync(global::Marechai.App.Models.CompanyDto body, Action<RequestConfiguration<DefaultQueryParameters>> requestConfiguration = default, CancellationToken cancellationToken = default)
+        public async Task<int?> PostAsync(global::Marechai.App.Models.CompanyDto body, Action<RequestConfiguration<DefaultQueryParameters>> requestConfiguration = default, CancellationToken cancellationToken = default)
         {
 #endif
             if(ReferenceEquals(body, null)) throw new ArgumentNullException(nameof(body));
@@ -114,7 +114,7 @@ namespace Marechai.App.Companies
                 { "400", global::Marechai.App.Models.ProblemDetails.CreateFromDiscriminatorValue },
                 { "401", global::Marechai.App.Models.ProblemDetails.CreateFromDiscriminatorValue },
             };
-            return await RequestAdapter.SendAsync<UntypedNode>(requestInfo, UntypedNode.CreateFromDiscriminatorValue, errorMapping, cancellationToken).ConfigureAwait(false);
+            return await RequestAdapter.SendPrimitiveAsync<int?>(requestInfo, errorMapping, cancellationToken).ConfigureAwait(false);
         }
         /// <returns>A <see cref="RequestInformation"/></returns>
         /// <param name="requestConfiguration">Configuration for the request such as headers, query parameters, and middleware options.</param>
diff --git a/Marechai.App/Services/Client/Companies/Item/Description/DescriptionRequestBuilder.cs b/Marechai.App/Services/Client/Companies/Item/Description/DescriptionRequestBuilder.cs
index 1380d63a..52836946 100644
--- a/Marechai.App/Services/Client/Companies/Item/Description/DescriptionRequestBuilder.cs
+++ b/Marechai.App/Services/Client/Companies/Item/Description/DescriptionRequestBuilder.cs
@@ -59,7 +59,7 @@ namespace Marechai.App.Companies.Item.Description
             };
             return await RequestAdapter.SendAsync<global::Marechai.App.Models.CompanyDescriptionDto>(requestInfo, global::Marechai.App.Models.CompanyDescriptionDto.CreateFromDiscriminatorValue, errorMapping, cancellationToken).ConfigureAwait(false);
         }
-        /// <returns>A <see cref="UntypedNode"/></returns>
+        /// <returns>A <see cref="int"/></returns>
         /// <param name="body">The request body</param>
         /// <param name="cancellationToken">Cancellation token to use when cancelling requests</param>
         /// <param name="requestConfiguration">Configuration for the request such as headers, query parameters, and middleware options.</param>
@@ -67,11 +67,11 @@ namespace Marechai.App.Companies.Item.Description
         /// <exception cref="global::Marechai.App.Models.ProblemDetails">When receiving a 401 status code</exception>
 #if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
 #nullable enable
-        public async Task<UntypedNode?> PostAsync(global::Marechai.App.Models.CompanyDescriptionDto body, Action<RequestConfiguration<DefaultQueryParameters>>? requestConfiguration = default, CancellationToken cancellationToken = default)
+        public async Task<int?> PostAsync(global::Marechai.App.Models.CompanyDescriptionDto body, Action<RequestConfiguration<DefaultQueryParameters>>? requestConfiguration = default, CancellationToken cancellationToken = default)
         {
 #nullable restore
 #else
-        public async Task<UntypedNode> PostAsync(global::Marechai.App.Models.CompanyDescriptionDto body, Action<RequestConfiguration<DefaultQueryParameters>> requestConfiguration = default, CancellationToken cancellationToken = default)
+        public async Task<int?> PostAsync(global::Marechai.App.Models.CompanyDescriptionDto body, Action<RequestConfiguration<DefaultQueryParameters>> requestConfiguration = default, CancellationToken cancellationToken = default)
         {
 #endif
             if(ReferenceEquals(body, null)) throw new ArgumentNullException(nameof(body));
@@ -81,7 +81,7 @@ namespace Marechai.App.Companies.Item.Description
                 { "400", global::Marechai.App.Models.ProblemDetails.CreateFromDiscriminatorValue },
                 { "401", global::Marechai.App.Models.ProblemDetails.CreateFromDiscriminatorValue },
             };
-            return await RequestAdapter.SendAsync<UntypedNode>(requestInfo, UntypedNode.CreateFromDiscriminatorValue, errorMapping, cancellationToken).ConfigureAwait(false);
+            return await RequestAdapter.SendPrimitiveAsync<int?>(requestInfo, errorMapping, cancellationToken).ConfigureAwait(false);
         }
         /// <returns>A <see cref="RequestInformation"/></returns>
         /// <param name="requestConfiguration">Configuration for the request such as headers, query parameters, and middleware options.</param>
diff --git a/Marechai.App/Services/Client/Companies/Logos/ChangeYear/Item/ChangeYearItemRequestBuilder.cs b/Marechai.App/Services/Client/Companies/Logos/ChangeYear/Item/ChangeYearItemRequestBuilder.cs
index d7487815..e7ea8b68 100644
--- a/Marechai.App/Services/Client/Companies/Logos/ChangeYear/Item/ChangeYearItemRequestBuilder.cs
+++ b/Marechai.App/Services/Client/Companies/Logos/ChangeYear/Item/ChangeYearItemRequestBuilder.cs
@@ -96,7 +96,7 @@ namespace Marechai.App.Companies.Logos.ChangeYear.Item
         {
         }
         /// <summary>
-        /// Composed type wrapper for classes <see cref="global::Marechai.App.Companies.Logos.ChangeYear.Item.ChangeYearPutRequestBodyMember1"/>, <see cref="global::Marechai.App.Companies.Logos.ChangeYear.Item.ChangeYearPutRequestBodyMember2"/>
+        /// Composed type wrapper for classes <see cref="global::Marechai.App.Companies.Logos.ChangeYear.Item.ChangeYearPutRequestBodyMember1"/>, <see cref="int"/>
         /// </summary>
         [global::System.CodeDom.Compiler.GeneratedCode("Kiota", "1.0.0")]
         public partial class ChangeYearPutRequestBody : IComposedTypeWrapper, IParsable
@@ -109,14 +109,8 @@ namespace Marechai.App.Companies.Logos.ChangeYear.Item
 #else
             public global::Marechai.App.Companies.Logos.ChangeYear.Item.ChangeYearPutRequestBodyMember1 ChangeYearPutRequestBodyMember1 { get; set; }
 #endif
-            /// <summary>Composed type representation for type <see cref="global::Marechai.App.Companies.Logos.ChangeYear.Item.ChangeYearPutRequestBodyMember2"/></summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-            public global::Marechai.App.Companies.Logos.ChangeYear.Item.ChangeYearPutRequestBodyMember2? ChangeYearPutRequestBodyMember2 { get; set; }
-#nullable restore
-#else
-            public global::Marechai.App.Companies.Logos.ChangeYear.Item.ChangeYearPutRequestBodyMember2 ChangeYearPutRequestBodyMember2 { get; set; }
-#endif
+            /// <summary>Composed type representation for type <see cref="int"/></summary>
+            public int? Integer { get; set; }
             /// <summary>
             /// Creates a new instance of the appropriate class based on discriminator value
             /// </summary>
@@ -131,9 +125,9 @@ namespace Marechai.App.Companies.Logos.ChangeYear.Item
                 {
                     result.ChangeYearPutRequestBodyMember1 = new global::Marechai.App.Companies.Logos.ChangeYear.Item.ChangeYearPutRequestBodyMember1();
                 }
-                else if("".Equals(mappingValue, StringComparison.OrdinalIgnoreCase))
+                else if(parseNode.GetIntValue() is int integerValue)
                 {
-                    result.ChangeYearPutRequestBodyMember2 = new global::Marechai.App.Companies.Logos.ChangeYear.Item.ChangeYearPutRequestBodyMember2();
+                    result.Integer = integerValue;
                 }
                 return result;
             }
@@ -147,10 +141,6 @@ namespace Marechai.App.Companies.Logos.ChangeYear.Item
                 {
                     return ChangeYearPutRequestBodyMember1.GetFieldDeserializers();
                 }
-                else if(ChangeYearPutRequestBodyMember2 != null)
-                {
-                    return ChangeYearPutRequestBodyMember2.GetFieldDeserializers();
-                }
                 return new Dictionary<string, Action<IParseNode>>();
             }
             /// <summary>
@@ -164,9 +154,9 @@ namespace Marechai.App.Companies.Logos.ChangeYear.Item
                 {
                     writer.WriteObjectValue<global::Marechai.App.Companies.Logos.ChangeYear.Item.ChangeYearPutRequestBodyMember1>(null, ChangeYearPutRequestBodyMember1);
                 }
-                else if(ChangeYearPutRequestBodyMember2 != null)
+                else if(Integer != null)
                 {
-                    writer.WriteObjectValue<global::Marechai.App.Companies.Logos.ChangeYear.Item.ChangeYearPutRequestBodyMember2>(null, ChangeYearPutRequestBodyMember2);
+                    writer.WriteIntValue(null, Integer);
                 }
             }
         }
diff --git a/Marechai.App/Services/Client/Companies/Logos/LogosRequestBuilder.cs b/Marechai.App/Services/Client/Companies/Logos/LogosRequestBuilder.cs
index 511b7184..0151f690 100644
--- a/Marechai.App/Services/Client/Companies/Logos/LogosRequestBuilder.cs
+++ b/Marechai.App/Services/Client/Companies/Logos/LogosRequestBuilder.cs
@@ -65,7 +65,7 @@ namespace Marechai.App.Companies.Logos
         public LogosRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) : base(requestAdapter, "{+baseurl}/companies/logos", rawUrl)
         {
         }
-        /// <returns>A <see cref="UntypedNode"/></returns>
+        /// <returns>A <see cref="int"/></returns>
         /// <param name="body">The request body</param>
         /// <param name="cancellationToken">Cancellation token to use when cancelling requests</param>
         /// <param name="requestConfiguration">Configuration for the request such as headers, query parameters, and middleware options.</param>
@@ -73,11 +73,11 @@ namespace Marechai.App.Companies.Logos
         /// <exception cref="global::Marechai.App.Models.ProblemDetails">When receiving a 401 status code</exception>
 #if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
 #nullable enable
-        public async Task<UntypedNode?> PostAsync(global::Marechai.App.Models.CompanyLogoDto body, Action<RequestConfiguration<DefaultQueryParameters>>? requestConfiguration = default, CancellationToken cancellationToken = default)
+        public async Task<int?> PostAsync(global::Marechai.App.Models.CompanyLogoDto body, Action<RequestConfiguration<DefaultQueryParameters>>? requestConfiguration = default, CancellationToken cancellationToken = default)
         {
 #nullable restore
 #else
-        public async Task<UntypedNode> PostAsync(global::Marechai.App.Models.CompanyLogoDto body, Action<RequestConfiguration<DefaultQueryParameters>> requestConfiguration = default, CancellationToken cancellationToken = default)
+        public async Task<int?> PostAsync(global::Marechai.App.Models.CompanyLogoDto body, Action<RequestConfiguration<DefaultQueryParameters>> requestConfiguration = default, CancellationToken cancellationToken = default)
         {
 #endif
             if(ReferenceEquals(body, null)) throw new ArgumentNullException(nameof(body));
@@ -87,7 +87,7 @@ namespace Marechai.App.Companies.Logos
                 { "400", global::Marechai.App.Models.ProblemDetails.CreateFromDiscriminatorValue },
                 { "401", global::Marechai.App.Models.ProblemDetails.CreateFromDiscriminatorValue },
             };
-            return await RequestAdapter.SendAsync<UntypedNode>(requestInfo, UntypedNode.CreateFromDiscriminatorValue, errorMapping, cancellationToken).ConfigureAwait(false);
+            return await RequestAdapter.SendPrimitiveAsync<int?>(requestInfo, errorMapping, cancellationToken).ConfigureAwait(false);
         }
         /// <returns>A <see cref="RequestInformation"/></returns>
         /// <param name="body">The request body</param>
diff --git a/Marechai.App/Services/Client/Computers/Count/CountRequestBuilder.cs b/Marechai.App/Services/Client/Computers/Count/CountRequestBuilder.cs
index 5eddc0ed..d815e17e 100644
--- a/Marechai.App/Services/Client/Computers/Count/CountRequestBuilder.cs
+++ b/Marechai.App/Services/Client/Computers/Count/CountRequestBuilder.cs
@@ -33,17 +33,17 @@ namespace Marechai.App.Computers.Count
         public CountRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) : base(requestAdapter, "{+baseurl}/computers/count", rawUrl)
         {
         }
-        /// <returns>A <see cref="UntypedNode"/></returns>
+        /// <returns>A <see cref="int"/></returns>
         /// <param name="cancellationToken">Cancellation token to use when cancelling requests</param>
         /// <param name="requestConfiguration">Configuration for the request such as headers, query parameters, and middleware options.</param>
         /// <exception cref="global::Marechai.App.Models.ProblemDetails">When receiving a 400 status code</exception>
 #if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
 #nullable enable
-        public async Task<UntypedNode?> GetAsync(Action<RequestConfiguration<DefaultQueryParameters>>? requestConfiguration = default, CancellationToken cancellationToken = default)
+        public async Task<int?> GetAsync(Action<RequestConfiguration<DefaultQueryParameters>>? requestConfiguration = default, CancellationToken cancellationToken = default)
         {
 #nullable restore
 #else
-        public async Task<UntypedNode> GetAsync(Action<RequestConfiguration<DefaultQueryParameters>> requestConfiguration = default, CancellationToken cancellationToken = default)
+        public async Task<int?> GetAsync(Action<RequestConfiguration<DefaultQueryParameters>> requestConfiguration = default, CancellationToken cancellationToken = default)
         {
 #endif
             var requestInfo = ToGetRequestInformation(requestConfiguration);
@@ -51,7 +51,7 @@ namespace Marechai.App.Computers.Count
             {
                 { "400", global::Marechai.App.Models.ProblemDetails.CreateFromDiscriminatorValue },
             };
-            return await RequestAdapter.SendAsync<UntypedNode>(requestInfo, UntypedNode.CreateFromDiscriminatorValue, errorMapping, cancellationToken).ConfigureAwait(false);
+            return await RequestAdapter.SendPrimitiveAsync<int?>(requestInfo, errorMapping, cancellationToken).ConfigureAwait(false);
         }
         /// <returns>A <see cref="RequestInformation"/></returns>
         /// <param name="requestConfiguration">Configuration for the request such as headers, query parameters, and middleware options.</param>
diff --git a/Marechai.App/Services/Client/Computers/MaximumYear/MaximumYearRequestBuilder.cs b/Marechai.App/Services/Client/Computers/MaximumYear/MaximumYearRequestBuilder.cs
index 77d38b28..64cbb922 100644
--- a/Marechai.App/Services/Client/Computers/MaximumYear/MaximumYearRequestBuilder.cs
+++ b/Marechai.App/Services/Client/Computers/MaximumYear/MaximumYearRequestBuilder.cs
@@ -33,17 +33,17 @@ namespace Marechai.App.Computers.MaximumYear
         public MaximumYearRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) : base(requestAdapter, "{+baseurl}/computers/maximum-year", rawUrl)
         {
         }
-        /// <returns>A <see cref="UntypedNode"/></returns>
+        /// <returns>A <see cref="int"/></returns>
         /// <param name="cancellationToken">Cancellation token to use when cancelling requests</param>
         /// <param name="requestConfiguration">Configuration for the request such as headers, query parameters, and middleware options.</param>
         /// <exception cref="global::Marechai.App.Models.ProblemDetails">When receiving a 400 status code</exception>
 #if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
 #nullable enable
-        public async Task<UntypedNode?> GetAsync(Action<RequestConfiguration<DefaultQueryParameters>>? requestConfiguration = default, CancellationToken cancellationToken = default)
+        public async Task<int?> GetAsync(Action<RequestConfiguration<DefaultQueryParameters>>? requestConfiguration = default, CancellationToken cancellationToken = default)
         {
 #nullable restore
 #else
-        public async Task<UntypedNode> GetAsync(Action<RequestConfiguration<DefaultQueryParameters>> requestConfiguration = default, CancellationToken cancellationToken = default)
+        public async Task<int?> GetAsync(Action<RequestConfiguration<DefaultQueryParameters>> requestConfiguration = default, CancellationToken cancellationToken = default)
         {
 #endif
             var requestInfo = ToGetRequestInformation(requestConfiguration);
@@ -51,7 +51,7 @@ namespace Marechai.App.Computers.MaximumYear
             {
                 { "400", global::Marechai.App.Models.ProblemDetails.CreateFromDiscriminatorValue },
             };
-            return await RequestAdapter.SendAsync<UntypedNode>(requestInfo, UntypedNode.CreateFromDiscriminatorValue, errorMapping, cancellationToken).ConfigureAwait(false);
+            return await RequestAdapter.SendPrimitiveAsync<int?>(requestInfo, errorMapping, cancellationToken).ConfigureAwait(false);
         }
         /// <returns>A <see cref="RequestInformation"/></returns>
         /// <param name="requestConfiguration">Configuration for the request such as headers, query parameters, and middleware options.</param>
diff --git a/Marechai.App/Services/Client/Computers/MinimumYear/MinimumYearRequestBuilder.cs b/Marechai.App/Services/Client/Computers/MinimumYear/MinimumYearRequestBuilder.cs
index 67a6aaf2..4282afc5 100644
--- a/Marechai.App/Services/Client/Computers/MinimumYear/MinimumYearRequestBuilder.cs
+++ b/Marechai.App/Services/Client/Computers/MinimumYear/MinimumYearRequestBuilder.cs
@@ -33,17 +33,17 @@ namespace Marechai.App.Computers.MinimumYear
         public MinimumYearRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) : base(requestAdapter, "{+baseurl}/computers/minimum-year", rawUrl)
         {
         }
-        /// <returns>A <see cref="UntypedNode"/></returns>
+        /// <returns>A <see cref="int"/></returns>
         /// <param name="cancellationToken">Cancellation token to use when cancelling requests</param>
         /// <param name="requestConfiguration">Configuration for the request such as headers, query parameters, and middleware options.</param>
         /// <exception cref="global::Marechai.App.Models.ProblemDetails">When receiving a 400 status code</exception>
 #if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
 #nullable enable
-        public async Task<UntypedNode?> GetAsync(Action<RequestConfiguration<DefaultQueryParameters>>? requestConfiguration = default, CancellationToken cancellationToken = default)
+        public async Task<int?> GetAsync(Action<RequestConfiguration<DefaultQueryParameters>>? requestConfiguration = default, CancellationToken cancellationToken = default)
         {
 #nullable restore
 #else
-        public async Task<UntypedNode> GetAsync(Action<RequestConfiguration<DefaultQueryParameters>> requestConfiguration = default, CancellationToken cancellationToken = default)
+        public async Task<int?> GetAsync(Action<RequestConfiguration<DefaultQueryParameters>> requestConfiguration = default, CancellationToken cancellationToken = default)
         {
 #endif
             var requestInfo = ToGetRequestInformation(requestConfiguration);
@@ -51,7 +51,7 @@ namespace Marechai.App.Computers.MinimumYear
             {
                 { "400", global::Marechai.App.Models.ProblemDetails.CreateFromDiscriminatorValue },
             };
-            return await RequestAdapter.SendAsync<UntypedNode>(requestInfo, UntypedNode.CreateFromDiscriminatorValue, errorMapping, cancellationToken).ConfigureAwait(false);
+            return await RequestAdapter.SendPrimitiveAsync<int?>(requestInfo, errorMapping, cancellationToken).ConfigureAwait(false);
         }
         /// <returns>A <see cref="RequestInformation"/></returns>
         /// <param name="requestConfiguration">Configuration for the request such as headers, query parameters, and middleware options.</param>
diff --git a/Marechai.App/Services/Client/Consoles/Count/CountRequestBuilder.cs b/Marechai.App/Services/Client/Consoles/Count/CountRequestBuilder.cs
index 68a0c1c1..16f8a98d 100644
--- a/Marechai.App/Services/Client/Consoles/Count/CountRequestBuilder.cs
+++ b/Marechai.App/Services/Client/Consoles/Count/CountRequestBuilder.cs
@@ -33,17 +33,17 @@ namespace Marechai.App.Consoles.Count
         public CountRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) : base(requestAdapter, "{+baseurl}/consoles/count", rawUrl)
         {
         }
-        /// <returns>A <see cref="UntypedNode"/></returns>
+        /// <returns>A <see cref="int"/></returns>
         /// <param name="cancellationToken">Cancellation token to use when cancelling requests</param>
         /// <param name="requestConfiguration">Configuration for the request such as headers, query parameters, and middleware options.</param>
         /// <exception cref="global::Marechai.App.Models.ProblemDetails">When receiving a 400 status code</exception>
 #if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
 #nullable enable
-        public async Task<UntypedNode?> GetAsync(Action<RequestConfiguration<DefaultQueryParameters>>? requestConfiguration = default, CancellationToken cancellationToken = default)
+        public async Task<int?> GetAsync(Action<RequestConfiguration<DefaultQueryParameters>>? requestConfiguration = default, CancellationToken cancellationToken = default)
         {
 #nullable restore
 #else
-        public async Task<UntypedNode> GetAsync(Action<RequestConfiguration<DefaultQueryParameters>> requestConfiguration = default, CancellationToken cancellationToken = default)
+        public async Task<int?> GetAsync(Action<RequestConfiguration<DefaultQueryParameters>> requestConfiguration = default, CancellationToken cancellationToken = default)
         {
 #endif
             var requestInfo = ToGetRequestInformation(requestConfiguration);
@@ -51,7 +51,7 @@ namespace Marechai.App.Consoles.Count
             {
                 { "400", global::Marechai.App.Models.ProblemDetails.CreateFromDiscriminatorValue },
             };
-            return await RequestAdapter.SendAsync<UntypedNode>(requestInfo, UntypedNode.CreateFromDiscriminatorValue, errorMapping, cancellationToken).ConfigureAwait(false);
+            return await RequestAdapter.SendPrimitiveAsync<int?>(requestInfo, errorMapping, cancellationToken).ConfigureAwait(false);
         }
         /// <returns>A <see cref="RequestInformation"/></returns>
         /// <param name="requestConfiguration">Configuration for the request such as headers, query parameters, and middleware options.</param>
diff --git a/Marechai.App/Services/Client/Consoles/MaximumYear/MaximumYearRequestBuilder.cs b/Marechai.App/Services/Client/Consoles/MaximumYear/MaximumYearRequestBuilder.cs
index 3f0f626f..e9db9b81 100644
--- a/Marechai.App/Services/Client/Consoles/MaximumYear/MaximumYearRequestBuilder.cs
+++ b/Marechai.App/Services/Client/Consoles/MaximumYear/MaximumYearRequestBuilder.cs
@@ -33,17 +33,17 @@ namespace Marechai.App.Consoles.MaximumYear
         public MaximumYearRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) : base(requestAdapter, "{+baseurl}/consoles/maximum-year", rawUrl)
         {
         }
-        /// <returns>A <see cref="UntypedNode"/></returns>
+        /// <returns>A <see cref="int"/></returns>
         /// <param name="cancellationToken">Cancellation token to use when cancelling requests</param>
         /// <param name="requestConfiguration">Configuration for the request such as headers, query parameters, and middleware options.</param>
         /// <exception cref="global::Marechai.App.Models.ProblemDetails">When receiving a 400 status code</exception>
 #if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
 #nullable enable
-        public async Task<UntypedNode?> GetAsync(Action<RequestConfiguration<DefaultQueryParameters>>? requestConfiguration = default, CancellationToken cancellationToken = default)
+        public async Task<int?> GetAsync(Action<RequestConfiguration<DefaultQueryParameters>>? requestConfiguration = default, CancellationToken cancellationToken = default)
         {
 #nullable restore
 #else
-        public async Task<UntypedNode> GetAsync(Action<RequestConfiguration<DefaultQueryParameters>> requestConfiguration = default, CancellationToken cancellationToken = default)
+        public async Task<int?> GetAsync(Action<RequestConfiguration<DefaultQueryParameters>> requestConfiguration = default, CancellationToken cancellationToken = default)
         {
 #endif
             var requestInfo = ToGetRequestInformation(requestConfiguration);
@@ -51,7 +51,7 @@ namespace Marechai.App.Consoles.MaximumYear
             {
                 { "400", global::Marechai.App.Models.ProblemDetails.CreateFromDiscriminatorValue },
             };
-            return await RequestAdapter.SendAsync<UntypedNode>(requestInfo, UntypedNode.CreateFromDiscriminatorValue, errorMapping, cancellationToken).ConfigureAwait(false);
+            return await RequestAdapter.SendPrimitiveAsync<int?>(requestInfo, errorMapping, cancellationToken).ConfigureAwait(false);
         }
         /// <returns>A <see cref="RequestInformation"/></returns>
         /// <param name="requestConfiguration">Configuration for the request such as headers, query parameters, and middleware options.</param>
diff --git a/Marechai.App/Services/Client/Consoles/MinimumYear/MinimumYearRequestBuilder.cs b/Marechai.App/Services/Client/Consoles/MinimumYear/MinimumYearRequestBuilder.cs
index e99d8533..cf8889fd 100644
--- a/Marechai.App/Services/Client/Consoles/MinimumYear/MinimumYearRequestBuilder.cs
+++ b/Marechai.App/Services/Client/Consoles/MinimumYear/MinimumYearRequestBuilder.cs
@@ -33,17 +33,17 @@ namespace Marechai.App.Consoles.MinimumYear
         public MinimumYearRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) : base(requestAdapter, "{+baseurl}/consoles/minimum-year", rawUrl)
         {
         }
-        /// <returns>A <see cref="UntypedNode"/></returns>
+        /// <returns>A <see cref="int"/></returns>
         /// <param name="cancellationToken">Cancellation token to use when cancelling requests</param>
         /// <param name="requestConfiguration">Configuration for the request such as headers, query parameters, and middleware options.</param>
         /// <exception cref="global::Marechai.App.Models.ProblemDetails">When receiving a 400 status code</exception>
 #if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
 #nullable enable
-        public async Task<UntypedNode?> GetAsync(Action<RequestConfiguration<DefaultQueryParameters>>? requestConfiguration = default, CancellationToken cancellationToken = default)
+        public async Task<int?> GetAsync(Action<RequestConfiguration<DefaultQueryParameters>>? requestConfiguration = default, CancellationToken cancellationToken = default)
         {
 #nullable restore
 #else
-        public async Task<UntypedNode> GetAsync(Action<RequestConfiguration<DefaultQueryParameters>> requestConfiguration = default, CancellationToken cancellationToken = default)
+        public async Task<int?> GetAsync(Action<RequestConfiguration<DefaultQueryParameters>> requestConfiguration = default, CancellationToken cancellationToken = default)
         {
 #endif
             var requestInfo = ToGetRequestInformation(requestConfiguration);
@@ -51,7 +51,7 @@ namespace Marechai.App.Consoles.MinimumYear
             {
                 { "400", global::Marechai.App.Models.ProblemDetails.CreateFromDiscriminatorValue },
             };
-            return await RequestAdapter.SendAsync<UntypedNode>(requestInfo, UntypedNode.CreateFromDiscriminatorValue, errorMapping, cancellationToken).ConfigureAwait(false);
+            return await RequestAdapter.SendPrimitiveAsync<int?>(requestInfo, errorMapping, cancellationToken).ConfigureAwait(false);
         }
         /// <returns>A <see cref="RequestInformation"/></returns>
         /// <param name="requestConfiguration">Configuration for the request such as headers, query parameters, and middleware options.</param>
diff --git a/Marechai.App/Services/Client/Currencies/Inflation/InflationRequestBuilder.cs b/Marechai.App/Services/Client/Currencies/Inflation/InflationRequestBuilder.cs
index 33953f2e..4032f9f5 100644
--- a/Marechai.App/Services/Client/Currencies/Inflation/InflationRequestBuilder.cs
+++ b/Marechai.App/Services/Client/Currencies/Inflation/InflationRequestBuilder.cs
@@ -80,7 +80,7 @@ namespace Marechai.App.Currencies.Inflation
             var collectionResult = await RequestAdapter.SendCollectionAsync<global::Marechai.App.Models.CurrencyInflationDto>(requestInfo, global::Marechai.App.Models.CurrencyInflationDto.CreateFromDiscriminatorValue, errorMapping, cancellationToken).ConfigureAwait(false);
             return collectionResult?.AsList();
         }
-        /// <returns>A <see cref="UntypedNode"/></returns>
+        /// <returns>A <see cref="int"/></returns>
         /// <param name="body">The request body</param>
         /// <param name="cancellationToken">Cancellation token to use when cancelling requests</param>
         /// <param name="requestConfiguration">Configuration for the request such as headers, query parameters, and middleware options.</param>
@@ -88,11 +88,11 @@ namespace Marechai.App.Currencies.Inflation
         /// <exception cref="global::Marechai.App.Models.ProblemDetails">When receiving a 401 status code</exception>
 #if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
 #nullable enable
-        public async Task<UntypedNode?> PostAsync(global::Marechai.App.Models.CurrencyInflationDto body, Action<RequestConfiguration<DefaultQueryParameters>>? requestConfiguration = default, CancellationToken cancellationToken = default)
+        public async Task<int?> PostAsync(global::Marechai.App.Models.CurrencyInflationDto body, Action<RequestConfiguration<DefaultQueryParameters>>? requestConfiguration = default, CancellationToken cancellationToken = default)
         {
 #nullable restore
 #else
-        public async Task<UntypedNode> PostAsync(global::Marechai.App.Models.CurrencyInflationDto body, Action<RequestConfiguration<DefaultQueryParameters>> requestConfiguration = default, CancellationToken cancellationToken = default)
+        public async Task<int?> PostAsync(global::Marechai.App.Models.CurrencyInflationDto body, Action<RequestConfiguration<DefaultQueryParameters>> requestConfiguration = default, CancellationToken cancellationToken = default)
         {
 #endif
             if(ReferenceEquals(body, null)) throw new ArgumentNullException(nameof(body));
@@ -102,7 +102,7 @@ namespace Marechai.App.Currencies.Inflation
                 { "400", global::Marechai.App.Models.ProblemDetails.CreateFromDiscriminatorValue },
                 { "401", global::Marechai.App.Models.ProblemDetails.CreateFromDiscriminatorValue },
             };
-            return await RequestAdapter.SendAsync<UntypedNode>(requestInfo, UntypedNode.CreateFromDiscriminatorValue, errorMapping, cancellationToken).ConfigureAwait(false);
+            return await RequestAdapter.SendPrimitiveAsync<int?>(requestInfo, errorMapping, cancellationToken).ConfigureAwait(false);
         }
         /// <returns>A <see cref="RequestInformation"/></returns>
         /// <param name="requestConfiguration">Configuration for the request such as headers, query parameters, and middleware options.</param>
diff --git a/Marechai.App/Services/Client/Currencies/Pegging/PeggingRequestBuilder.cs b/Marechai.App/Services/Client/Currencies/Pegging/PeggingRequestBuilder.cs
index bc0b29e8..00602f41 100644
--- a/Marechai.App/Services/Client/Currencies/Pegging/PeggingRequestBuilder.cs
+++ b/Marechai.App/Services/Client/Currencies/Pegging/PeggingRequestBuilder.cs
@@ -80,7 +80,7 @@ namespace Marechai.App.Currencies.Pegging
             var collectionResult = await RequestAdapter.SendCollectionAsync<global::Marechai.App.Models.CurrencyPeggingDto>(requestInfo, global::Marechai.App.Models.CurrencyPeggingDto.CreateFromDiscriminatorValue, errorMapping, cancellationToken).ConfigureAwait(false);
             return collectionResult?.AsList();
         }
-        /// <returns>A <see cref="UntypedNode"/></returns>
+        /// <returns>A <see cref="int"/></returns>
         /// <param name="body">The request body</param>
         /// <param name="cancellationToken">Cancellation token to use when cancelling requests</param>
         /// <param name="requestConfiguration">Configuration for the request such as headers, query parameters, and middleware options.</param>
@@ -88,11 +88,11 @@ namespace Marechai.App.Currencies.Pegging
         /// <exception cref="global::Marechai.App.Models.ProblemDetails">When receiving a 401 status code</exception>
 #if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
 #nullable enable
-        public async Task<UntypedNode?> PostAsync(global::Marechai.App.Models.CurrencyPeggingDto body, Action<RequestConfiguration<DefaultQueryParameters>>? requestConfiguration = default, CancellationToken cancellationToken = default)
+        public async Task<int?> PostAsync(global::Marechai.App.Models.CurrencyPeggingDto body, Action<RequestConfiguration<DefaultQueryParameters>>? requestConfiguration = default, CancellationToken cancellationToken = default)
         {
 #nullable restore
 #else
-        public async Task<UntypedNode> PostAsync(global::Marechai.App.Models.CurrencyPeggingDto body, Action<RequestConfiguration<DefaultQueryParameters>> requestConfiguration = default, CancellationToken cancellationToken = default)
+        public async Task<int?> PostAsync(global::Marechai.App.Models.CurrencyPeggingDto body, Action<RequestConfiguration<DefaultQueryParameters>> requestConfiguration = default, CancellationToken cancellationToken = default)
         {
 #endif
             if(ReferenceEquals(body, null)) throw new ArgumentNullException(nameof(body));
@@ -102,7 +102,7 @@ namespace Marechai.App.Currencies.Pegging
                 { "400", global::Marechai.App.Models.ProblemDetails.CreateFromDiscriminatorValue },
                 { "401", global::Marechai.App.Models.ProblemDetails.CreateFromDiscriminatorValue },
             };
-            return await RequestAdapter.SendAsync<UntypedNode>(requestInfo, UntypedNode.CreateFromDiscriminatorValue, errorMapping, cancellationToken).ConfigureAwait(false);
+            return await RequestAdapter.SendPrimitiveAsync<int?>(requestInfo, errorMapping, cancellationToken).ConfigureAwait(false);
         }
         /// <returns>A <see cref="RequestInformation"/></returns>
         /// <param name="requestConfiguration">Configuration for the request such as headers, query parameters, and middleware options.</param>
diff --git a/Marechai.App/Services/Client/Documents/Companies/CompaniesRequestBuilder.cs b/Marechai.App/Services/Client/Documents/Companies/CompaniesRequestBuilder.cs
index 04764a5f..39062aee 100644
--- a/Marechai.App/Services/Client/Documents/Companies/CompaniesRequestBuilder.cs
+++ b/Marechai.App/Services/Client/Documents/Companies/CompaniesRequestBuilder.cs
@@ -80,7 +80,7 @@ namespace Marechai.App.Documents.Companies
             var collectionResult = await RequestAdapter.SendCollectionAsync<global::Marechai.App.Models.DocumentCompanyDto>(requestInfo, global::Marechai.App.Models.DocumentCompanyDto.CreateFromDiscriminatorValue, errorMapping, cancellationToken).ConfigureAwait(false);
             return collectionResult?.AsList();
         }
-        /// <returns>A <see cref="UntypedNode"/></returns>
+        /// <returns>A <see cref="long"/></returns>
         /// <param name="body">The request body</param>
         /// <param name="cancellationToken">Cancellation token to use when cancelling requests</param>
         /// <param name="requestConfiguration">Configuration for the request such as headers, query parameters, and middleware options.</param>
@@ -88,11 +88,11 @@ namespace Marechai.App.Documents.Companies
         /// <exception cref="global::Marechai.App.Models.ProblemDetails">When receiving a 401 status code</exception>
 #if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
 #nullable enable
-        public async Task<UntypedNode?> PostAsync(global::Marechai.App.Models.DocumentCompanyDto body, Action<RequestConfiguration<DefaultQueryParameters>>? requestConfiguration = default, CancellationToken cancellationToken = default)
+        public async Task<long?> PostAsync(global::Marechai.App.Models.DocumentCompanyDto body, Action<RequestConfiguration<DefaultQueryParameters>>? requestConfiguration = default, CancellationToken cancellationToken = default)
         {
 #nullable restore
 #else
-        public async Task<UntypedNode> PostAsync(global::Marechai.App.Models.DocumentCompanyDto body, Action<RequestConfiguration<DefaultQueryParameters>> requestConfiguration = default, CancellationToken cancellationToken = default)
+        public async Task<long?> PostAsync(global::Marechai.App.Models.DocumentCompanyDto body, Action<RequestConfiguration<DefaultQueryParameters>> requestConfiguration = default, CancellationToken cancellationToken = default)
         {
 #endif
             if(ReferenceEquals(body, null)) throw new ArgumentNullException(nameof(body));
@@ -102,7 +102,7 @@ namespace Marechai.App.Documents.Companies
                 { "400", global::Marechai.App.Models.ProblemDetails.CreateFromDiscriminatorValue },
                 { "401", global::Marechai.App.Models.ProblemDetails.CreateFromDiscriminatorValue },
             };
-            return await RequestAdapter.SendAsync<UntypedNode>(requestInfo, UntypedNode.CreateFromDiscriminatorValue, errorMapping, cancellationToken).ConfigureAwait(false);
+            return await RequestAdapter.SendPrimitiveAsync<long?>(requestInfo, errorMapping, cancellationToken).ConfigureAwait(false);
         }
         /// <returns>A <see cref="RequestInformation"/></returns>
         /// <param name="requestConfiguration">Configuration for the request such as headers, query parameters, and middleware options.</param>
diff --git a/Marechai.App/Services/Client/Documents/DocumentsRequestBuilder.cs b/Marechai.App/Services/Client/Documents/DocumentsRequestBuilder.cs
index e66bc848..5a427a07 100644
--- a/Marechai.App/Services/Client/Documents/DocumentsRequestBuilder.cs
+++ b/Marechai.App/Services/Client/Documents/DocumentsRequestBuilder.cs
@@ -104,7 +104,7 @@ namespace Marechai.App.Documents
             var collectionResult = await RequestAdapter.SendCollectionAsync<global::Marechai.App.Models.DocumentDto>(requestInfo, global::Marechai.App.Models.DocumentDto.CreateFromDiscriminatorValue, errorMapping, cancellationToken).ConfigureAwait(false);
             return collectionResult?.AsList();
         }
-        /// <returns>A <see cref="UntypedNode"/></returns>
+        /// <returns>A <see cref="long"/></returns>
         /// <param name="body">The request body</param>
         /// <param name="cancellationToken">Cancellation token to use when cancelling requests</param>
         /// <param name="requestConfiguration">Configuration for the request such as headers, query parameters, and middleware options.</param>
@@ -112,11 +112,11 @@ namespace Marechai.App.Documents
         /// <exception cref="global::Marechai.App.Models.ProblemDetails">When receiving a 401 status code</exception>
 #if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
 #nullable enable
-        public async Task<UntypedNode?> PostAsync(global::Marechai.App.Models.DocumentDto body, Action<RequestConfiguration<DefaultQueryParameters>>? requestConfiguration = default, CancellationToken cancellationToken = default)
+        public async Task<long?> PostAsync(global::Marechai.App.Models.DocumentDto body, Action<RequestConfiguration<DefaultQueryParameters>>? requestConfiguration = default, CancellationToken cancellationToken = default)
         {
 #nullable restore
 #else
-        public async Task<UntypedNode> PostAsync(global::Marechai.App.Models.DocumentDto body, Action<RequestConfiguration<DefaultQueryParameters>> requestConfiguration = default, CancellationToken cancellationToken = default)
+        public async Task<long?> PostAsync(global::Marechai.App.Models.DocumentDto body, Action<RequestConfiguration<DefaultQueryParameters>> requestConfiguration = default, CancellationToken cancellationToken = default)
         {
 #endif
             if(ReferenceEquals(body, null)) throw new ArgumentNullException(nameof(body));
@@ -126,7 +126,7 @@ namespace Marechai.App.Documents
                 { "400", global::Marechai.App.Models.ProblemDetails.CreateFromDiscriminatorValue },
                 { "401", global::Marechai.App.Models.ProblemDetails.CreateFromDiscriminatorValue },
             };
-            return await RequestAdapter.SendAsync<UntypedNode>(requestInfo, UntypedNode.CreateFromDiscriminatorValue, errorMapping, cancellationToken).ConfigureAwait(false);
+            return await RequestAdapter.SendPrimitiveAsync<long?>(requestInfo, errorMapping, cancellationToken).ConfigureAwait(false);
         }
         /// <returns>A <see cref="RequestInformation"/></returns>
         /// <param name="requestConfiguration">Configuration for the request such as headers, query parameters, and middleware options.</param>
diff --git a/Marechai.App/Services/Client/Documents/People/PeopleRequestBuilder.cs b/Marechai.App/Services/Client/Documents/People/PeopleRequestBuilder.cs
index 58958126..f2af5cba 100644
--- a/Marechai.App/Services/Client/Documents/People/PeopleRequestBuilder.cs
+++ b/Marechai.App/Services/Client/Documents/People/PeopleRequestBuilder.cs
@@ -80,7 +80,7 @@ namespace Marechai.App.Documents.People
             var collectionResult = await RequestAdapter.SendCollectionAsync<global::Marechai.App.Models.DocumentPersonDto>(requestInfo, global::Marechai.App.Models.DocumentPersonDto.CreateFromDiscriminatorValue, errorMapping, cancellationToken).ConfigureAwait(false);
             return collectionResult?.AsList();
         }
-        /// <returns>A <see cref="UntypedNode"/></returns>
+        /// <returns>A <see cref="long"/></returns>
         /// <param name="body">The request body</param>
         /// <param name="cancellationToken">Cancellation token to use when cancelling requests</param>
         /// <param name="requestConfiguration">Configuration for the request such as headers, query parameters, and middleware options.</param>
@@ -88,11 +88,11 @@ namespace Marechai.App.Documents.People
         /// <exception cref="global::Marechai.App.Models.ProblemDetails">When receiving a 401 status code</exception>
 #if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
 #nullable enable
-        public async Task<UntypedNode?> PostAsync(global::Marechai.App.Models.DocumentPersonDto body, Action<RequestConfiguration<DefaultQueryParameters>>? requestConfiguration = default, CancellationToken cancellationToken = default)
+        public async Task<long?> PostAsync(global::Marechai.App.Models.DocumentPersonDto body, Action<RequestConfiguration<DefaultQueryParameters>>? requestConfiguration = default, CancellationToken cancellationToken = default)
         {
 #nullable restore
 #else
-        public async Task<UntypedNode> PostAsync(global::Marechai.App.Models.DocumentPersonDto body, Action<RequestConfiguration<DefaultQueryParameters>> requestConfiguration = default, CancellationToken cancellationToken = default)
+        public async Task<long?> PostAsync(global::Marechai.App.Models.DocumentPersonDto body, Action<RequestConfiguration<DefaultQueryParameters>> requestConfiguration = default, CancellationToken cancellationToken = default)
         {
 #endif
             if(ReferenceEquals(body, null)) throw new ArgumentNullException(nameof(body));
@@ -102,7 +102,7 @@ namespace Marechai.App.Documents.People
                 { "400", global::Marechai.App.Models.ProblemDetails.CreateFromDiscriminatorValue },
                 { "401", global::Marechai.App.Models.ProblemDetails.CreateFromDiscriminatorValue },
             };
-            return await RequestAdapter.SendAsync<UntypedNode>(requestInfo, UntypedNode.CreateFromDiscriminatorValue, errorMapping, cancellationToken).ConfigureAwait(false);
+            return await RequestAdapter.SendPrimitiveAsync<long?>(requestInfo, errorMapping, cancellationToken).ConfigureAwait(false);
         }
         /// <returns>A <see cref="RequestInformation"/></returns>
         /// <param name="requestConfiguration">Configuration for the request such as headers, query parameters, and middleware options.</param>
diff --git a/Marechai.App/Services/Client/Dumps/DumpsRequestBuilder.cs b/Marechai.App/Services/Client/Dumps/DumpsRequestBuilder.cs
index 19dab662..2798b556 100644
--- a/Marechai.App/Services/Client/Dumps/DumpsRequestBuilder.cs
+++ b/Marechai.App/Services/Client/Dumps/DumpsRequestBuilder.cs
@@ -21,7 +21,7 @@ namespace Marechai.App.Dumps
         /// <summary>Gets an item from the Marechai.App.dumps.item collection</summary>
         /// <param name="position">Unique identifier of the item</param>
         /// <returns>A <see cref="global::Marechai.App.Dumps.Item.DumpsItemRequestBuilder"/></returns>
-        public global::Marechai.App.Dumps.Item.DumpsItemRequestBuilder this[string position]
+        public global::Marechai.App.Dumps.Item.DumpsItemRequestBuilder this[int position]
         {
             get
             {
@@ -30,6 +30,19 @@ namespace Marechai.App.Dumps
                 return new global::Marechai.App.Dumps.Item.DumpsItemRequestBuilder(urlTplParams, RequestAdapter);
             }
         }
+        /// <summary>Gets an item from the Marechai.App.dumps.item collection</summary>
+        /// <param name="position">Unique identifier of the item</param>
+        /// <returns>A <see cref="global::Marechai.App.Dumps.Item.DumpsItemRequestBuilder"/></returns>
+        [Obsolete("This indexer is deprecated and will be removed in the next major version. Use the one with the typed parameter instead.")]
+        public global::Marechai.App.Dumps.Item.DumpsItemRequestBuilder this[string position]
+        {
+            get
+            {
+                var urlTplParams = new Dictionary<string, object>(PathParameters);
+                if (!string.IsNullOrWhiteSpace(position)) urlTplParams.Add("id", position);
+                return new global::Marechai.App.Dumps.Item.DumpsItemRequestBuilder(urlTplParams, RequestAdapter);
+            }
+        }
         /// <summary>
         /// Instantiates a new <see cref="global::Marechai.App.Dumps.DumpsRequestBuilder"/> and sets the default values.
         /// </summary>
@@ -67,7 +80,7 @@ namespace Marechai.App.Dumps
             var collectionResult = await RequestAdapter.SendCollectionAsync<global::Marechai.App.Models.DumpDto>(requestInfo, global::Marechai.App.Models.DumpDto.CreateFromDiscriminatorValue, errorMapping, cancellationToken).ConfigureAwait(false);
             return collectionResult?.AsList();
         }
-        /// <returns>A <see cref="UntypedNode"/></returns>
+        /// <returns>A <see cref="int"/></returns>
         /// <param name="body">The request body</param>
         /// <param name="cancellationToken">Cancellation token to use when cancelling requests</param>
         /// <param name="requestConfiguration">Configuration for the request such as headers, query parameters, and middleware options.</param>
@@ -75,11 +88,11 @@ namespace Marechai.App.Dumps
         /// <exception cref="global::Marechai.App.Models.ProblemDetails">When receiving a 401 status code</exception>
 #if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
 #nullable enable
-        public async Task<UntypedNode?> PostAsync(global::Marechai.App.Models.DumpDto body, Action<RequestConfiguration<DefaultQueryParameters>>? requestConfiguration = default, CancellationToken cancellationToken = default)
+        public async Task<int?> PostAsync(global::Marechai.App.Models.DumpDto body, Action<RequestConfiguration<DefaultQueryParameters>>? requestConfiguration = default, CancellationToken cancellationToken = default)
         {
 #nullable restore
 #else
-        public async Task<UntypedNode> PostAsync(global::Marechai.App.Models.DumpDto body, Action<RequestConfiguration<DefaultQueryParameters>> requestConfiguration = default, CancellationToken cancellationToken = default)
+        public async Task<int?> PostAsync(global::Marechai.App.Models.DumpDto body, Action<RequestConfiguration<DefaultQueryParameters>> requestConfiguration = default, CancellationToken cancellationToken = default)
         {
 #endif
             if(ReferenceEquals(body, null)) throw new ArgumentNullException(nameof(body));
@@ -89,7 +102,7 @@ namespace Marechai.App.Dumps
                 { "400", global::Marechai.App.Models.ProblemDetails.CreateFromDiscriminatorValue },
                 { "401", global::Marechai.App.Models.ProblemDetails.CreateFromDiscriminatorValue },
             };
-            return await RequestAdapter.SendAsync<UntypedNode>(requestInfo, UntypedNode.CreateFromDiscriminatorValue, errorMapping, cancellationToken).ConfigureAwait(false);
+            return await RequestAdapter.SendPrimitiveAsync<int?>(requestInfo, errorMapping, cancellationToken).ConfigureAwait(false);
         }
         /// <returns>A <see cref="RequestInformation"/></returns>
         /// <param name="requestConfiguration">Configuration for the request such as headers, query parameters, and middleware options.</param>
diff --git a/Marechai.App/Services/Client/Gpus/GpusRequestBuilder.cs b/Marechai.App/Services/Client/Gpus/GpusRequestBuilder.cs
index 9bfcda21..8c46f58b 100644
--- a/Marechai.App/Services/Client/Gpus/GpusRequestBuilder.cs
+++ b/Marechai.App/Services/Client/Gpus/GpusRequestBuilder.cs
@@ -80,7 +80,7 @@ namespace Marechai.App.Gpus
             var collectionResult = await RequestAdapter.SendCollectionAsync<global::Marechai.App.Models.GpuDto>(requestInfo, global::Marechai.App.Models.GpuDto.CreateFromDiscriminatorValue, errorMapping, cancellationToken).ConfigureAwait(false);
             return collectionResult?.AsList();
         }
-        /// <returns>A <see cref="UntypedNode"/></returns>
+        /// <returns>A <see cref="long"/></returns>
         /// <param name="body">The request body</param>
         /// <param name="cancellationToken">Cancellation token to use when cancelling requests</param>
         /// <param name="requestConfiguration">Configuration for the request such as headers, query parameters, and middleware options.</param>
@@ -88,11 +88,11 @@ namespace Marechai.App.Gpus
         /// <exception cref="global::Marechai.App.Models.ProblemDetails">When receiving a 401 status code</exception>
 #if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
 #nullable enable
-        public async Task<UntypedNode?> PostAsync(global::Marechai.App.Models.GpuDto body, Action<RequestConfiguration<DefaultQueryParameters>>? requestConfiguration = default, CancellationToken cancellationToken = default)
+        public async Task<long?> PostAsync(global::Marechai.App.Models.GpuDto body, Action<RequestConfiguration<DefaultQueryParameters>>? requestConfiguration = default, CancellationToken cancellationToken = default)
         {
 #nullable restore
 #else
-        public async Task<UntypedNode> PostAsync(global::Marechai.App.Models.GpuDto body, Action<RequestConfiguration<DefaultQueryParameters>> requestConfiguration = default, CancellationToken cancellationToken = default)
+        public async Task<long?> PostAsync(global::Marechai.App.Models.GpuDto body, Action<RequestConfiguration<DefaultQueryParameters>> requestConfiguration = default, CancellationToken cancellationToken = default)
         {
 #endif
             if(ReferenceEquals(body, null)) throw new ArgumentNullException(nameof(body));
@@ -102,7 +102,7 @@ namespace Marechai.App.Gpus
                 { "400", global::Marechai.App.Models.ProblemDetails.CreateFromDiscriminatorValue },
                 { "401", global::Marechai.App.Models.ProblemDetails.CreateFromDiscriminatorValue },
             };
-            return await RequestAdapter.SendAsync<UntypedNode>(requestInfo, UntypedNode.CreateFromDiscriminatorValue, errorMapping, cancellationToken).ConfigureAwait(false);
+            return await RequestAdapter.SendPrimitiveAsync<long?>(requestInfo, errorMapping, cancellationToken).ConfigureAwait(false);
         }
         /// <returns>A <see cref="RequestInformation"/></returns>
         /// <param name="requestConfiguration">Configuration for the request such as headers, query parameters, and middleware options.</param>
diff --git a/Marechai.App/Services/Client/InstructionSetExtensions/InstructionSetExtensionsRequestBuilder.cs b/Marechai.App/Services/Client/InstructionSetExtensions/InstructionSetExtensionsRequestBuilder.cs
index ab86014f..315f6f82 100644
--- a/Marechai.App/Services/Client/InstructionSetExtensions/InstructionSetExtensionsRequestBuilder.cs
+++ b/Marechai.App/Services/Client/InstructionSetExtensions/InstructionSetExtensionsRequestBuilder.cs
@@ -86,7 +86,7 @@ namespace Marechai.App.InstructionSetExtensions
             var collectionResult = await RequestAdapter.SendCollectionAsync<global::Marechai.App.Models.InstructionSetExtensionDto>(requestInfo, global::Marechai.App.Models.InstructionSetExtensionDto.CreateFromDiscriminatorValue, errorMapping, cancellationToken).ConfigureAwait(false);
             return collectionResult?.AsList();
         }
-        /// <returns>A <see cref="UntypedNode"/></returns>
+        /// <returns>A <see cref="int"/></returns>
         /// <param name="body">The request body</param>
         /// <param name="cancellationToken">Cancellation token to use when cancelling requests</param>
         /// <param name="requestConfiguration">Configuration for the request such as headers, query parameters, and middleware options.</param>
@@ -94,11 +94,11 @@ namespace Marechai.App.InstructionSetExtensions
         /// <exception cref="global::Marechai.App.Models.ProblemDetails">When receiving a 401 status code</exception>
 #if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
 #nullable enable
-        public async Task<UntypedNode?> PostAsync(global::Marechai.App.Models.InstructionSetExtensionDto body, Action<RequestConfiguration<DefaultQueryParameters>>? requestConfiguration = default, CancellationToken cancellationToken = default)
+        public async Task<int?> PostAsync(global::Marechai.App.Models.InstructionSetExtensionDto body, Action<RequestConfiguration<DefaultQueryParameters>>? requestConfiguration = default, CancellationToken cancellationToken = default)
         {
 #nullable restore
 #else
-        public async Task<UntypedNode> PostAsync(global::Marechai.App.Models.InstructionSetExtensionDto body, Action<RequestConfiguration<DefaultQueryParameters>> requestConfiguration = default, CancellationToken cancellationToken = default)
+        public async Task<int?> PostAsync(global::Marechai.App.Models.InstructionSetExtensionDto body, Action<RequestConfiguration<DefaultQueryParameters>> requestConfiguration = default, CancellationToken cancellationToken = default)
         {
 #endif
             if(ReferenceEquals(body, null)) throw new ArgumentNullException(nameof(body));
@@ -108,7 +108,7 @@ namespace Marechai.App.InstructionSetExtensions
                 { "400", global::Marechai.App.Models.ProblemDetails.CreateFromDiscriminatorValue },
                 { "401", global::Marechai.App.Models.ProblemDetails.CreateFromDiscriminatorValue },
             };
-            return await RequestAdapter.SendAsync<UntypedNode>(requestInfo, UntypedNode.CreateFromDiscriminatorValue, errorMapping, cancellationToken).ConfigureAwait(false);
+            return await RequestAdapter.SendPrimitiveAsync<int?>(requestInfo, errorMapping, cancellationToken).ConfigureAwait(false);
         }
         /// <returns>A <see cref="RequestInformation"/></returns>
         /// <param name="requestConfiguration">Configuration for the request such as headers, query parameters, and middleware options.</param>
diff --git a/Marechai.App/Services/Client/InstructionSetExtensionsByProcessor/InstructionSetExtensionsByProcessorRequestBuilder.cs b/Marechai.App/Services/Client/InstructionSetExtensionsByProcessor/InstructionSetExtensionsByProcessorRequestBuilder.cs
index e00bf3c9..b135ba2b 100644
--- a/Marechai.App/Services/Client/InstructionSetExtensionsByProcessor/InstructionSetExtensionsByProcessorRequestBuilder.cs
+++ b/Marechai.App/Services/Client/InstructionSetExtensionsByProcessor/InstructionSetExtensionsByProcessorRequestBuilder.cs
@@ -59,7 +59,7 @@ namespace Marechai.App.InstructionSetExtensionsByProcessor
         public InstructionSetExtensionsByProcessorRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) : base(requestAdapter, "{+baseurl}/instruction-set-extensions-by-processor", rawUrl)
         {
         }
-        /// <returns>A <see cref="UntypedNode"/></returns>
+        /// <returns>A <see cref="long"/></returns>
         /// <param name="body">The request body</param>
         /// <param name="cancellationToken">Cancellation token to use when cancelling requests</param>
         /// <param name="requestConfiguration">Configuration for the request such as headers, query parameters, and middleware options.</param>
@@ -67,11 +67,11 @@ namespace Marechai.App.InstructionSetExtensionsByProcessor
         /// <exception cref="global::Marechai.App.Models.ProblemDetails">When receiving a 401 status code</exception>
 #if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
 #nullable enable
-        public async Task<UntypedNode?> PostAsync(global::Marechai.App.Models.InstructionSetExtensionByProcessorDto body, Action<RequestConfiguration<DefaultQueryParameters>>? requestConfiguration = default, CancellationToken cancellationToken = default)
+        public async Task<long?> PostAsync(global::Marechai.App.Models.InstructionSetExtensionByProcessorDto body, Action<RequestConfiguration<DefaultQueryParameters>>? requestConfiguration = default, CancellationToken cancellationToken = default)
         {
 #nullable restore
 #else
-        public async Task<UntypedNode> PostAsync(global::Marechai.App.Models.InstructionSetExtensionByProcessorDto body, Action<RequestConfiguration<DefaultQueryParameters>> requestConfiguration = default, CancellationToken cancellationToken = default)
+        public async Task<long?> PostAsync(global::Marechai.App.Models.InstructionSetExtensionByProcessorDto body, Action<RequestConfiguration<DefaultQueryParameters>> requestConfiguration = default, CancellationToken cancellationToken = default)
         {
 #endif
             if(ReferenceEquals(body, null)) throw new ArgumentNullException(nameof(body));
@@ -81,7 +81,7 @@ namespace Marechai.App.InstructionSetExtensionsByProcessor
                 { "400", global::Marechai.App.Models.ProblemDetails.CreateFromDiscriminatorValue },
                 { "401", global::Marechai.App.Models.ProblemDetails.CreateFromDiscriminatorValue },
             };
-            return await RequestAdapter.SendAsync<UntypedNode>(requestInfo, UntypedNode.CreateFromDiscriminatorValue, errorMapping, cancellationToken).ConfigureAwait(false);
+            return await RequestAdapter.SendPrimitiveAsync<long?>(requestInfo, errorMapping, cancellationToken).ConfigureAwait(false);
         }
         /// <returns>A <see cref="RequestInformation"/></returns>
         /// <param name="body">The request body</param>
diff --git a/Marechai.App/Services/Client/InstructionSets/InstructionSetsRequestBuilder.cs b/Marechai.App/Services/Client/InstructionSets/InstructionSetsRequestBuilder.cs
index 3928073d..2cb80073 100644
--- a/Marechai.App/Services/Client/InstructionSets/InstructionSetsRequestBuilder.cs
+++ b/Marechai.App/Services/Client/InstructionSets/InstructionSetsRequestBuilder.cs
@@ -86,7 +86,7 @@ namespace Marechai.App.InstructionSets
             var collectionResult = await RequestAdapter.SendCollectionAsync<global::Marechai.App.Models.InstructionSetDto>(requestInfo, global::Marechai.App.Models.InstructionSetDto.CreateFromDiscriminatorValue, errorMapping, cancellationToken).ConfigureAwait(false);
             return collectionResult?.AsList();
         }
-        /// <returns>A <see cref="UntypedNode"/></returns>
+        /// <returns>A <see cref="int"/></returns>
         /// <param name="body">The request body</param>
         /// <param name="cancellationToken">Cancellation token to use when cancelling requests</param>
         /// <param name="requestConfiguration">Configuration for the request such as headers, query parameters, and middleware options.</param>
@@ -94,11 +94,11 @@ namespace Marechai.App.InstructionSets
         /// <exception cref="global::Marechai.App.Models.ProblemDetails">When receiving a 401 status code</exception>
 #if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
 #nullable enable
-        public async Task<UntypedNode?> PostAsync(global::Marechai.App.Models.InstructionSetDto body, Action<RequestConfiguration<DefaultQueryParameters>>? requestConfiguration = default, CancellationToken cancellationToken = default)
+        public async Task<int?> PostAsync(global::Marechai.App.Models.InstructionSetDto body, Action<RequestConfiguration<DefaultQueryParameters>>? requestConfiguration = default, CancellationToken cancellationToken = default)
         {
 #nullable restore
 #else
-        public async Task<UntypedNode> PostAsync(global::Marechai.App.Models.InstructionSetDto body, Action<RequestConfiguration<DefaultQueryParameters>> requestConfiguration = default, CancellationToken cancellationToken = default)
+        public async Task<int?> PostAsync(global::Marechai.App.Models.InstructionSetDto body, Action<RequestConfiguration<DefaultQueryParameters>> requestConfiguration = default, CancellationToken cancellationToken = default)
         {
 #endif
             if(ReferenceEquals(body, null)) throw new ArgumentNullException(nameof(body));
@@ -108,7 +108,7 @@ namespace Marechai.App.InstructionSets
                 { "400", global::Marechai.App.Models.ProblemDetails.CreateFromDiscriminatorValue },
                 { "401", global::Marechai.App.Models.ProblemDetails.CreateFromDiscriminatorValue },
             };
-            return await RequestAdapter.SendAsync<UntypedNode>(requestInfo, UntypedNode.CreateFromDiscriminatorValue, errorMapping, cancellationToken).ConfigureAwait(false);
+            return await RequestAdapter.SendPrimitiveAsync<int?>(requestInfo, errorMapping, cancellationToken).ConfigureAwait(false);
         }
         /// <returns>A <see cref="RequestInformation"/></returns>
         /// <param name="requestConfiguration">Configuration for the request such as headers, query parameters, and middleware options.</param>
diff --git a/Marechai.App/Services/Client/Licenses/LicensesRequestBuilder.cs b/Marechai.App/Services/Client/Licenses/LicensesRequestBuilder.cs
index 302faf59..4bdff32e 100644
--- a/Marechai.App/Services/Client/Licenses/LicensesRequestBuilder.cs
+++ b/Marechai.App/Services/Client/Licenses/LicensesRequestBuilder.cs
@@ -80,7 +80,7 @@ namespace Marechai.App.Licenses
             var collectionResult = await RequestAdapter.SendCollectionAsync<global::Marechai.App.Models.LicenseDto>(requestInfo, global::Marechai.App.Models.LicenseDto.CreateFromDiscriminatorValue, errorMapping, cancellationToken).ConfigureAwait(false);
             return collectionResult?.AsList();
         }
-        /// <returns>A <see cref="UntypedNode"/></returns>
+        /// <returns>A <see cref="int"/></returns>
         /// <param name="body">The request body</param>
         /// <param name="cancellationToken">Cancellation token to use when cancelling requests</param>
         /// <param name="requestConfiguration">Configuration for the request such as headers, query parameters, and middleware options.</param>
@@ -88,11 +88,11 @@ namespace Marechai.App.Licenses
         /// <exception cref="global::Marechai.App.Models.ProblemDetails">When receiving a 401 status code</exception>
 #if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
 #nullable enable
-        public async Task<UntypedNode?> PostAsync(global::Marechai.App.Models.LicenseDto body, Action<RequestConfiguration<DefaultQueryParameters>>? requestConfiguration = default, CancellationToken cancellationToken = default)
+        public async Task<int?> PostAsync(global::Marechai.App.Models.LicenseDto body, Action<RequestConfiguration<DefaultQueryParameters>>? requestConfiguration = default, CancellationToken cancellationToken = default)
         {
 #nullable restore
 #else
-        public async Task<UntypedNode> PostAsync(global::Marechai.App.Models.LicenseDto body, Action<RequestConfiguration<DefaultQueryParameters>> requestConfiguration = default, CancellationToken cancellationToken = default)
+        public async Task<int?> PostAsync(global::Marechai.App.Models.LicenseDto body, Action<RequestConfiguration<DefaultQueryParameters>> requestConfiguration = default, CancellationToken cancellationToken = default)
         {
 #endif
             if(ReferenceEquals(body, null)) throw new ArgumentNullException(nameof(body));
@@ -102,7 +102,7 @@ namespace Marechai.App.Licenses
                 { "400", global::Marechai.App.Models.ProblemDetails.CreateFromDiscriminatorValue },
                 { "401", global::Marechai.App.Models.ProblemDetails.CreateFromDiscriminatorValue },
             };
-            return await RequestAdapter.SendAsync<UntypedNode>(requestInfo, UntypedNode.CreateFromDiscriminatorValue, errorMapping, cancellationToken).ConfigureAwait(false);
+            return await RequestAdapter.SendPrimitiveAsync<int?>(requestInfo, errorMapping, cancellationToken).ConfigureAwait(false);
         }
         /// <returns>A <see cref="RequestInformation"/></returns>
         /// <param name="requestConfiguration">Configuration for the request such as headers, query parameters, and middleware options.</param>
diff --git a/Marechai.App/Services/Client/MachineFamilies/Books/BooksRequestBuilder.cs b/Marechai.App/Services/Client/MachineFamilies/Books/BooksRequestBuilder.cs
index e409cd99..e31165ea 100644
--- a/Marechai.App/Services/Client/MachineFamilies/Books/BooksRequestBuilder.cs
+++ b/Marechai.App/Services/Client/MachineFamilies/Books/BooksRequestBuilder.cs
@@ -59,7 +59,7 @@ namespace Marechai.App.MachineFamilies.Books
         public BooksRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) : base(requestAdapter, "{+baseurl}/machine-families/books", rawUrl)
         {
         }
-        /// <returns>A <see cref="UntypedNode"/></returns>
+        /// <returns>A <see cref="int"/></returns>
         /// <param name="body">The request body</param>
         /// <param name="cancellationToken">Cancellation token to use when cancelling requests</param>
         /// <param name="requestConfiguration">Configuration for the request such as headers, query parameters, and middleware options.</param>
@@ -67,11 +67,11 @@ namespace Marechai.App.MachineFamilies.Books
         /// <exception cref="global::Marechai.App.Models.ProblemDetails">When receiving a 401 status code</exception>
 #if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
 #nullable enable
-        public async Task<UntypedNode?> PostAsync(global::Marechai.App.Models.BookByMachineFamilyDto body, Action<RequestConfiguration<DefaultQueryParameters>>? requestConfiguration = default, CancellationToken cancellationToken = default)
+        public async Task<int?> PostAsync(global::Marechai.App.Models.BookByMachineFamilyDto body, Action<RequestConfiguration<DefaultQueryParameters>>? requestConfiguration = default, CancellationToken cancellationToken = default)
         {
 #nullable restore
 #else
-        public async Task<UntypedNode> PostAsync(global::Marechai.App.Models.BookByMachineFamilyDto body, Action<RequestConfiguration<DefaultQueryParameters>> requestConfiguration = default, CancellationToken cancellationToken = default)
+        public async Task<int?> PostAsync(global::Marechai.App.Models.BookByMachineFamilyDto body, Action<RequestConfiguration<DefaultQueryParameters>> requestConfiguration = default, CancellationToken cancellationToken = default)
         {
 #endif
             if(ReferenceEquals(body, null)) throw new ArgumentNullException(nameof(body));
@@ -81,7 +81,7 @@ namespace Marechai.App.MachineFamilies.Books
                 { "400", global::Marechai.App.Models.ProblemDetails.CreateFromDiscriminatorValue },
                 { "401", global::Marechai.App.Models.ProblemDetails.CreateFromDiscriminatorValue },
             };
-            return await RequestAdapter.SendAsync<UntypedNode>(requestInfo, UntypedNode.CreateFromDiscriminatorValue, errorMapping, cancellationToken).ConfigureAwait(false);
+            return await RequestAdapter.SendPrimitiveAsync<int?>(requestInfo, errorMapping, cancellationToken).ConfigureAwait(false);
         }
         /// <returns>A <see cref="RequestInformation"/></returns>
         /// <param name="body">The request body</param>
diff --git a/Marechai.App/Services/Client/MachineFamilies/Documents/DocumentsRequestBuilder.cs b/Marechai.App/Services/Client/MachineFamilies/Documents/DocumentsRequestBuilder.cs
index 94f95056..982963d1 100644
--- a/Marechai.App/Services/Client/MachineFamilies/Documents/DocumentsRequestBuilder.cs
+++ b/Marechai.App/Services/Client/MachineFamilies/Documents/DocumentsRequestBuilder.cs
@@ -59,7 +59,7 @@ namespace Marechai.App.MachineFamilies.Documents
         public DocumentsRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) : base(requestAdapter, "{+baseurl}/machine-families/documents", rawUrl)
         {
         }
-        /// <returns>A <see cref="UntypedNode"/></returns>
+        /// <returns>A <see cref="long"/></returns>
         /// <param name="body">The request body</param>
         /// <param name="cancellationToken">Cancellation token to use when cancelling requests</param>
         /// <param name="requestConfiguration">Configuration for the request such as headers, query parameters, and middleware options.</param>
@@ -67,11 +67,11 @@ namespace Marechai.App.MachineFamilies.Documents
         /// <exception cref="global::Marechai.App.Models.ProblemDetails">When receiving a 401 status code</exception>
 #if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
 #nullable enable
-        public async Task<UntypedNode?> PostAsync(global::Marechai.App.Models.DocumentByMachineFamilyDto body, Action<RequestConfiguration<DefaultQueryParameters>>? requestConfiguration = default, CancellationToken cancellationToken = default)
+        public async Task<long?> PostAsync(global::Marechai.App.Models.DocumentByMachineFamilyDto body, Action<RequestConfiguration<DefaultQueryParameters>>? requestConfiguration = default, CancellationToken cancellationToken = default)
         {
 #nullable restore
 #else
-        public async Task<UntypedNode> PostAsync(global::Marechai.App.Models.DocumentByMachineFamilyDto body, Action<RequestConfiguration<DefaultQueryParameters>> requestConfiguration = default, CancellationToken cancellationToken = default)
+        public async Task<long?> PostAsync(global::Marechai.App.Models.DocumentByMachineFamilyDto body, Action<RequestConfiguration<DefaultQueryParameters>> requestConfiguration = default, CancellationToken cancellationToken = default)
         {
 #endif
             if(ReferenceEquals(body, null)) throw new ArgumentNullException(nameof(body));
@@ -81,7 +81,7 @@ namespace Marechai.App.MachineFamilies.Documents
                 { "400", global::Marechai.App.Models.ProblemDetails.CreateFromDiscriminatorValue },
                 { "401", global::Marechai.App.Models.ProblemDetails.CreateFromDiscriminatorValue },
             };
-            return await RequestAdapter.SendAsync<UntypedNode>(requestInfo, UntypedNode.CreateFromDiscriminatorValue, errorMapping, cancellationToken).ConfigureAwait(false);
+            return await RequestAdapter.SendPrimitiveAsync<long?>(requestInfo, errorMapping, cancellationToken).ConfigureAwait(false);
         }
         /// <returns>A <see cref="RequestInformation"/></returns>
         /// <param name="body">The request body</param>
diff --git a/Marechai.App/Services/Client/MachineFamilies/MachineFamiliesRequestBuilder.cs b/Marechai.App/Services/Client/MachineFamilies/MachineFamiliesRequestBuilder.cs
index abc3f6f5..abdc78d2 100644
--- a/Marechai.App/Services/Client/MachineFamilies/MachineFamiliesRequestBuilder.cs
+++ b/Marechai.App/Services/Client/MachineFamilies/MachineFamiliesRequestBuilder.cs
@@ -92,7 +92,7 @@ namespace Marechai.App.MachineFamilies
             var collectionResult = await RequestAdapter.SendCollectionAsync<global::Marechai.App.Models.MachineFamilyDto>(requestInfo, global::Marechai.App.Models.MachineFamilyDto.CreateFromDiscriminatorValue, errorMapping, cancellationToken).ConfigureAwait(false);
             return collectionResult?.AsList();
         }
-        /// <returns>A <see cref="UntypedNode"/></returns>
+        /// <returns>A <see cref="long"/></returns>
         /// <param name="body">The request body</param>
         /// <param name="cancellationToken">Cancellation token to use when cancelling requests</param>
         /// <param name="requestConfiguration">Configuration for the request such as headers, query parameters, and middleware options.</param>
@@ -100,11 +100,11 @@ namespace Marechai.App.MachineFamilies
         /// <exception cref="global::Marechai.App.Models.ProblemDetails">When receiving a 401 status code</exception>
 #if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
 #nullable enable
-        public async Task<UntypedNode?> PostAsync(global::Marechai.App.Models.MachineFamilyDto body, Action<RequestConfiguration<DefaultQueryParameters>>? requestConfiguration = default, CancellationToken cancellationToken = default)
+        public async Task<long?> PostAsync(global::Marechai.App.Models.MachineFamilyDto body, Action<RequestConfiguration<DefaultQueryParameters>>? requestConfiguration = default, CancellationToken cancellationToken = default)
         {
 #nullable restore
 #else
-        public async Task<UntypedNode> PostAsync(global::Marechai.App.Models.MachineFamilyDto body, Action<RequestConfiguration<DefaultQueryParameters>> requestConfiguration = default, CancellationToken cancellationToken = default)
+        public async Task<long?> PostAsync(global::Marechai.App.Models.MachineFamilyDto body, Action<RequestConfiguration<DefaultQueryParameters>> requestConfiguration = default, CancellationToken cancellationToken = default)
         {
 #endif
             if(ReferenceEquals(body, null)) throw new ArgumentNullException(nameof(body));
@@ -114,7 +114,7 @@ namespace Marechai.App.MachineFamilies
                 { "400", global::Marechai.App.Models.ProblemDetails.CreateFromDiscriminatorValue },
                 { "401", global::Marechai.App.Models.ProblemDetails.CreateFromDiscriminatorValue },
             };
-            return await RequestAdapter.SendAsync<UntypedNode>(requestInfo, UntypedNode.CreateFromDiscriminatorValue, errorMapping, cancellationToken).ConfigureAwait(false);
+            return await RequestAdapter.SendPrimitiveAsync<long?>(requestInfo, errorMapping, cancellationToken).ConfigureAwait(false);
         }
         /// <returns>A <see cref="RequestInformation"/></returns>
         /// <param name="requestConfiguration">Configuration for the request such as headers, query parameters, and middleware options.</param>
diff --git a/Marechai.App/Services/Client/Machines/Books/BooksRequestBuilder.cs b/Marechai.App/Services/Client/Machines/Books/BooksRequestBuilder.cs
index c9bc1bbd..1b5ee89c 100644
--- a/Marechai.App/Services/Client/Machines/Books/BooksRequestBuilder.cs
+++ b/Marechai.App/Services/Client/Machines/Books/BooksRequestBuilder.cs
@@ -59,7 +59,7 @@ namespace Marechai.App.Machines.Books
         public BooksRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) : base(requestAdapter, "{+baseurl}/machines/books", rawUrl)
         {
         }
-        /// <returns>A <see cref="UntypedNode"/></returns>
+        /// <returns>A <see cref="int"/></returns>
         /// <param name="body">The request body</param>
         /// <param name="cancellationToken">Cancellation token to use when cancelling requests</param>
         /// <param name="requestConfiguration">Configuration for the request such as headers, query parameters, and middleware options.</param>
@@ -67,11 +67,11 @@ namespace Marechai.App.Machines.Books
         /// <exception cref="global::Marechai.App.Models.ProblemDetails">When receiving a 401 status code</exception>
 #if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
 #nullable enable
-        public async Task<UntypedNode?> PostAsync(global::Marechai.App.Models.BookByMachineDto body, Action<RequestConfiguration<DefaultQueryParameters>>? requestConfiguration = default, CancellationToken cancellationToken = default)
+        public async Task<int?> PostAsync(global::Marechai.App.Models.BookByMachineDto body, Action<RequestConfiguration<DefaultQueryParameters>>? requestConfiguration = default, CancellationToken cancellationToken = default)
         {
 #nullable restore
 #else
-        public async Task<UntypedNode> PostAsync(global::Marechai.App.Models.BookByMachineDto body, Action<RequestConfiguration<DefaultQueryParameters>> requestConfiguration = default, CancellationToken cancellationToken = default)
+        public async Task<int?> PostAsync(global::Marechai.App.Models.BookByMachineDto body, Action<RequestConfiguration<DefaultQueryParameters>> requestConfiguration = default, CancellationToken cancellationToken = default)
         {
 #endif
             if(ReferenceEquals(body, null)) throw new ArgumentNullException(nameof(body));
@@ -81,7 +81,7 @@ namespace Marechai.App.Machines.Books
                 { "400", global::Marechai.App.Models.ProblemDetails.CreateFromDiscriminatorValue },
                 { "401", global::Marechai.App.Models.ProblemDetails.CreateFromDiscriminatorValue },
             };
-            return await RequestAdapter.SendAsync<UntypedNode>(requestInfo, UntypedNode.CreateFromDiscriminatorValue, errorMapping, cancellationToken).ConfigureAwait(false);
+            return await RequestAdapter.SendPrimitiveAsync<int?>(requestInfo, errorMapping, cancellationToken).ConfigureAwait(false);
         }
         /// <returns>A <see cref="RequestInformation"/></returns>
         /// <param name="body">The request body</param>
diff --git a/Marechai.App/Services/Client/Machines/Documents/DocumentsRequestBuilder.cs b/Marechai.App/Services/Client/Machines/Documents/DocumentsRequestBuilder.cs
index 6ed8c90e..307d7199 100644
--- a/Marechai.App/Services/Client/Machines/Documents/DocumentsRequestBuilder.cs
+++ b/Marechai.App/Services/Client/Machines/Documents/DocumentsRequestBuilder.cs
@@ -59,7 +59,7 @@ namespace Marechai.App.Machines.Documents
         public DocumentsRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) : base(requestAdapter, "{+baseurl}/machines/documents", rawUrl)
         {
         }
-        /// <returns>A <see cref="UntypedNode"/></returns>
+        /// <returns>A <see cref="long"/></returns>
         /// <param name="body">The request body</param>
         /// <param name="cancellationToken">Cancellation token to use when cancelling requests</param>
         /// <param name="requestConfiguration">Configuration for the request such as headers, query parameters, and middleware options.</param>
@@ -67,11 +67,11 @@ namespace Marechai.App.Machines.Documents
         /// <exception cref="global::Marechai.App.Models.ProblemDetails">When receiving a 401 status code</exception>
 #if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
 #nullable enable
-        public async Task<UntypedNode?> PostAsync(global::Marechai.App.Models.DocumentByMachineDto body, Action<RequestConfiguration<DefaultQueryParameters>>? requestConfiguration = default, CancellationToken cancellationToken = default)
+        public async Task<long?> PostAsync(global::Marechai.App.Models.DocumentByMachineDto body, Action<RequestConfiguration<DefaultQueryParameters>>? requestConfiguration = default, CancellationToken cancellationToken = default)
         {
 #nullable restore
 #else
-        public async Task<UntypedNode> PostAsync(global::Marechai.App.Models.DocumentByMachineDto body, Action<RequestConfiguration<DefaultQueryParameters>> requestConfiguration = default, CancellationToken cancellationToken = default)
+        public async Task<long?> PostAsync(global::Marechai.App.Models.DocumentByMachineDto body, Action<RequestConfiguration<DefaultQueryParameters>> requestConfiguration = default, CancellationToken cancellationToken = default)
         {
 #endif
             if(ReferenceEquals(body, null)) throw new ArgumentNullException(nameof(body));
@@ -81,7 +81,7 @@ namespace Marechai.App.Machines.Documents
                 { "400", global::Marechai.App.Models.ProblemDetails.CreateFromDiscriminatorValue },
                 { "401", global::Marechai.App.Models.ProblemDetails.CreateFromDiscriminatorValue },
             };
-            return await RequestAdapter.SendAsync<UntypedNode>(requestInfo, UntypedNode.CreateFromDiscriminatorValue, errorMapping, cancellationToken).ConfigureAwait(false);
+            return await RequestAdapter.SendPrimitiveAsync<long?>(requestInfo, errorMapping, cancellationToken).ConfigureAwait(false);
         }
         /// <returns>A <see cref="RequestInformation"/></returns>
         /// <param name="body">The request body</param>
diff --git a/Marechai.App/Services/Client/Machines/Gpus/GpusRequestBuilder.cs b/Marechai.App/Services/Client/Machines/Gpus/GpusRequestBuilder.cs
index e59c5cc2..b06587c0 100644
--- a/Marechai.App/Services/Client/Machines/Gpus/GpusRequestBuilder.cs
+++ b/Marechai.App/Services/Client/Machines/Gpus/GpusRequestBuilder.cs
@@ -65,7 +65,7 @@ namespace Marechai.App.Machines.Gpus
         public GpusRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) : base(requestAdapter, "{+baseurl}/machines/gpus", rawUrl)
         {
         }
-        /// <returns>A <see cref="UntypedNode"/></returns>
+        /// <returns>A <see cref="long"/></returns>
         /// <param name="body">The request body</param>
         /// <param name="cancellationToken">Cancellation token to use when cancelling requests</param>
         /// <param name="requestConfiguration">Configuration for the request such as headers, query parameters, and middleware options.</param>
@@ -73,11 +73,11 @@ namespace Marechai.App.Machines.Gpus
         /// <exception cref="global::Marechai.App.Models.ProblemDetails">When receiving a 401 status code</exception>
 #if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
 #nullable enable
-        public async Task<UntypedNode?> PostAsync(global::Marechai.App.Models.GpuByMachineDto body, Action<RequestConfiguration<DefaultQueryParameters>>? requestConfiguration = default, CancellationToken cancellationToken = default)
+        public async Task<long?> PostAsync(global::Marechai.App.Models.GpuByMachineDto body, Action<RequestConfiguration<DefaultQueryParameters>>? requestConfiguration = default, CancellationToken cancellationToken = default)
         {
 #nullable restore
 #else
-        public async Task<UntypedNode> PostAsync(global::Marechai.App.Models.GpuByMachineDto body, Action<RequestConfiguration<DefaultQueryParameters>> requestConfiguration = default, CancellationToken cancellationToken = default)
+        public async Task<long?> PostAsync(global::Marechai.App.Models.GpuByMachineDto body, Action<RequestConfiguration<DefaultQueryParameters>> requestConfiguration = default, CancellationToken cancellationToken = default)
         {
 #endif
             if(ReferenceEquals(body, null)) throw new ArgumentNullException(nameof(body));
@@ -87,7 +87,7 @@ namespace Marechai.App.Machines.Gpus
                 { "400", global::Marechai.App.Models.ProblemDetails.CreateFromDiscriminatorValue },
                 { "401", global::Marechai.App.Models.ProblemDetails.CreateFromDiscriminatorValue },
             };
-            return await RequestAdapter.SendAsync<UntypedNode>(requestInfo, UntypedNode.CreateFromDiscriminatorValue, errorMapping, cancellationToken).ConfigureAwait(false);
+            return await RequestAdapter.SendPrimitiveAsync<long?>(requestInfo, errorMapping, cancellationToken).ConfigureAwait(false);
         }
         /// <returns>A <see cref="RequestInformation"/></returns>
         /// <param name="body">The request body</param>
diff --git a/Marechai.App/Services/Client/Machines/MachinesRequestBuilder.cs b/Marechai.App/Services/Client/Machines/MachinesRequestBuilder.cs
index 3d194911..562a0c86 100644
--- a/Marechai.App/Services/Client/Machines/MachinesRequestBuilder.cs
+++ b/Marechai.App/Services/Client/Machines/MachinesRequestBuilder.cs
@@ -104,7 +104,7 @@ namespace Marechai.App.Machines
             var collectionResult = await RequestAdapter.SendCollectionAsync<global::Marechai.App.Models.MachineDto>(requestInfo, global::Marechai.App.Models.MachineDto.CreateFromDiscriminatorValue, errorMapping, cancellationToken).ConfigureAwait(false);
             return collectionResult?.AsList();
         }
-        /// <returns>A <see cref="UntypedNode"/></returns>
+        /// <returns>A <see cref="long"/></returns>
         /// <param name="body">The request body</param>
         /// <param name="cancellationToken">Cancellation token to use when cancelling requests</param>
         /// <param name="requestConfiguration">Configuration for the request such as headers, query parameters, and middleware options.</param>
@@ -112,11 +112,11 @@ namespace Marechai.App.Machines
         /// <exception cref="global::Marechai.App.Models.ProblemDetails">When receiving a 401 status code</exception>
 #if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
 #nullable enable
-        public async Task<UntypedNode?> PostAsync(global::Marechai.App.Models.MachineDto body, Action<RequestConfiguration<DefaultQueryParameters>>? requestConfiguration = default, CancellationToken cancellationToken = default)
+        public async Task<long?> PostAsync(global::Marechai.App.Models.MachineDto body, Action<RequestConfiguration<DefaultQueryParameters>>? requestConfiguration = default, CancellationToken cancellationToken = default)
         {
 #nullable restore
 #else
-        public async Task<UntypedNode> PostAsync(global::Marechai.App.Models.MachineDto body, Action<RequestConfiguration<DefaultQueryParameters>> requestConfiguration = default, CancellationToken cancellationToken = default)
+        public async Task<long?> PostAsync(global::Marechai.App.Models.MachineDto body, Action<RequestConfiguration<DefaultQueryParameters>> requestConfiguration = default, CancellationToken cancellationToken = default)
         {
 #endif
             if(ReferenceEquals(body, null)) throw new ArgumentNullException(nameof(body));
@@ -126,7 +126,7 @@ namespace Marechai.App.Machines
                 { "400", global::Marechai.App.Models.ProblemDetails.CreateFromDiscriminatorValue },
                 { "401", global::Marechai.App.Models.ProblemDetails.CreateFromDiscriminatorValue },
             };
-            return await RequestAdapter.SendAsync<UntypedNode>(requestInfo, UntypedNode.CreateFromDiscriminatorValue, errorMapping, cancellationToken).ConfigureAwait(false);
+            return await RequestAdapter.SendPrimitiveAsync<long?>(requestInfo, errorMapping, cancellationToken).ConfigureAwait(false);
         }
         /// <returns>A <see cref="RequestInformation"/></returns>
         /// <param name="requestConfiguration">Configuration for the request such as headers, query parameters, and middleware options.</param>
diff --git a/Marechai.App/Services/Client/Magazines/Companies/CompaniesRequestBuilder.cs b/Marechai.App/Services/Client/Magazines/Companies/CompaniesRequestBuilder.cs
index d0b20d82..29062ee3 100644
--- a/Marechai.App/Services/Client/Magazines/Companies/CompaniesRequestBuilder.cs
+++ b/Marechai.App/Services/Client/Magazines/Companies/CompaniesRequestBuilder.cs
@@ -59,7 +59,7 @@ namespace Marechai.App.Magazines.Companies
         public CompaniesRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) : base(requestAdapter, "{+baseurl}/magazines/companies", rawUrl)
         {
         }
-        /// <returns>A <see cref="UntypedNode"/></returns>
+        /// <returns>A <see cref="long"/></returns>
         /// <param name="body">The request body</param>
         /// <param name="cancellationToken">Cancellation token to use when cancelling requests</param>
         /// <param name="requestConfiguration">Configuration for the request such as headers, query parameters, and middleware options.</param>
@@ -67,11 +67,11 @@ namespace Marechai.App.Magazines.Companies
         /// <exception cref="global::Marechai.App.Models.ProblemDetails">When receiving a 401 status code</exception>
 #if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
 #nullable enable
-        public async Task<UntypedNode?> PostAsync(global::Marechai.App.Models.CompanyByMagazineDto body, Action<RequestConfiguration<DefaultQueryParameters>>? requestConfiguration = default, CancellationToken cancellationToken = default)
+        public async Task<long?> PostAsync(global::Marechai.App.Models.CompanyByMagazineDto body, Action<RequestConfiguration<DefaultQueryParameters>>? requestConfiguration = default, CancellationToken cancellationToken = default)
         {
 #nullable restore
 #else
-        public async Task<UntypedNode> PostAsync(global::Marechai.App.Models.CompanyByMagazineDto body, Action<RequestConfiguration<DefaultQueryParameters>> requestConfiguration = default, CancellationToken cancellationToken = default)
+        public async Task<long?> PostAsync(global::Marechai.App.Models.CompanyByMagazineDto body, Action<RequestConfiguration<DefaultQueryParameters>> requestConfiguration = default, CancellationToken cancellationToken = default)
         {
 #endif
             if(ReferenceEquals(body, null)) throw new ArgumentNullException(nameof(body));
@@ -81,7 +81,7 @@ namespace Marechai.App.Magazines.Companies
                 { "400", global::Marechai.App.Models.ProblemDetails.CreateFromDiscriminatorValue },
                 { "401", global::Marechai.App.Models.ProblemDetails.CreateFromDiscriminatorValue },
             };
-            return await RequestAdapter.SendAsync<UntypedNode>(requestInfo, UntypedNode.CreateFromDiscriminatorValue, errorMapping, cancellationToken).ConfigureAwait(false);
+            return await RequestAdapter.SendPrimitiveAsync<long?>(requestInfo, errorMapping, cancellationToken).ConfigureAwait(false);
         }
         /// <returns>A <see cref="RequestInformation"/></returns>
         /// <param name="body">The request body</param>
diff --git a/Marechai.App/Services/Client/Magazines/Issues/IssuesRequestBuilder.cs b/Marechai.App/Services/Client/Magazines/Issues/IssuesRequestBuilder.cs
index ac1b0f86..28bc7fd6 100644
--- a/Marechai.App/Services/Client/Magazines/Issues/IssuesRequestBuilder.cs
+++ b/Marechai.App/Services/Client/Magazines/Issues/IssuesRequestBuilder.cs
@@ -80,7 +80,7 @@ namespace Marechai.App.Magazines.Issues
             var collectionResult = await RequestAdapter.SendCollectionAsync<global::Marechai.App.Models.MagazineIssueDto>(requestInfo, global::Marechai.App.Models.MagazineIssueDto.CreateFromDiscriminatorValue, errorMapping, cancellationToken).ConfigureAwait(false);
             return collectionResult?.AsList();
         }
-        /// <returns>A <see cref="UntypedNode"/></returns>
+        /// <returns>A <see cref="long"/></returns>
         /// <param name="body">The request body</param>
         /// <param name="cancellationToken">Cancellation token to use when cancelling requests</param>
         /// <param name="requestConfiguration">Configuration for the request such as headers, query parameters, and middleware options.</param>
@@ -88,11 +88,11 @@ namespace Marechai.App.Magazines.Issues
         /// <exception cref="global::Marechai.App.Models.ProblemDetails">When receiving a 401 status code</exception>
 #if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
 #nullable enable
-        public async Task<UntypedNode?> PostAsync(global::Marechai.App.Models.MagazineIssueDto body, Action<RequestConfiguration<DefaultQueryParameters>>? requestConfiguration = default, CancellationToken cancellationToken = default)
+        public async Task<long?> PostAsync(global::Marechai.App.Models.MagazineIssueDto body, Action<RequestConfiguration<DefaultQueryParameters>>? requestConfiguration = default, CancellationToken cancellationToken = default)
         {
 #nullable restore
 #else
-        public async Task<UntypedNode> PostAsync(global::Marechai.App.Models.MagazineIssueDto body, Action<RequestConfiguration<DefaultQueryParameters>> requestConfiguration = default, CancellationToken cancellationToken = default)
+        public async Task<long?> PostAsync(global::Marechai.App.Models.MagazineIssueDto body, Action<RequestConfiguration<DefaultQueryParameters>> requestConfiguration = default, CancellationToken cancellationToken = default)
         {
 #endif
             if(ReferenceEquals(body, null)) throw new ArgumentNullException(nameof(body));
@@ -102,7 +102,7 @@ namespace Marechai.App.Magazines.Issues
                 { "400", global::Marechai.App.Models.ProblemDetails.CreateFromDiscriminatorValue },
                 { "401", global::Marechai.App.Models.ProblemDetails.CreateFromDiscriminatorValue },
             };
-            return await RequestAdapter.SendAsync<UntypedNode>(requestInfo, UntypedNode.CreateFromDiscriminatorValue, errorMapping, cancellationToken).ConfigureAwait(false);
+            return await RequestAdapter.SendPrimitiveAsync<long?>(requestInfo, errorMapping, cancellationToken).ConfigureAwait(false);
         }
         /// <returns>A <see cref="RequestInformation"/></returns>
         /// <param name="requestConfiguration">Configuration for the request such as headers, query parameters, and middleware options.</param>
diff --git a/Marechai.App/Services/Client/Magazines/MagazinesRequestBuilder.cs b/Marechai.App/Services/Client/Magazines/MagazinesRequestBuilder.cs
index 42d82d42..bdff9685 100644
--- a/Marechai.App/Services/Client/Magazines/MagazinesRequestBuilder.cs
+++ b/Marechai.App/Services/Client/Magazines/MagazinesRequestBuilder.cs
@@ -104,7 +104,7 @@ namespace Marechai.App.Magazines
             var collectionResult = await RequestAdapter.SendCollectionAsync<global::Marechai.App.Models.MagazineDto>(requestInfo, global::Marechai.App.Models.MagazineDto.CreateFromDiscriminatorValue, errorMapping, cancellationToken).ConfigureAwait(false);
             return collectionResult?.AsList();
         }
-        /// <returns>A <see cref="UntypedNode"/></returns>
+        /// <returns>A <see cref="long"/></returns>
         /// <param name="body">The request body</param>
         /// <param name="cancellationToken">Cancellation token to use when cancelling requests</param>
         /// <param name="requestConfiguration">Configuration for the request such as headers, query parameters, and middleware options.</param>
@@ -112,11 +112,11 @@ namespace Marechai.App.Magazines
         /// <exception cref="global::Marechai.App.Models.ProblemDetails">When receiving a 401 status code</exception>
 #if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
 #nullable enable
-        public async Task<UntypedNode?> PostAsync(global::Marechai.App.Models.MagazineDto body, Action<RequestConfiguration<DefaultQueryParameters>>? requestConfiguration = default, CancellationToken cancellationToken = default)
+        public async Task<long?> PostAsync(global::Marechai.App.Models.MagazineDto body, Action<RequestConfiguration<DefaultQueryParameters>>? requestConfiguration = default, CancellationToken cancellationToken = default)
         {
 #nullable restore
 #else
-        public async Task<UntypedNode> PostAsync(global::Marechai.App.Models.MagazineDto body, Action<RequestConfiguration<DefaultQueryParameters>> requestConfiguration = default, CancellationToken cancellationToken = default)
+        public async Task<long?> PostAsync(global::Marechai.App.Models.MagazineDto body, Action<RequestConfiguration<DefaultQueryParameters>> requestConfiguration = default, CancellationToken cancellationToken = default)
         {
 #endif
             if(ReferenceEquals(body, null)) throw new ArgumentNullException(nameof(body));
@@ -126,7 +126,7 @@ namespace Marechai.App.Magazines
                 { "400", global::Marechai.App.Models.ProblemDetails.CreateFromDiscriminatorValue },
                 { "401", global::Marechai.App.Models.ProblemDetails.CreateFromDiscriminatorValue },
             };
-            return await RequestAdapter.SendAsync<UntypedNode>(requestInfo, UntypedNode.CreateFromDiscriminatorValue, errorMapping, cancellationToken).ConfigureAwait(false);
+            return await RequestAdapter.SendPrimitiveAsync<long?>(requestInfo, errorMapping, cancellationToken).ConfigureAwait(false);
         }
         /// <returns>A <see cref="RequestInformation"/></returns>
         /// <param name="requestConfiguration">Configuration for the request such as headers, query parameters, and middleware options.</param>
diff --git a/Marechai.App/Services/Client/MagazinesByMachine/MagazinesByMachineRequestBuilder.cs b/Marechai.App/Services/Client/MagazinesByMachine/MagazinesByMachineRequestBuilder.cs
index 2ebc0bc4..20eb6e3d 100644
--- a/Marechai.App/Services/Client/MagazinesByMachine/MagazinesByMachineRequestBuilder.cs
+++ b/Marechai.App/Services/Client/MagazinesByMachine/MagazinesByMachineRequestBuilder.cs
@@ -59,7 +59,7 @@ namespace Marechai.App.MagazinesByMachine
         public MagazinesByMachineRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) : base(requestAdapter, "{+baseurl}/magazines-by-machine", rawUrl)
         {
         }
-        /// <returns>A <see cref="UntypedNode"/></returns>
+        /// <returns>A <see cref="long"/></returns>
         /// <param name="body">The request body</param>
         /// <param name="cancellationToken">Cancellation token to use when cancelling requests</param>
         /// <param name="requestConfiguration">Configuration for the request such as headers, query parameters, and middleware options.</param>
@@ -67,11 +67,11 @@ namespace Marechai.App.MagazinesByMachine
         /// <exception cref="global::Marechai.App.Models.ProblemDetails">When receiving a 401 status code</exception>
 #if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
 #nullable enable
-        public async Task<UntypedNode?> PostAsync(global::Marechai.App.Models.MagazineByMachineDto body, Action<RequestConfiguration<DefaultQueryParameters>>? requestConfiguration = default, CancellationToken cancellationToken = default)
+        public async Task<long?> PostAsync(global::Marechai.App.Models.MagazineByMachineDto body, Action<RequestConfiguration<DefaultQueryParameters>>? requestConfiguration = default, CancellationToken cancellationToken = default)
         {
 #nullable restore
 #else
-        public async Task<UntypedNode> PostAsync(global::Marechai.App.Models.MagazineByMachineDto body, Action<RequestConfiguration<DefaultQueryParameters>> requestConfiguration = default, CancellationToken cancellationToken = default)
+        public async Task<long?> PostAsync(global::Marechai.App.Models.MagazineByMachineDto body, Action<RequestConfiguration<DefaultQueryParameters>> requestConfiguration = default, CancellationToken cancellationToken = default)
         {
 #endif
             if(ReferenceEquals(body, null)) throw new ArgumentNullException(nameof(body));
@@ -81,7 +81,7 @@ namespace Marechai.App.MagazinesByMachine
                 { "400", global::Marechai.App.Models.ProblemDetails.CreateFromDiscriminatorValue },
                 { "401", global::Marechai.App.Models.ProblemDetails.CreateFromDiscriminatorValue },
             };
-            return await RequestAdapter.SendAsync<UntypedNode>(requestInfo, UntypedNode.CreateFromDiscriminatorValue, errorMapping, cancellationToken).ConfigureAwait(false);
+            return await RequestAdapter.SendPrimitiveAsync<long?>(requestInfo, errorMapping, cancellationToken).ConfigureAwait(false);
         }
         /// <returns>A <see cref="RequestInformation"/></returns>
         /// <param name="body">The request body</param>
diff --git a/Marechai.App/Services/Client/MagazinesByMachineFamily/MagazinesByMachineFamilyRequestBuilder.cs b/Marechai.App/Services/Client/MagazinesByMachineFamily/MagazinesByMachineFamilyRequestBuilder.cs
index 941374be..b7566448 100644
--- a/Marechai.App/Services/Client/MagazinesByMachineFamily/MagazinesByMachineFamilyRequestBuilder.cs
+++ b/Marechai.App/Services/Client/MagazinesByMachineFamily/MagazinesByMachineFamilyRequestBuilder.cs
@@ -59,7 +59,7 @@ namespace Marechai.App.MagazinesByMachineFamily
         public MagazinesByMachineFamilyRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) : base(requestAdapter, "{+baseurl}/magazines-by-machine-family", rawUrl)
         {
         }
-        /// <returns>A <see cref="UntypedNode"/></returns>
+        /// <returns>A <see cref="long"/></returns>
         /// <param name="body">The request body</param>
         /// <param name="cancellationToken">Cancellation token to use when cancelling requests</param>
         /// <param name="requestConfiguration">Configuration for the request such as headers, query parameters, and middleware options.</param>
@@ -67,11 +67,11 @@ namespace Marechai.App.MagazinesByMachineFamily
         /// <exception cref="global::Marechai.App.Models.ProblemDetails">When receiving a 401 status code</exception>
 #if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
 #nullable enable
-        public async Task<UntypedNode?> PostAsync(global::Marechai.App.Models.MagazineByMachineFamilyDto body, Action<RequestConfiguration<DefaultQueryParameters>>? requestConfiguration = default, CancellationToken cancellationToken = default)
+        public async Task<long?> PostAsync(global::Marechai.App.Models.MagazineByMachineFamilyDto body, Action<RequestConfiguration<DefaultQueryParameters>>? requestConfiguration = default, CancellationToken cancellationToken = default)
         {
 #nullable restore
 #else
-        public async Task<UntypedNode> PostAsync(global::Marechai.App.Models.MagazineByMachineFamilyDto body, Action<RequestConfiguration<DefaultQueryParameters>> requestConfiguration = default, CancellationToken cancellationToken = default)
+        public async Task<long?> PostAsync(global::Marechai.App.Models.MagazineByMachineFamilyDto body, Action<RequestConfiguration<DefaultQueryParameters>> requestConfiguration = default, CancellationToken cancellationToken = default)
         {
 #endif
             if(ReferenceEquals(body, null)) throw new ArgumentNullException(nameof(body));
@@ -81,7 +81,7 @@ namespace Marechai.App.MagazinesByMachineFamily
                 { "400", global::Marechai.App.Models.ProblemDetails.CreateFromDiscriminatorValue },
                 { "401", global::Marechai.App.Models.ProblemDetails.CreateFromDiscriminatorValue },
             };
-            return await RequestAdapter.SendAsync<UntypedNode>(requestInfo, UntypedNode.CreateFromDiscriminatorValue, errorMapping, cancellationToken).ConfigureAwait(false);
+            return await RequestAdapter.SendPrimitiveAsync<long?>(requestInfo, errorMapping, cancellationToken).ConfigureAwait(false);
         }
         /// <returns>A <see cref="RequestInformation"/></returns>
         /// <param name="body">The request body</param>
diff --git a/Marechai.App/Services/Client/Medias/MediasRequestBuilder.cs b/Marechai.App/Services/Client/Medias/MediasRequestBuilder.cs
index 56443387..a472e89f 100644
--- a/Marechai.App/Services/Client/Medias/MediasRequestBuilder.cs
+++ b/Marechai.App/Services/Client/Medias/MediasRequestBuilder.cs
@@ -27,7 +27,7 @@ namespace Marechai.App.Medias
         /// <summary>Gets an item from the Marechai.App.medias.item collection</summary>
         /// <param name="position">Unique identifier of the item</param>
         /// <returns>A <see cref="global::Marechai.App.Medias.Item.MediasItemRequestBuilder"/></returns>
-        public global::Marechai.App.Medias.Item.MediasItemRequestBuilder this[string position]
+        public global::Marechai.App.Medias.Item.MediasItemRequestBuilder this[int position]
         {
             get
             {
@@ -36,6 +36,19 @@ namespace Marechai.App.Medias
                 return new global::Marechai.App.Medias.Item.MediasItemRequestBuilder(urlTplParams, RequestAdapter);
             }
         }
+        /// <summary>Gets an item from the Marechai.App.medias.item collection</summary>
+        /// <param name="position">Unique identifier of the item</param>
+        /// <returns>A <see cref="global::Marechai.App.Medias.Item.MediasItemRequestBuilder"/></returns>
+        [Obsolete("This indexer is deprecated and will be removed in the next major version. Use the one with the typed parameter instead.")]
+        public global::Marechai.App.Medias.Item.MediasItemRequestBuilder this[string position]
+        {
+            get
+            {
+                var urlTplParams = new Dictionary<string, object>(PathParameters);
+                if (!string.IsNullOrWhiteSpace(position)) urlTplParams.Add("id", position);
+                return new global::Marechai.App.Medias.Item.MediasItemRequestBuilder(urlTplParams, RequestAdapter);
+            }
+        }
         /// <summary>
         /// Instantiates a new <see cref="global::Marechai.App.Medias.MediasRequestBuilder"/> and sets the default values.
         /// </summary>
@@ -73,7 +86,7 @@ namespace Marechai.App.Medias
             var collectionResult = await RequestAdapter.SendCollectionAsync<global::Marechai.App.Models.MediaDto>(requestInfo, global::Marechai.App.Models.MediaDto.CreateFromDiscriminatorValue, errorMapping, cancellationToken).ConfigureAwait(false);
             return collectionResult?.AsList();
         }
-        /// <returns>A <see cref="UntypedNode"/></returns>
+        /// <returns>A <see cref="int"/></returns>
         /// <param name="body">The request body</param>
         /// <param name="cancellationToken">Cancellation token to use when cancelling requests</param>
         /// <param name="requestConfiguration">Configuration for the request such as headers, query parameters, and middleware options.</param>
@@ -81,11 +94,11 @@ namespace Marechai.App.Medias
         /// <exception cref="global::Marechai.App.Models.ProblemDetails">When receiving a 401 status code</exception>
 #if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
 #nullable enable
-        public async Task<UntypedNode?> PostAsync(global::Marechai.App.Models.MediaDto body, Action<RequestConfiguration<DefaultQueryParameters>>? requestConfiguration = default, CancellationToken cancellationToken = default)
+        public async Task<int?> PostAsync(global::Marechai.App.Models.MediaDto body, Action<RequestConfiguration<DefaultQueryParameters>>? requestConfiguration = default, CancellationToken cancellationToken = default)
         {
 #nullable restore
 #else
-        public async Task<UntypedNode> PostAsync(global::Marechai.App.Models.MediaDto body, Action<RequestConfiguration<DefaultQueryParameters>> requestConfiguration = default, CancellationToken cancellationToken = default)
+        public async Task<int?> PostAsync(global::Marechai.App.Models.MediaDto body, Action<RequestConfiguration<DefaultQueryParameters>> requestConfiguration = default, CancellationToken cancellationToken = default)
         {
 #endif
             if(ReferenceEquals(body, null)) throw new ArgumentNullException(nameof(body));
@@ -95,7 +108,7 @@ namespace Marechai.App.Medias
                 { "400", global::Marechai.App.Models.ProblemDetails.CreateFromDiscriminatorValue },
                 { "401", global::Marechai.App.Models.ProblemDetails.CreateFromDiscriminatorValue },
             };
-            return await RequestAdapter.SendAsync<UntypedNode>(requestInfo, UntypedNode.CreateFromDiscriminatorValue, errorMapping, cancellationToken).ConfigureAwait(false);
+            return await RequestAdapter.SendPrimitiveAsync<int?>(requestInfo, errorMapping, cancellationToken).ConfigureAwait(false);
         }
         /// <returns>A <see cref="RequestInformation"/></returns>
         /// <param name="requestConfiguration">Configuration for the request such as headers, query parameters, and middleware options.</param>
diff --git a/Marechai.App/Services/Client/MemoriesByMachine/MemoriesByMachineRequestBuilder.cs b/Marechai.App/Services/Client/MemoriesByMachine/MemoriesByMachineRequestBuilder.cs
index 5b86c58d..f497a1a3 100644
--- a/Marechai.App/Services/Client/MemoriesByMachine/MemoriesByMachineRequestBuilder.cs
+++ b/Marechai.App/Services/Client/MemoriesByMachine/MemoriesByMachineRequestBuilder.cs
@@ -59,7 +59,7 @@ namespace Marechai.App.MemoriesByMachine
         public MemoriesByMachineRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) : base(requestAdapter, "{+baseurl}/memories-by-machine", rawUrl)
         {
         }
-        /// <returns>A <see cref="UntypedNode"/></returns>
+        /// <returns>A <see cref="long"/></returns>
         /// <param name="body">The request body</param>
         /// <param name="cancellationToken">Cancellation token to use when cancelling requests</param>
         /// <param name="requestConfiguration">Configuration for the request such as headers, query parameters, and middleware options.</param>
@@ -67,11 +67,11 @@ namespace Marechai.App.MemoriesByMachine
         /// <exception cref="global::Marechai.App.Models.ProblemDetails">When receiving a 401 status code</exception>
 #if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
 #nullable enable
-        public async Task<UntypedNode?> PostAsync(global::Marechai.App.Models.MemoryByMachineDto body, Action<RequestConfiguration<DefaultQueryParameters>>? requestConfiguration = default, CancellationToken cancellationToken = default)
+        public async Task<long?> PostAsync(global::Marechai.App.Models.MemoryByMachineDto body, Action<RequestConfiguration<DefaultQueryParameters>>? requestConfiguration = default, CancellationToken cancellationToken = default)
         {
 #nullable restore
 #else
-        public async Task<UntypedNode> PostAsync(global::Marechai.App.Models.MemoryByMachineDto body, Action<RequestConfiguration<DefaultQueryParameters>> requestConfiguration = default, CancellationToken cancellationToken = default)
+        public async Task<long?> PostAsync(global::Marechai.App.Models.MemoryByMachineDto body, Action<RequestConfiguration<DefaultQueryParameters>> requestConfiguration = default, CancellationToken cancellationToken = default)
         {
 #endif
             if(ReferenceEquals(body, null)) throw new ArgumentNullException(nameof(body));
@@ -81,7 +81,7 @@ namespace Marechai.App.MemoriesByMachine
                 { "400", global::Marechai.App.Models.ProblemDetails.CreateFromDiscriminatorValue },
                 { "401", global::Marechai.App.Models.ProblemDetails.CreateFromDiscriminatorValue },
             };
-            return await RequestAdapter.SendAsync<UntypedNode>(requestInfo, UntypedNode.CreateFromDiscriminatorValue, errorMapping, cancellationToken).ConfigureAwait(false);
+            return await RequestAdapter.SendPrimitiveAsync<long?>(requestInfo, errorMapping, cancellationToken).ConfigureAwait(false);
         }
         /// <returns>A <see cref="RequestInformation"/></returns>
         /// <param name="body">The request body</param>
diff --git a/Marechai.App/Services/Client/Models/BookByMachineDto.cs b/Marechai.App/Services/Client/Models/BookByMachineDto.cs
index cc8f13d3..e28f8b6e 100644
--- a/Marechai.App/Services/Client/Models/BookByMachineDto.cs
+++ b/Marechai.App/Services/Client/Models/BookByMachineDto.cs
@@ -23,21 +23,9 @@ namespace Marechai.App.Models
         public string Book { get; set; }
 #endif
         /// <summary>The book_id property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? BookId { get; set; }
-#nullable restore
-#else
-        public UntypedNode BookId { get; set; }
-#endif
+        public long? BookId { get; set; }
         /// <summary>The id property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? Id { get; set; }
-#nullable restore
-#else
-        public UntypedNode Id { get; set; }
-#endif
+        public long? Id { get; set; }
         /// <summary>The machine property</summary>
 #if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
 #nullable enable
@@ -47,13 +35,7 @@ namespace Marechai.App.Models
         public string Machine { get; set; }
 #endif
         /// <summary>The machine_id property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? MachineId { get; set; }
-#nullable restore
-#else
-        public UntypedNode MachineId { get; set; }
-#endif
+        public int? MachineId { get; set; }
         /// <summary>
         /// Instantiates a new <see cref="global::Marechai.App.Models.BookByMachineDto"/> and sets the default values.
         /// </summary>
@@ -80,10 +62,10 @@ namespace Marechai.App.Models
             return new Dictionary<string, Action<IParseNode>>
             {
                 { "book", n => { Book = n.GetStringValue(); } },
-                { "book_id", n => { BookId = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
-                { "id", n => { Id = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
+                { "book_id", n => { BookId = n.GetLongValue(); } },
+                { "id", n => { Id = n.GetLongValue(); } },
                 { "machine", n => { Machine = n.GetStringValue(); } },
-                { "machine_id", n => { MachineId = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
+                { "machine_id", n => { MachineId = n.GetIntValue(); } },
             };
         }
         /// <summary>
@@ -94,10 +76,10 @@ namespace Marechai.App.Models
         {
             if(ReferenceEquals(writer, null)) throw new ArgumentNullException(nameof(writer));
             writer.WriteStringValue("book", Book);
-            writer.WriteObjectValue<UntypedNode>("book_id", BookId);
-            writer.WriteObjectValue<UntypedNode>("id", Id);
+            writer.WriteLongValue("book_id", BookId);
+            writer.WriteLongValue("id", Id);
             writer.WriteStringValue("machine", Machine);
-            writer.WriteObjectValue<UntypedNode>("machine_id", MachineId);
+            writer.WriteIntValue("machine_id", MachineId);
             writer.WriteAdditionalData(AdditionalData);
         }
     }
diff --git a/Marechai.App/Services/Client/Models/BookByMachineFamilyDto.cs b/Marechai.App/Services/Client/Models/BookByMachineFamilyDto.cs
index 46e318dc..3e4782d6 100644
--- a/Marechai.App/Services/Client/Models/BookByMachineFamilyDto.cs
+++ b/Marechai.App/Services/Client/Models/BookByMachineFamilyDto.cs
@@ -23,21 +23,9 @@ namespace Marechai.App.Models
         public string Book { get; set; }
 #endif
         /// <summary>The book_id property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? BookId { get; set; }
-#nullable restore
-#else
-        public UntypedNode BookId { get; set; }
-#endif
+        public long? BookId { get; set; }
         /// <summary>The id property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? Id { get; set; }
-#nullable restore
-#else
-        public UntypedNode Id { get; set; }
-#endif
+        public long? Id { get; set; }
         /// <summary>The machine_family property</summary>
 #if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
 #nullable enable
@@ -47,13 +35,7 @@ namespace Marechai.App.Models
         public string MachineFamily { get; set; }
 #endif
         /// <summary>The machine_family_id property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? MachineFamilyId { get; set; }
-#nullable restore
-#else
-        public UntypedNode MachineFamilyId { get; set; }
-#endif
+        public int? MachineFamilyId { get; set; }
         /// <summary>
         /// Instantiates a new <see cref="global::Marechai.App.Models.BookByMachineFamilyDto"/> and sets the default values.
         /// </summary>
@@ -80,10 +62,10 @@ namespace Marechai.App.Models
             return new Dictionary<string, Action<IParseNode>>
             {
                 { "book", n => { Book = n.GetStringValue(); } },
-                { "book_id", n => { BookId = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
-                { "id", n => { Id = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
+                { "book_id", n => { BookId = n.GetLongValue(); } },
+                { "id", n => { Id = n.GetLongValue(); } },
                 { "machine_family", n => { MachineFamily = n.GetStringValue(); } },
-                { "machine_family_id", n => { MachineFamilyId = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
+                { "machine_family_id", n => { MachineFamilyId = n.GetIntValue(); } },
             };
         }
         /// <summary>
@@ -94,10 +76,10 @@ namespace Marechai.App.Models
         {
             if(ReferenceEquals(writer, null)) throw new ArgumentNullException(nameof(writer));
             writer.WriteStringValue("book", Book);
-            writer.WriteObjectValue<UntypedNode>("book_id", BookId);
-            writer.WriteObjectValue<UntypedNode>("id", Id);
+            writer.WriteLongValue("book_id", BookId);
+            writer.WriteLongValue("id", Id);
             writer.WriteStringValue("machine_family", MachineFamily);
-            writer.WriteObjectValue<UntypedNode>("machine_family_id", MachineFamilyId);
+            writer.WriteIntValue("machine_family_id", MachineFamilyId);
             writer.WriteAdditionalData(AdditionalData);
         }
     }
diff --git a/Marechai.App/Services/Client/Models/BookDto.cs b/Marechai.App/Services/Client/Models/BookDto.cs
index 4e6a998c..12a6c215 100644
--- a/Marechai.App/Services/Client/Models/BookDto.cs
+++ b/Marechai.App/Services/Client/Models/BookDto.cs
@@ -23,29 +23,11 @@ namespace Marechai.App.Models
         public string Country { get; set; }
 #endif
         /// <summary>The country_id property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? CountryId { get; set; }
-#nullable restore
-#else
-        public UntypedNode CountryId { get; set; }
-#endif
+        public int? CountryId { get; set; }
         /// <summary>The edition property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? Edition { get; set; }
-#nullable restore
-#else
-        public UntypedNode Edition { get; set; }
-#endif
+        public int? Edition { get; set; }
         /// <summary>The id property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? Id { get; set; }
-#nullable restore
-#else
-        public UntypedNode Id { get; set; }
-#endif
+        public long? Id { get; set; }
         /// <summary>The isbn property</summary>
 #if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
 #nullable enable
@@ -63,31 +45,13 @@ namespace Marechai.App.Models
         public string NativeTitle { get; set; }
 #endif
         /// <summary>The pages property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? Pages { get; set; }
-#nullable restore
-#else
-        public UntypedNode Pages { get; set; }
-#endif
+        public int? Pages { get; set; }
         /// <summary>The previous_id property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? PreviousId { get; set; }
-#nullable restore
-#else
-        public UntypedNode PreviousId { get; set; }
-#endif
+        public long? PreviousId { get; set; }
         /// <summary>The published property</summary>
         public DateTimeOffset? Published { get; set; }
         /// <summary>The source_id property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? SourceId { get; set; }
-#nullable restore
-#else
-        public UntypedNode SourceId { get; set; }
-#endif
+        public long? SourceId { get; set; }
         /// <summary>The synopsis property</summary>
 #if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
 #nullable enable
@@ -130,15 +94,15 @@ namespace Marechai.App.Models
             return new Dictionary<string, Action<IParseNode>>
             {
                 { "country", n => { Country = n.GetStringValue(); } },
-                { "country_id", n => { CountryId = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
-                { "edition", n => { Edition = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
-                { "id", n => { Id = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
+                { "country_id", n => { CountryId = n.GetIntValue(); } },
+                { "edition", n => { Edition = n.GetIntValue(); } },
+                { "id", n => { Id = n.GetLongValue(); } },
                 { "isbn", n => { Isbn = n.GetStringValue(); } },
                 { "native_title", n => { NativeTitle = n.GetStringValue(); } },
-                { "pages", n => { Pages = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
-                { "previous_id", n => { PreviousId = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
+                { "pages", n => { Pages = n.GetIntValue(); } },
+                { "previous_id", n => { PreviousId = n.GetLongValue(); } },
                 { "published", n => { Published = n.GetDateTimeOffsetValue(); } },
-                { "source_id", n => { SourceId = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
+                { "source_id", n => { SourceId = n.GetLongValue(); } },
                 { "synopsis", n => { Synopsis = n.GetStringValue(); } },
                 { "title", n => { Title = n.GetStringValue(); } },
             };
@@ -151,15 +115,15 @@ namespace Marechai.App.Models
         {
             if(ReferenceEquals(writer, null)) throw new ArgumentNullException(nameof(writer));
             writer.WriteStringValue("country", Country);
-            writer.WriteObjectValue<UntypedNode>("country_id", CountryId);
-            writer.WriteObjectValue<UntypedNode>("edition", Edition);
-            writer.WriteObjectValue<UntypedNode>("id", Id);
+            writer.WriteIntValue("country_id", CountryId);
+            writer.WriteIntValue("edition", Edition);
+            writer.WriteLongValue("id", Id);
             writer.WriteStringValue("isbn", Isbn);
             writer.WriteStringValue("native_title", NativeTitle);
-            writer.WriteObjectValue<UntypedNode>("pages", Pages);
-            writer.WriteObjectValue<UntypedNode>("previous_id", PreviousId);
+            writer.WriteIntValue("pages", Pages);
+            writer.WriteLongValue("previous_id", PreviousId);
             writer.WriteDateTimeOffsetValue("published", Published);
-            writer.WriteObjectValue<UntypedNode>("source_id", SourceId);
+            writer.WriteLongValue("source_id", SourceId);
             writer.WriteStringValue("synopsis", Synopsis);
             writer.WriteStringValue("title", Title);
             writer.WriteAdditionalData(AdditionalData);
diff --git a/Marechai.App/Services/Client/Models/BookScanDto.cs b/Marechai.App/Services/Client/Models/BookScanDto.cs
index cbe88d21..b3e33c34 100644
--- a/Marechai.App/Services/Client/Models/BookScanDto.cs
+++ b/Marechai.App/Services/Client/Models/BookScanDto.cs
@@ -31,13 +31,7 @@ namespace Marechai.App.Models
         public string Book { get; set; }
 #endif
         /// <summary>The book_id property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? BookId { get; set; }
-#nullable restore
-#else
-        public UntypedNode BookId { get; set; }
-#endif
+        public long? BookId { get; set; }
         /// <summary>The colorspace property</summary>
 #if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
 #nullable enable
@@ -65,13 +59,7 @@ namespace Marechai.App.Models
         public string ExifVersion { get; set; }
 #endif
         /// <summary>The horizontal_resolution property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? HorizontalResolution { get; set; }
-#nullable restore
-#else
-        public UntypedNode HorizontalResolution { get; set; }
-#endif
+        public double? HorizontalResolution { get; set; }
         /// <summary>The id property</summary>
         public Guid? Id { get; set; }
         /// <summary>The original_extension property</summary>
@@ -83,13 +71,7 @@ namespace Marechai.App.Models
         public string OriginalExtension { get; set; }
 #endif
         /// <summary>The page property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? Page { get; set; }
-#nullable restore
-#else
-        public UntypedNode Page { get; set; }
-#endif
+        public int? Page { get; set; }
         /// <summary>The resolution_unit property</summary>
 #if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
 #nullable enable
@@ -135,13 +117,7 @@ namespace Marechai.App.Models
         public string UserId { get; set; }
 #endif
         /// <summary>The vertical_resolution property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? VerticalResolution { get; set; }
-#nullable restore
-#else
-        public UntypedNode VerticalResolution { get; set; }
-#endif
+        public double? VerticalResolution { get; set; }
         /// <summary>
         /// Instantiates a new <see cref="global::Marechai.App.Models.BookScanDto"/> and sets the default values.
         /// </summary>
@@ -169,15 +145,15 @@ namespace Marechai.App.Models
             {
                 { "author", n => { Author = n.GetStringValue(); } },
                 { "book", n => { Book = n.GetStringValue(); } },
-                { "book_id", n => { BookId = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
+                { "book_id", n => { BookId = n.GetLongValue(); } },
                 { "colorspace", n => { Colorspace = n.GetObjectValue<global::Marechai.App.Models.BookScanDto.BookScanDto_colorspace>(global::Marechai.App.Models.BookScanDto.BookScanDto_colorspace.CreateFromDiscriminatorValue); } },
                 { "comments", n => { Comments = n.GetStringValue(); } },
                 { "creation_date", n => { CreationDate = n.GetDateTimeOffsetValue(); } },
                 { "exif_version", n => { ExifVersion = n.GetStringValue(); } },
-                { "horizontal_resolution", n => { HorizontalResolution = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
+                { "horizontal_resolution", n => { HorizontalResolution = n.GetDoubleValue(); } },
                 { "id", n => { Id = n.GetGuidValue(); } },
                 { "original_extension", n => { OriginalExtension = n.GetStringValue(); } },
-                { "page", n => { Page = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
+                { "page", n => { Page = n.GetIntValue(); } },
                 { "resolution_unit", n => { ResolutionUnit = n.GetObjectValue<global::Marechai.App.Models.BookScanDto.BookScanDto_resolution_unit>(global::Marechai.App.Models.BookScanDto.BookScanDto_resolution_unit.CreateFromDiscriminatorValue); } },
                 { "scanner_manufacturer", n => { ScannerManufacturer = n.GetStringValue(); } },
                 { "scanner_model", n => { ScannerModel = n.GetStringValue(); } },
@@ -185,7 +161,7 @@ namespace Marechai.App.Models
                 { "type", n => { Type = n.GetIntValue(); } },
                 { "upload_date", n => { UploadDate = n.GetDateTimeOffsetValue(); } },
                 { "user_id", n => { UserId = n.GetStringValue(); } },
-                { "vertical_resolution", n => { VerticalResolution = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
+                { "vertical_resolution", n => { VerticalResolution = n.GetDoubleValue(); } },
             };
         }
         /// <summary>
@@ -197,15 +173,15 @@ namespace Marechai.App.Models
             if(ReferenceEquals(writer, null)) throw new ArgumentNullException(nameof(writer));
             writer.WriteStringValue("author", Author);
             writer.WriteStringValue("book", Book);
-            writer.WriteObjectValue<UntypedNode>("book_id", BookId);
+            writer.WriteLongValue("book_id", BookId);
             writer.WriteObjectValue<global::Marechai.App.Models.BookScanDto.BookScanDto_colorspace>("colorspace", Colorspace);
             writer.WriteStringValue("comments", Comments);
             writer.WriteDateTimeOffsetValue("creation_date", CreationDate);
             writer.WriteStringValue("exif_version", ExifVersion);
-            writer.WriteObjectValue<UntypedNode>("horizontal_resolution", HorizontalResolution);
+            writer.WriteDoubleValue("horizontal_resolution", HorizontalResolution);
             writer.WriteGuidValue("id", Id);
             writer.WriteStringValue("original_extension", OriginalExtension);
-            writer.WriteObjectValue<UntypedNode>("page", Page);
+            writer.WriteIntValue("page", Page);
             writer.WriteObjectValue<global::Marechai.App.Models.BookScanDto.BookScanDto_resolution_unit>("resolution_unit", ResolutionUnit);
             writer.WriteStringValue("scanner_manufacturer", ScannerManufacturer);
             writer.WriteStringValue("scanner_model", ScannerModel);
@@ -213,7 +189,7 @@ namespace Marechai.App.Models
             writer.WriteIntValue("type", Type);
             writer.WriteDateTimeOffsetValue("upload_date", UploadDate);
             writer.WriteStringValue("user_id", UserId);
-            writer.WriteObjectValue<UntypedNode>("vertical_resolution", VerticalResolution);
+            writer.WriteDoubleValue("vertical_resolution", VerticalResolution);
             writer.WriteAdditionalData(AdditionalData);
         }
         /// <summary>
diff --git a/Marechai.App/Services/Client/Models/BrowserTest.cs b/Marechai.App/Services/Client/Models/BrowserTest.cs
index e0f18816..5c18ac0c 100644
--- a/Marechai.App/Services/Client/Models/BrowserTest.cs
+++ b/Marechai.App/Services/Client/Models/BrowserTest.cs
@@ -37,13 +37,7 @@ namespace Marechai.App.Models
         /// <summary>The gif89 property</summary>
         public bool? Gif89 { get; set; }
         /// <summary>The id property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? Id { get; set; }
-#nullable restore
-#else
-        public UntypedNode Id { get; set; }
-#endif
+        public int? Id { get; set; }
         /// <summary>The jpeg property</summary>
         public bool? Jpeg { get; set; }
         /// <summary>The js property</summary>
@@ -121,7 +115,7 @@ namespace Marechai.App.Models
                 { "frames", n => { Frames = n.GetBoolValue(); } },
                 { "gif87", n => { Gif87 = n.GetBoolValue(); } },
                 { "gif89", n => { Gif89 = n.GetBoolValue(); } },
-                { "id", n => { Id = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
+                { "id", n => { Id = n.GetIntValue(); } },
                 { "jpeg", n => { Jpeg = n.GetBoolValue(); } },
                 { "js", n => { Js = n.GetBoolValue(); } },
                 { "os", n => { Os = n.GetStringValue(); } },
@@ -149,7 +143,7 @@ namespace Marechai.App.Models
             writer.WriteBoolValue("frames", Frames);
             writer.WriteBoolValue("gif87", Gif87);
             writer.WriteBoolValue("gif89", Gif89);
-            writer.WriteObjectValue<UntypedNode>("id", Id);
+            writer.WriteIntValue("id", Id);
             writer.WriteBoolValue("jpeg", Jpeg);
             writer.WriteBoolValue("js", Js);
             writer.WriteStringValue("os", Os);
diff --git a/Marechai.App/Services/Client/Models/CompanyByBookDto.cs b/Marechai.App/Services/Client/Models/CompanyByBookDto.cs
index 77c3b253..f5e9f6e4 100644
--- a/Marechai.App/Services/Client/Models/CompanyByBookDto.cs
+++ b/Marechai.App/Services/Client/Models/CompanyByBookDto.cs
@@ -15,13 +15,7 @@ namespace Marechai.App.Models
         /// <summary>Stores additional data not described in the OpenAPI description found when deserializing. Can be used for serialization as well.</summary>
         public IDictionary<string, object> AdditionalData { get; set; }
         /// <summary>The book_id property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? BookId { get; set; }
-#nullable restore
-#else
-        public UntypedNode BookId { get; set; }
-#endif
+        public long? BookId { get; set; }
         /// <summary>The company property</summary>
 #if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
 #nullable enable
@@ -31,21 +25,9 @@ namespace Marechai.App.Models
         public string Company { get; set; }
 #endif
         /// <summary>The company_id property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? CompanyId { get; set; }
-#nullable restore
-#else
-        public UntypedNode CompanyId { get; set; }
-#endif
+        public int? CompanyId { get; set; }
         /// <summary>The id property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? Id { get; set; }
-#nullable restore
-#else
-        public UntypedNode Id { get; set; }
-#endif
+        public long? Id { get; set; }
         /// <summary>The role property</summary>
 #if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
 #nullable enable
@@ -87,10 +69,10 @@ namespace Marechai.App.Models
         {
             return new Dictionary<string, Action<IParseNode>>
             {
-                { "book_id", n => { BookId = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
+                { "book_id", n => { BookId = n.GetLongValue(); } },
                 { "company", n => { Company = n.GetStringValue(); } },
-                { "company_id", n => { CompanyId = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
-                { "id", n => { Id = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
+                { "company_id", n => { CompanyId = n.GetIntValue(); } },
+                { "id", n => { Id = n.GetLongValue(); } },
                 { "role", n => { Role = n.GetStringValue(); } },
                 { "role_id", n => { RoleId = n.GetStringValue(); } },
             };
@@ -102,10 +84,10 @@ namespace Marechai.App.Models
         public virtual void Serialize(ISerializationWriter writer)
         {
             if(ReferenceEquals(writer, null)) throw new ArgumentNullException(nameof(writer));
-            writer.WriteObjectValue<UntypedNode>("book_id", BookId);
+            writer.WriteLongValue("book_id", BookId);
             writer.WriteStringValue("company", Company);
-            writer.WriteObjectValue<UntypedNode>("company_id", CompanyId);
-            writer.WriteObjectValue<UntypedNode>("id", Id);
+            writer.WriteIntValue("company_id", CompanyId);
+            writer.WriteLongValue("id", Id);
             writer.WriteStringValue("role", Role);
             writer.WriteStringValue("role_id", RoleId);
             writer.WriteAdditionalData(AdditionalData);
diff --git a/Marechai.App/Services/Client/Models/CompanyByDocumentDto.cs b/Marechai.App/Services/Client/Models/CompanyByDocumentDto.cs
index 2dc497ec..3b5d2ace 100644
--- a/Marechai.App/Services/Client/Models/CompanyByDocumentDto.cs
+++ b/Marechai.App/Services/Client/Models/CompanyByDocumentDto.cs
@@ -23,29 +23,11 @@ namespace Marechai.App.Models
         public string Company { get; set; }
 #endif
         /// <summary>The company_id property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? CompanyId { get; set; }
-#nullable restore
-#else
-        public UntypedNode CompanyId { get; set; }
-#endif
+        public int? CompanyId { get; set; }
         /// <summary>The document_id property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? DocumentId { get; set; }
-#nullable restore
-#else
-        public UntypedNode DocumentId { get; set; }
-#endif
+        public long? DocumentId { get; set; }
         /// <summary>The id property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? Id { get; set; }
-#nullable restore
-#else
-        public UntypedNode Id { get; set; }
-#endif
+        public long? Id { get; set; }
         /// <summary>The role property</summary>
 #if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
 #nullable enable
@@ -88,9 +70,9 @@ namespace Marechai.App.Models
             return new Dictionary<string, Action<IParseNode>>
             {
                 { "company", n => { Company = n.GetStringValue(); } },
-                { "company_id", n => { CompanyId = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
-                { "document_id", n => { DocumentId = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
-                { "id", n => { Id = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
+                { "company_id", n => { CompanyId = n.GetIntValue(); } },
+                { "document_id", n => { DocumentId = n.GetLongValue(); } },
+                { "id", n => { Id = n.GetLongValue(); } },
                 { "role", n => { Role = n.GetStringValue(); } },
                 { "role_id", n => { RoleId = n.GetStringValue(); } },
             };
@@ -103,9 +85,9 @@ namespace Marechai.App.Models
         {
             if(ReferenceEquals(writer, null)) throw new ArgumentNullException(nameof(writer));
             writer.WriteStringValue("company", Company);
-            writer.WriteObjectValue<UntypedNode>("company_id", CompanyId);
-            writer.WriteObjectValue<UntypedNode>("document_id", DocumentId);
-            writer.WriteObjectValue<UntypedNode>("id", Id);
+            writer.WriteIntValue("company_id", CompanyId);
+            writer.WriteLongValue("document_id", DocumentId);
+            writer.WriteLongValue("id", Id);
             writer.WriteStringValue("role", Role);
             writer.WriteStringValue("role_id", RoleId);
             writer.WriteAdditionalData(AdditionalData);
diff --git a/Marechai.App/Services/Client/Models/CompanyByMagazineDto.cs b/Marechai.App/Services/Client/Models/CompanyByMagazineDto.cs
index de56341a..765c6e50 100644
--- a/Marechai.App/Services/Client/Models/CompanyByMagazineDto.cs
+++ b/Marechai.App/Services/Client/Models/CompanyByMagazineDto.cs
@@ -23,29 +23,11 @@ namespace Marechai.App.Models
         public string Company { get; set; }
 #endif
         /// <summary>The company_id property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? CompanyId { get; set; }
-#nullable restore
-#else
-        public UntypedNode CompanyId { get; set; }
-#endif
+        public int? CompanyId { get; set; }
         /// <summary>The id property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? Id { get; set; }
-#nullable restore
-#else
-        public UntypedNode Id { get; set; }
-#endif
+        public long? Id { get; set; }
         /// <summary>The magazine_id property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? MagazineId { get; set; }
-#nullable restore
-#else
-        public UntypedNode MagazineId { get; set; }
-#endif
+        public long? MagazineId { get; set; }
         /// <summary>The role property</summary>
 #if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
 #nullable enable
@@ -88,9 +70,9 @@ namespace Marechai.App.Models
             return new Dictionary<string, Action<IParseNode>>
             {
                 { "company", n => { Company = n.GetStringValue(); } },
-                { "company_id", n => { CompanyId = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
-                { "id", n => { Id = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
-                { "magazine_id", n => { MagazineId = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
+                { "company_id", n => { CompanyId = n.GetIntValue(); } },
+                { "id", n => { Id = n.GetLongValue(); } },
+                { "magazine_id", n => { MagazineId = n.GetLongValue(); } },
                 { "role", n => { Role = n.GetStringValue(); } },
                 { "role_id", n => { RoleId = n.GetStringValue(); } },
             };
@@ -103,9 +85,9 @@ namespace Marechai.App.Models
         {
             if(ReferenceEquals(writer, null)) throw new ArgumentNullException(nameof(writer));
             writer.WriteStringValue("company", Company);
-            writer.WriteObjectValue<UntypedNode>("company_id", CompanyId);
-            writer.WriteObjectValue<UntypedNode>("id", Id);
-            writer.WriteObjectValue<UntypedNode>("magazine_id", MagazineId);
+            writer.WriteIntValue("company_id", CompanyId);
+            writer.WriteLongValue("id", Id);
+            writer.WriteLongValue("magazine_id", MagazineId);
             writer.WriteStringValue("role", Role);
             writer.WriteStringValue("role_id", RoleId);
             writer.WriteAdditionalData(AdditionalData);
diff --git a/Marechai.App/Services/Client/Models/CompanyBySoftwareFamilyDto.cs b/Marechai.App/Services/Client/Models/CompanyBySoftwareFamilyDto.cs
index 753a09e2..93b51d83 100644
--- a/Marechai.App/Services/Client/Models/CompanyBySoftwareFamilyDto.cs
+++ b/Marechai.App/Services/Client/Models/CompanyBySoftwareFamilyDto.cs
@@ -23,21 +23,9 @@ namespace Marechai.App.Models
         public string Company { get; set; }
 #endif
         /// <summary>The company_id property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? CompanyId { get; set; }
-#nullable restore
-#else
-        public UntypedNode CompanyId { get; set; }
-#endif
+        public int? CompanyId { get; set; }
         /// <summary>The id property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? Id { get; set; }
-#nullable restore
-#else
-        public UntypedNode Id { get; set; }
-#endif
+        public int? Id { get; set; }
         /// <summary>The role property</summary>
 #if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
 #nullable enable
@@ -55,13 +43,7 @@ namespace Marechai.App.Models
         public string RoleId { get; set; }
 #endif
         /// <summary>The software_family_id property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? SoftwareFamilyId { get; set; }
-#nullable restore
-#else
-        public UntypedNode SoftwareFamilyId { get; set; }
-#endif
+        public int? SoftwareFamilyId { get; set; }
         /// <summary>
         /// Instantiates a new <see cref="global::Marechai.App.Models.CompanyBySoftwareFamilyDto"/> and sets the default values.
         /// </summary>
@@ -88,11 +70,11 @@ namespace Marechai.App.Models
             return new Dictionary<string, Action<IParseNode>>
             {
                 { "company", n => { Company = n.GetStringValue(); } },
-                { "company_id", n => { CompanyId = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
-                { "id", n => { Id = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
+                { "company_id", n => { CompanyId = n.GetIntValue(); } },
+                { "id", n => { Id = n.GetIntValue(); } },
                 { "role", n => { Role = n.GetStringValue(); } },
                 { "role_id", n => { RoleId = n.GetStringValue(); } },
-                { "software_family_id", n => { SoftwareFamilyId = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
+                { "software_family_id", n => { SoftwareFamilyId = n.GetIntValue(); } },
             };
         }
         /// <summary>
@@ -103,11 +85,11 @@ namespace Marechai.App.Models
         {
             if(ReferenceEquals(writer, null)) throw new ArgumentNullException(nameof(writer));
             writer.WriteStringValue("company", Company);
-            writer.WriteObjectValue<UntypedNode>("company_id", CompanyId);
-            writer.WriteObjectValue<UntypedNode>("id", Id);
+            writer.WriteIntValue("company_id", CompanyId);
+            writer.WriteIntValue("id", Id);
             writer.WriteStringValue("role", Role);
             writer.WriteStringValue("role_id", RoleId);
-            writer.WriteObjectValue<UntypedNode>("software_family_id", SoftwareFamilyId);
+            writer.WriteIntValue("software_family_id", SoftwareFamilyId);
             writer.WriteAdditionalData(AdditionalData);
         }
     }
diff --git a/Marechai.App/Services/Client/Models/CompanyBySoftwareVariantDto.cs b/Marechai.App/Services/Client/Models/CompanyBySoftwareVariantDto.cs
index f552d5a0..a6d7f37d 100644
--- a/Marechai.App/Services/Client/Models/CompanyBySoftwareVariantDto.cs
+++ b/Marechai.App/Services/Client/Models/CompanyBySoftwareVariantDto.cs
@@ -23,21 +23,9 @@ namespace Marechai.App.Models
         public string Company { get; set; }
 #endif
         /// <summary>The company_id property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? CompanyId { get; set; }
-#nullable restore
-#else
-        public UntypedNode CompanyId { get; set; }
-#endif
+        public int? CompanyId { get; set; }
         /// <summary>The id property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? Id { get; set; }
-#nullable restore
-#else
-        public UntypedNode Id { get; set; }
-#endif
+        public int? Id { get; set; }
         /// <summary>The role property</summary>
 #if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
 #nullable enable
@@ -55,13 +43,7 @@ namespace Marechai.App.Models
         public string RoleId { get; set; }
 #endif
         /// <summary>The software_variant_id property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? SoftwareVariantId { get; set; }
-#nullable restore
-#else
-        public UntypedNode SoftwareVariantId { get; set; }
-#endif
+        public int? SoftwareVariantId { get; set; }
         /// <summary>
         /// Instantiates a new <see cref="global::Marechai.App.Models.CompanyBySoftwareVariantDto"/> and sets the default values.
         /// </summary>
@@ -88,11 +70,11 @@ namespace Marechai.App.Models
             return new Dictionary<string, Action<IParseNode>>
             {
                 { "company", n => { Company = n.GetStringValue(); } },
-                { "company_id", n => { CompanyId = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
-                { "id", n => { Id = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
+                { "company_id", n => { CompanyId = n.GetIntValue(); } },
+                { "id", n => { Id = n.GetIntValue(); } },
                 { "role", n => { Role = n.GetStringValue(); } },
                 { "role_id", n => { RoleId = n.GetStringValue(); } },
-                { "software_variant_id", n => { SoftwareVariantId = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
+                { "software_variant_id", n => { SoftwareVariantId = n.GetIntValue(); } },
             };
         }
         /// <summary>
@@ -103,11 +85,11 @@ namespace Marechai.App.Models
         {
             if(ReferenceEquals(writer, null)) throw new ArgumentNullException(nameof(writer));
             writer.WriteStringValue("company", Company);
-            writer.WriteObjectValue<UntypedNode>("company_id", CompanyId);
-            writer.WriteObjectValue<UntypedNode>("id", Id);
+            writer.WriteIntValue("company_id", CompanyId);
+            writer.WriteIntValue("id", Id);
             writer.WriteStringValue("role", Role);
             writer.WriteStringValue("role_id", RoleId);
-            writer.WriteObjectValue<UntypedNode>("software_variant_id", SoftwareVariantId);
+            writer.WriteIntValue("software_variant_id", SoftwareVariantId);
             writer.WriteAdditionalData(AdditionalData);
         }
     }
diff --git a/Marechai.App/Services/Client/Models/CompanyBySoftwareVersionDto.cs b/Marechai.App/Services/Client/Models/CompanyBySoftwareVersionDto.cs
index 89e98801..fd4f709a 100644
--- a/Marechai.App/Services/Client/Models/CompanyBySoftwareVersionDto.cs
+++ b/Marechai.App/Services/Client/Models/CompanyBySoftwareVersionDto.cs
@@ -23,21 +23,9 @@ namespace Marechai.App.Models
         public string Company { get; set; }
 #endif
         /// <summary>The company_id property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? CompanyId { get; set; }
-#nullable restore
-#else
-        public UntypedNode CompanyId { get; set; }
-#endif
+        public int? CompanyId { get; set; }
         /// <summary>The id property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? Id { get; set; }
-#nullable restore
-#else
-        public UntypedNode Id { get; set; }
-#endif
+        public int? Id { get; set; }
         /// <summary>The role property</summary>
 #if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
 #nullable enable
@@ -55,13 +43,7 @@ namespace Marechai.App.Models
         public string RoleId { get; set; }
 #endif
         /// <summary>The software_version_id property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? SoftwareVersionId { get; set; }
-#nullable restore
-#else
-        public UntypedNode SoftwareVersionId { get; set; }
-#endif
+        public int? SoftwareVersionId { get; set; }
         /// <summary>
         /// Instantiates a new <see cref="global::Marechai.App.Models.CompanyBySoftwareVersionDto"/> and sets the default values.
         /// </summary>
@@ -88,11 +70,11 @@ namespace Marechai.App.Models
             return new Dictionary<string, Action<IParseNode>>
             {
                 { "company", n => { Company = n.GetStringValue(); } },
-                { "company_id", n => { CompanyId = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
-                { "id", n => { Id = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
+                { "company_id", n => { CompanyId = n.GetIntValue(); } },
+                { "id", n => { Id = n.GetIntValue(); } },
                 { "role", n => { Role = n.GetStringValue(); } },
                 { "role_id", n => { RoleId = n.GetStringValue(); } },
-                { "software_version_id", n => { SoftwareVersionId = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
+                { "software_version_id", n => { SoftwareVersionId = n.GetIntValue(); } },
             };
         }
         /// <summary>
@@ -103,11 +85,11 @@ namespace Marechai.App.Models
         {
             if(ReferenceEquals(writer, null)) throw new ArgumentNullException(nameof(writer));
             writer.WriteStringValue("company", Company);
-            writer.WriteObjectValue<UntypedNode>("company_id", CompanyId);
-            writer.WriteObjectValue<UntypedNode>("id", Id);
+            writer.WriteIntValue("company_id", CompanyId);
+            writer.WriteIntValue("id", Id);
             writer.WriteStringValue("role", Role);
             writer.WriteStringValue("role_id", RoleId);
-            writer.WriteObjectValue<UntypedNode>("software_version_id", SoftwareVersionId);
+            writer.WriteIntValue("software_version_id", SoftwareVersionId);
             writer.WriteAdditionalData(AdditionalData);
         }
     }
diff --git a/Marechai.App/Services/Client/Models/CompanyDescriptionDto.cs b/Marechai.App/Services/Client/Models/CompanyDescriptionDto.cs
index ed2a4b2e..e386a6d2 100644
--- a/Marechai.App/Services/Client/Models/CompanyDescriptionDto.cs
+++ b/Marechai.App/Services/Client/Models/CompanyDescriptionDto.cs
@@ -15,13 +15,7 @@ namespace Marechai.App.Models
         /// <summary>Stores additional data not described in the OpenAPI description found when deserializing. Can be used for serialization as well.</summary>
         public IDictionary<string, object> AdditionalData { get; set; }
         /// <summary>The company_id property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? CompanyId { get; set; }
-#nullable restore
-#else
-        public UntypedNode CompanyId { get; set; }
-#endif
+        public int? CompanyId { get; set; }
         /// <summary>The html property</summary>
 #if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
 #nullable enable
@@ -31,13 +25,7 @@ namespace Marechai.App.Models
         public string Html { get; set; }
 #endif
         /// <summary>The id property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? Id { get; set; }
-#nullable restore
-#else
-        public UntypedNode Id { get; set; }
-#endif
+        public int? Id { get; set; }
         /// <summary>The markdown property</summary>
 #if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
 #nullable enable
@@ -71,9 +59,9 @@ namespace Marechai.App.Models
         {
             return new Dictionary<string, Action<IParseNode>>
             {
-                { "company_id", n => { CompanyId = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
+                { "company_id", n => { CompanyId = n.GetIntValue(); } },
                 { "html", n => { Html = n.GetStringValue(); } },
-                { "id", n => { Id = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
+                { "id", n => { Id = n.GetIntValue(); } },
                 { "markdown", n => { Markdown = n.GetStringValue(); } },
             };
         }
@@ -84,9 +72,9 @@ namespace Marechai.App.Models
         public virtual void Serialize(ISerializationWriter writer)
         {
             if(ReferenceEquals(writer, null)) throw new ArgumentNullException(nameof(writer));
-            writer.WriteObjectValue<UntypedNode>("company_id", CompanyId);
+            writer.WriteIntValue("company_id", CompanyId);
             writer.WriteStringValue("html", Html);
-            writer.WriteObjectValue<UntypedNode>("id", Id);
+            writer.WriteIntValue("id", Id);
             writer.WriteStringValue("markdown", Markdown);
             writer.WriteAdditionalData(AdditionalData);
         }
diff --git a/Marechai.App/Services/Client/Models/CompanyDto.cs b/Marechai.App/Services/Client/Models/CompanyDto.cs
index 772bc50f..cbdef294 100644
--- a/Marechai.App/Services/Client/Models/CompanyDto.cs
+++ b/Marechai.App/Services/Client/Models/CompanyDto.cs
@@ -39,13 +39,7 @@ namespace Marechai.App.Models
         public string Country { get; set; }
 #endif
         /// <summary>The country_id property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? CountryId { get; set; }
-#nullable restore
-#else
-        public UntypedNode CountryId { get; set; }
-#endif
+        public int? CountryId { get; set; }
         /// <summary>The facebook property</summary>
 #if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
 #nullable enable
@@ -61,13 +55,7 @@ namespace Marechai.App.Models
         /// <summary>The founded_month_is_unknown property</summary>
         public bool? FoundedMonthIsUnknown { get; set; }
         /// <summary>The id property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? Id { get; set; }
-#nullable restore
-#else
-        public UntypedNode Id { get; set; }
-#endif
+        public int? Id { get; set; }
         /// <summary>The last_logo property</summary>
         public Guid? LastLogo { get; set; }
         /// <summary>The legal_name property</summary>
@@ -117,13 +105,7 @@ namespace Marechai.App.Models
         public string SoldTo { get; set; }
 #endif
         /// <summary>The sold_to_id property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? SoldToId { get; set; }
-#nullable restore
-#else
-        public UntypedNode SoldToId { get; set; }
-#endif
+        public int? SoldToId { get; set; }
         /// <summary>The status property</summary>
         public int? Status { get; set; }
         /// <summary>The twitter property</summary>
@@ -170,12 +152,12 @@ namespace Marechai.App.Models
                 { "address", n => { Address = n.GetStringValue(); } },
                 { "city", n => { City = n.GetStringValue(); } },
                 { "country", n => { Country = n.GetStringValue(); } },
-                { "country_id", n => { CountryId = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
+                { "country_id", n => { CountryId = n.GetIntValue(); } },
                 { "facebook", n => { Facebook = n.GetStringValue(); } },
                 { "founded", n => { Founded = n.GetDateTimeOffsetValue(); } },
                 { "founded_day_is_unknown", n => { FoundedDayIsUnknown = n.GetBoolValue(); } },
                 { "founded_month_is_unknown", n => { FoundedMonthIsUnknown = n.GetBoolValue(); } },
-                { "id", n => { Id = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
+                { "id", n => { Id = n.GetIntValue(); } },
                 { "last_logo", n => { LastLogo = n.GetGuidValue(); } },
                 { "legal_name", n => { LegalName = n.GetStringValue(); } },
                 { "name", n => { Name = n.GetStringValue(); } },
@@ -185,7 +167,7 @@ namespace Marechai.App.Models
                 { "sold_day_is_unknown", n => { SoldDayIsUnknown = n.GetBoolValue(); } },
                 { "sold_month_is_unknown", n => { SoldMonthIsUnknown = n.GetBoolValue(); } },
                 { "sold_to", n => { SoldTo = n.GetStringValue(); } },
-                { "sold_to_id", n => { SoldToId = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
+                { "sold_to_id", n => { SoldToId = n.GetIntValue(); } },
                 { "status", n => { Status = n.GetIntValue(); } },
                 { "twitter", n => { Twitter = n.GetStringValue(); } },
                 { "website", n => { Website = n.GetStringValue(); } },
@@ -201,12 +183,12 @@ namespace Marechai.App.Models
             writer.WriteStringValue("address", Address);
             writer.WriteStringValue("city", City);
             writer.WriteStringValue("country", Country);
-            writer.WriteObjectValue<UntypedNode>("country_id", CountryId);
+            writer.WriteIntValue("country_id", CountryId);
             writer.WriteStringValue("facebook", Facebook);
             writer.WriteDateTimeOffsetValue("founded", Founded);
             writer.WriteBoolValue("founded_day_is_unknown", FoundedDayIsUnknown);
             writer.WriteBoolValue("founded_month_is_unknown", FoundedMonthIsUnknown);
-            writer.WriteObjectValue<UntypedNode>("id", Id);
+            writer.WriteIntValue("id", Id);
             writer.WriteGuidValue("last_logo", LastLogo);
             writer.WriteStringValue("legal_name", LegalName);
             writer.WriteStringValue("name", Name);
@@ -216,7 +198,7 @@ namespace Marechai.App.Models
             writer.WriteBoolValue("sold_day_is_unknown", SoldDayIsUnknown);
             writer.WriteBoolValue("sold_month_is_unknown", SoldMonthIsUnknown);
             writer.WriteStringValue("sold_to", SoldTo);
-            writer.WriteObjectValue<UntypedNode>("sold_to_id", SoldToId);
+            writer.WriteIntValue("sold_to_id", SoldToId);
             writer.WriteIntValue("status", Status);
             writer.WriteStringValue("twitter", Twitter);
             writer.WriteStringValue("website", Website);
diff --git a/Marechai.App/Services/Client/Models/CompanyLogoDto.cs b/Marechai.App/Services/Client/Models/CompanyLogoDto.cs
index 533ce1e4..291a24a9 100644
--- a/Marechai.App/Services/Client/Models/CompanyLogoDto.cs
+++ b/Marechai.App/Services/Client/Models/CompanyLogoDto.cs
@@ -15,31 +15,13 @@ namespace Marechai.App.Models
         /// <summary>Stores additional data not described in the OpenAPI description found when deserializing. Can be used for serialization as well.</summary>
         public IDictionary<string, object> AdditionalData { get; set; }
         /// <summary>The company_id property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? CompanyId { get; set; }
-#nullable restore
-#else
-        public UntypedNode CompanyId { get; set; }
-#endif
+        public int? CompanyId { get; set; }
         /// <summary>The guid property</summary>
         public Guid? Guid { get; set; }
         /// <summary>The id property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? Id { get; set; }
-#nullable restore
-#else
-        public UntypedNode Id { get; set; }
-#endif
+        public int? Id { get; set; }
         /// <summary>The year property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? Year { get; set; }
-#nullable restore
-#else
-        public UntypedNode Year { get; set; }
-#endif
+        public int? Year { get; set; }
         /// <summary>
         /// Instantiates a new <see cref="global::Marechai.App.Models.CompanyLogoDto"/> and sets the default values.
         /// </summary>
@@ -65,10 +47,10 @@ namespace Marechai.App.Models
         {
             return new Dictionary<string, Action<IParseNode>>
             {
-                { "company_id", n => { CompanyId = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
+                { "company_id", n => { CompanyId = n.GetIntValue(); } },
                 { "guid", n => { Guid = n.GetGuidValue(); } },
-                { "id", n => { Id = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
-                { "year", n => { Year = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
+                { "id", n => { Id = n.GetIntValue(); } },
+                { "year", n => { Year = n.GetIntValue(); } },
             };
         }
         /// <summary>
@@ -78,10 +60,10 @@ namespace Marechai.App.Models
         public virtual void Serialize(ISerializationWriter writer)
         {
             if(ReferenceEquals(writer, null)) throw new ArgumentNullException(nameof(writer));
-            writer.WriteObjectValue<UntypedNode>("company_id", CompanyId);
+            writer.WriteIntValue("company_id", CompanyId);
             writer.WriteGuidValue("guid", Guid);
-            writer.WriteObjectValue<UntypedNode>("id", Id);
-            writer.WriteObjectValue<UntypedNode>("year", Year);
+            writer.WriteIntValue("id", Id);
+            writer.WriteIntValue("year", Year);
             writer.WriteAdditionalData(AdditionalData);
         }
     }
diff --git a/Marechai.App/Services/Client/Models/CurrencyInflationDto.cs b/Marechai.App/Services/Client/Models/CurrencyInflationDto.cs
index eb12b391..82199b9c 100644
--- a/Marechai.App/Services/Client/Models/CurrencyInflationDto.cs
+++ b/Marechai.App/Services/Client/Models/CurrencyInflationDto.cs
@@ -23,21 +23,9 @@ namespace Marechai.App.Models
         public string Code { get; set; }
 #endif
         /// <summary>The id property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? Id { get; set; }
-#nullable restore
-#else
-        public UntypedNode Id { get; set; }
-#endif
+        public int? Id { get; set; }
         /// <summary>The inflation property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? Inflation { get; set; }
-#nullable restore
-#else
-        public UntypedNode Inflation { get; set; }
-#endif
+        public float? Inflation { get; set; }
         /// <summary>The name property</summary>
 #if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
 #nullable enable
@@ -47,13 +35,7 @@ namespace Marechai.App.Models
         public string Name { get; set; }
 #endif
         /// <summary>The year property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? Year { get; set; }
-#nullable restore
-#else
-        public UntypedNode Year { get; set; }
-#endif
+        public int? Year { get; set; }
         /// <summary>
         /// Instantiates a new <see cref="global::Marechai.App.Models.CurrencyInflationDto"/> and sets the default values.
         /// </summary>
@@ -80,10 +62,10 @@ namespace Marechai.App.Models
             return new Dictionary<string, Action<IParseNode>>
             {
                 { "code", n => { Code = n.GetStringValue(); } },
-                { "id", n => { Id = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
-                { "inflation", n => { Inflation = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
+                { "id", n => { Id = n.GetIntValue(); } },
+                { "inflation", n => { Inflation = n.GetFloatValue(); } },
                 { "name", n => { Name = n.GetStringValue(); } },
-                { "year", n => { Year = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
+                { "year", n => { Year = n.GetIntValue(); } },
             };
         }
         /// <summary>
@@ -94,10 +76,10 @@ namespace Marechai.App.Models
         {
             if(ReferenceEquals(writer, null)) throw new ArgumentNullException(nameof(writer));
             writer.WriteStringValue("code", Code);
-            writer.WriteObjectValue<UntypedNode>("id", Id);
-            writer.WriteObjectValue<UntypedNode>("inflation", Inflation);
+            writer.WriteIntValue("id", Id);
+            writer.WriteFloatValue("inflation", Inflation);
             writer.WriteStringValue("name", Name);
-            writer.WriteObjectValue<UntypedNode>("year", Year);
+            writer.WriteIntValue("year", Year);
             writer.WriteAdditionalData(AdditionalData);
         }
     }
diff --git a/Marechai.App/Services/Client/Models/CurrencyPeggingDto.cs b/Marechai.App/Services/Client/Models/CurrencyPeggingDto.cs
index 3d6a1632..3828fdb0 100644
--- a/Marechai.App/Services/Client/Models/CurrencyPeggingDto.cs
+++ b/Marechai.App/Services/Client/Models/CurrencyPeggingDto.cs
@@ -33,21 +33,9 @@ namespace Marechai.App.Models
         /// <summary>The end property</summary>
         public DateTimeOffset? End { get; set; }
         /// <summary>The id property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? Id { get; set; }
-#nullable restore
-#else
-        public UntypedNode Id { get; set; }
-#endif
+        public int? Id { get; set; }
         /// <summary>The ratio property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? Ratio { get; set; }
-#nullable restore
-#else
-        public UntypedNode Ratio { get; set; }
-#endif
+        public float? Ratio { get; set; }
         /// <summary>The source_code property</summary>
 #if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
 #nullable enable
@@ -94,8 +82,8 @@ namespace Marechai.App.Models
                 { "destination_code", n => { DestinationCode = n.GetStringValue(); } },
                 { "destination_name", n => { DestinationName = n.GetStringValue(); } },
                 { "end", n => { End = n.GetDateTimeOffsetValue(); } },
-                { "id", n => { Id = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
-                { "ratio", n => { Ratio = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
+                { "id", n => { Id = n.GetIntValue(); } },
+                { "ratio", n => { Ratio = n.GetFloatValue(); } },
                 { "source_code", n => { SourceCode = n.GetStringValue(); } },
                 { "source_name", n => { SourceName = n.GetStringValue(); } },
                 { "start", n => { Start = n.GetDateTimeOffsetValue(); } },
@@ -111,8 +99,8 @@ namespace Marechai.App.Models
             writer.WriteStringValue("destination_code", DestinationCode);
             writer.WriteStringValue("destination_name", DestinationName);
             writer.WriteDateTimeOffsetValue("end", End);
-            writer.WriteObjectValue<UntypedNode>("id", Id);
-            writer.WriteObjectValue<UntypedNode>("ratio", Ratio);
+            writer.WriteIntValue("id", Id);
+            writer.WriteFloatValue("ratio", Ratio);
             writer.WriteStringValue("source_code", SourceCode);
             writer.WriteStringValue("source_name", SourceName);
             writer.WriteDateTimeOffsetValue("start", Start);
diff --git a/Marechai.App/Services/Client/Models/DocumentByMachineDto.cs b/Marechai.App/Services/Client/Models/DocumentByMachineDto.cs
index 9db55a9d..009bfd9c 100644
--- a/Marechai.App/Services/Client/Models/DocumentByMachineDto.cs
+++ b/Marechai.App/Services/Client/Models/DocumentByMachineDto.cs
@@ -23,21 +23,9 @@ namespace Marechai.App.Models
         public string Document { get; set; }
 #endif
         /// <summary>The document_id property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? DocumentId { get; set; }
-#nullable restore
-#else
-        public UntypedNode DocumentId { get; set; }
-#endif
+        public long? DocumentId { get; set; }
         /// <summary>The id property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? Id { get; set; }
-#nullable restore
-#else
-        public UntypedNode Id { get; set; }
-#endif
+        public long? Id { get; set; }
         /// <summary>The machine property</summary>
 #if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
 #nullable enable
@@ -47,13 +35,7 @@ namespace Marechai.App.Models
         public string Machine { get; set; }
 #endif
         /// <summary>The machine_id property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? MachineId { get; set; }
-#nullable restore
-#else
-        public UntypedNode MachineId { get; set; }
-#endif
+        public int? MachineId { get; set; }
         /// <summary>
         /// Instantiates a new <see cref="global::Marechai.App.Models.DocumentByMachineDto"/> and sets the default values.
         /// </summary>
@@ -80,10 +62,10 @@ namespace Marechai.App.Models
             return new Dictionary<string, Action<IParseNode>>
             {
                 { "document", n => { Document = n.GetStringValue(); } },
-                { "document_id", n => { DocumentId = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
-                { "id", n => { Id = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
+                { "document_id", n => { DocumentId = n.GetLongValue(); } },
+                { "id", n => { Id = n.GetLongValue(); } },
                 { "machine", n => { Machine = n.GetStringValue(); } },
-                { "machine_id", n => { MachineId = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
+                { "machine_id", n => { MachineId = n.GetIntValue(); } },
             };
         }
         /// <summary>
@@ -94,10 +76,10 @@ namespace Marechai.App.Models
         {
             if(ReferenceEquals(writer, null)) throw new ArgumentNullException(nameof(writer));
             writer.WriteStringValue("document", Document);
-            writer.WriteObjectValue<UntypedNode>("document_id", DocumentId);
-            writer.WriteObjectValue<UntypedNode>("id", Id);
+            writer.WriteLongValue("document_id", DocumentId);
+            writer.WriteLongValue("id", Id);
             writer.WriteStringValue("machine", Machine);
-            writer.WriteObjectValue<UntypedNode>("machine_id", MachineId);
+            writer.WriteIntValue("machine_id", MachineId);
             writer.WriteAdditionalData(AdditionalData);
         }
     }
diff --git a/Marechai.App/Services/Client/Models/DocumentByMachineFamilyDto.cs b/Marechai.App/Services/Client/Models/DocumentByMachineFamilyDto.cs
index 6359085d..093f0163 100644
--- a/Marechai.App/Services/Client/Models/DocumentByMachineFamilyDto.cs
+++ b/Marechai.App/Services/Client/Models/DocumentByMachineFamilyDto.cs
@@ -23,21 +23,9 @@ namespace Marechai.App.Models
         public string Document { get; set; }
 #endif
         /// <summary>The document_id property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? DocumentId { get; set; }
-#nullable restore
-#else
-        public UntypedNode DocumentId { get; set; }
-#endif
+        public long? DocumentId { get; set; }
         /// <summary>The id property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? Id { get; set; }
-#nullable restore
-#else
-        public UntypedNode Id { get; set; }
-#endif
+        public long? Id { get; set; }
         /// <summary>The machine_family property</summary>
 #if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
 #nullable enable
@@ -47,13 +35,7 @@ namespace Marechai.App.Models
         public string MachineFamily { get; set; }
 #endif
         /// <summary>The machine_family_id property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? MachineFamilyId { get; set; }
-#nullable restore
-#else
-        public UntypedNode MachineFamilyId { get; set; }
-#endif
+        public int? MachineFamilyId { get; set; }
         /// <summary>
         /// Instantiates a new <see cref="global::Marechai.App.Models.DocumentByMachineFamilyDto"/> and sets the default values.
         /// </summary>
@@ -80,10 +62,10 @@ namespace Marechai.App.Models
             return new Dictionary<string, Action<IParseNode>>
             {
                 { "document", n => { Document = n.GetStringValue(); } },
-                { "document_id", n => { DocumentId = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
-                { "id", n => { Id = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
+                { "document_id", n => { DocumentId = n.GetLongValue(); } },
+                { "id", n => { Id = n.GetLongValue(); } },
                 { "machine_family", n => { MachineFamily = n.GetStringValue(); } },
-                { "machine_family_id", n => { MachineFamilyId = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
+                { "machine_family_id", n => { MachineFamilyId = n.GetIntValue(); } },
             };
         }
         /// <summary>
@@ -94,10 +76,10 @@ namespace Marechai.App.Models
         {
             if(ReferenceEquals(writer, null)) throw new ArgumentNullException(nameof(writer));
             writer.WriteStringValue("document", Document);
-            writer.WriteObjectValue<UntypedNode>("document_id", DocumentId);
-            writer.WriteObjectValue<UntypedNode>("id", Id);
+            writer.WriteLongValue("document_id", DocumentId);
+            writer.WriteLongValue("id", Id);
             writer.WriteStringValue("machine_family", MachineFamily);
-            writer.WriteObjectValue<UntypedNode>("machine_family_id", MachineFamilyId);
+            writer.WriteIntValue("machine_family_id", MachineFamilyId);
             writer.WriteAdditionalData(AdditionalData);
         }
     }
diff --git a/Marechai.App/Services/Client/Models/DocumentCompanyDto.cs b/Marechai.App/Services/Client/Models/DocumentCompanyDto.cs
index 3072525e..68072ed9 100644
--- a/Marechai.App/Services/Client/Models/DocumentCompanyDto.cs
+++ b/Marechai.App/Services/Client/Models/DocumentCompanyDto.cs
@@ -23,21 +23,9 @@ namespace Marechai.App.Models
         public string Company { get; set; }
 #endif
         /// <summary>The company_id property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? CompanyId { get; set; }
-#nullable restore
-#else
-        public UntypedNode CompanyId { get; set; }
-#endif
+        public int? CompanyId { get; set; }
         /// <summary>The id property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? Id { get; set; }
-#nullable restore
-#else
-        public UntypedNode Id { get; set; }
-#endif
+        public int? Id { get; set; }
         /// <summary>The name property</summary>
 #if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
 #nullable enable
@@ -72,8 +60,8 @@ namespace Marechai.App.Models
             return new Dictionary<string, Action<IParseNode>>
             {
                 { "company", n => { Company = n.GetStringValue(); } },
-                { "company_id", n => { CompanyId = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
-                { "id", n => { Id = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
+                { "company_id", n => { CompanyId = n.GetIntValue(); } },
+                { "id", n => { Id = n.GetIntValue(); } },
                 { "name", n => { Name = n.GetStringValue(); } },
             };
         }
@@ -85,8 +73,8 @@ namespace Marechai.App.Models
         {
             if(ReferenceEquals(writer, null)) throw new ArgumentNullException(nameof(writer));
             writer.WriteStringValue("company", Company);
-            writer.WriteObjectValue<UntypedNode>("company_id", CompanyId);
-            writer.WriteObjectValue<UntypedNode>("id", Id);
+            writer.WriteIntValue("company_id", CompanyId);
+            writer.WriteIntValue("id", Id);
             writer.WriteStringValue("name", Name);
             writer.WriteAdditionalData(AdditionalData);
         }
diff --git a/Marechai.App/Services/Client/Models/DocumentDto.cs b/Marechai.App/Services/Client/Models/DocumentDto.cs
index a1221a51..931f2655 100644
--- a/Marechai.App/Services/Client/Models/DocumentDto.cs
+++ b/Marechai.App/Services/Client/Models/DocumentDto.cs
@@ -23,21 +23,9 @@ namespace Marechai.App.Models
         public string Country { get; set; }
 #endif
         /// <summary>The country_id property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? CountryId { get; set; }
-#nullable restore
-#else
-        public UntypedNode CountryId { get; set; }
-#endif
+        public int? CountryId { get; set; }
         /// <summary>The id property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? Id { get; set; }
-#nullable restore
-#else
-        public UntypedNode Id { get; set; }
-#endif
+        public long? Id { get; set; }
         /// <summary>The native_title property</summary>
 #if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
 #nullable enable
@@ -90,8 +78,8 @@ namespace Marechai.App.Models
             return new Dictionary<string, Action<IParseNode>>
             {
                 { "country", n => { Country = n.GetStringValue(); } },
-                { "country_id", n => { CountryId = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
-                { "id", n => { Id = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
+                { "country_id", n => { CountryId = n.GetIntValue(); } },
+                { "id", n => { Id = n.GetLongValue(); } },
                 { "native_title", n => { NativeTitle = n.GetStringValue(); } },
                 { "published", n => { Published = n.GetDateTimeOffsetValue(); } },
                 { "synopsis", n => { Synopsis = n.GetStringValue(); } },
@@ -106,8 +94,8 @@ namespace Marechai.App.Models
         {
             if(ReferenceEquals(writer, null)) throw new ArgumentNullException(nameof(writer));
             writer.WriteStringValue("country", Country);
-            writer.WriteObjectValue<UntypedNode>("country_id", CountryId);
-            writer.WriteObjectValue<UntypedNode>("id", Id);
+            writer.WriteIntValue("country_id", CountryId);
+            writer.WriteLongValue("id", Id);
             writer.WriteStringValue("native_title", NativeTitle);
             writer.WriteDateTimeOffsetValue("published", Published);
             writer.WriteStringValue("synopsis", Synopsis);
diff --git a/Marechai.App/Services/Client/Models/DocumentPersonDto.cs b/Marechai.App/Services/Client/Models/DocumentPersonDto.cs
index e84cbc86..2726df96 100644
--- a/Marechai.App/Services/Client/Models/DocumentPersonDto.cs
+++ b/Marechai.App/Services/Client/Models/DocumentPersonDto.cs
@@ -31,13 +31,7 @@ namespace Marechai.App.Models
         public string DisplayName { get; set; }
 #endif
         /// <summary>The id property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? Id { get; set; }
-#nullable restore
-#else
-        public UntypedNode Id { get; set; }
-#endif
+        public int? Id { get; set; }
         /// <summary>The name property</summary>
 #if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
 #nullable enable
@@ -55,13 +49,7 @@ namespace Marechai.App.Models
         public string Person { get; set; }
 #endif
         /// <summary>The person_id property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? PersonId { get; set; }
-#nullable restore
-#else
-        public UntypedNode PersonId { get; set; }
-#endif
+        public int? PersonId { get; set; }
         /// <summary>The surname property</summary>
 #if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
 #nullable enable
@@ -97,10 +85,10 @@ namespace Marechai.App.Models
             {
                 { "alias", n => { Alias = n.GetStringValue(); } },
                 { "display_name", n => { DisplayName = n.GetStringValue(); } },
-                { "id", n => { Id = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
+                { "id", n => { Id = n.GetIntValue(); } },
                 { "name", n => { Name = n.GetStringValue(); } },
                 { "person", n => { Person = n.GetStringValue(); } },
-                { "person_id", n => { PersonId = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
+                { "person_id", n => { PersonId = n.GetIntValue(); } },
                 { "surname", n => { Surname = n.GetStringValue(); } },
             };
         }
@@ -113,10 +101,10 @@ namespace Marechai.App.Models
             if(ReferenceEquals(writer, null)) throw new ArgumentNullException(nameof(writer));
             writer.WriteStringValue("alias", Alias);
             writer.WriteStringValue("display_name", DisplayName);
-            writer.WriteObjectValue<UntypedNode>("id", Id);
+            writer.WriteIntValue("id", Id);
             writer.WriteStringValue("name", Name);
             writer.WriteStringValue("person", Person);
-            writer.WriteObjectValue<UntypedNode>("person_id", PersonId);
+            writer.WriteIntValue("person_id", PersonId);
             writer.WriteStringValue("surname", Surname);
             writer.WriteAdditionalData(AdditionalData);
         }
diff --git a/Marechai.App/Services/Client/Models/DocumentScanDto.cs b/Marechai.App/Services/Client/Models/DocumentScanDto.cs
index 80fa0929..1d4a8096 100644
--- a/Marechai.App/Services/Client/Models/DocumentScanDto.cs
+++ b/Marechai.App/Services/Client/Models/DocumentScanDto.cs
@@ -49,13 +49,7 @@ namespace Marechai.App.Models
         public string Document { get; set; }
 #endif
         /// <summary>The document_id property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? DocumentId { get; set; }
-#nullable restore
-#else
-        public UntypedNode DocumentId { get; set; }
-#endif
+        public long? DocumentId { get; set; }
         /// <summary>The exif_version property</summary>
 #if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
 #nullable enable
@@ -65,13 +59,7 @@ namespace Marechai.App.Models
         public string ExifVersion { get; set; }
 #endif
         /// <summary>The horizontal_resolution property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? HorizontalResolution { get; set; }
-#nullable restore
-#else
-        public UntypedNode HorizontalResolution { get; set; }
-#endif
+        public double? HorizontalResolution { get; set; }
         /// <summary>The id property</summary>
         public Guid? Id { get; set; }
         /// <summary>The original_extension property</summary>
@@ -83,13 +71,7 @@ namespace Marechai.App.Models
         public string OriginalExtension { get; set; }
 #endif
         /// <summary>The page property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? Page { get; set; }
-#nullable restore
-#else
-        public UntypedNode Page { get; set; }
-#endif
+        public int? Page { get; set; }
         /// <summary>The resolution_unit property</summary>
 #if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
 #nullable enable
@@ -135,13 +117,7 @@ namespace Marechai.App.Models
         public string UserId { get; set; }
 #endif
         /// <summary>The vertical_resolution property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? VerticalResolution { get; set; }
-#nullable restore
-#else
-        public UntypedNode VerticalResolution { get; set; }
-#endif
+        public double? VerticalResolution { get; set; }
         /// <summary>
         /// Instantiates a new <see cref="global::Marechai.App.Models.DocumentScanDto"/> and sets the default values.
         /// </summary>
@@ -172,12 +148,12 @@ namespace Marechai.App.Models
                 { "comments", n => { Comments = n.GetStringValue(); } },
                 { "creation_date", n => { CreationDate = n.GetDateTimeOffsetValue(); } },
                 { "document", n => { Document = n.GetStringValue(); } },
-                { "document_id", n => { DocumentId = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
+                { "document_id", n => { DocumentId = n.GetLongValue(); } },
                 { "exif_version", n => { ExifVersion = n.GetStringValue(); } },
-                { "horizontal_resolution", n => { HorizontalResolution = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
+                { "horizontal_resolution", n => { HorizontalResolution = n.GetDoubleValue(); } },
                 { "id", n => { Id = n.GetGuidValue(); } },
                 { "original_extension", n => { OriginalExtension = n.GetStringValue(); } },
-                { "page", n => { Page = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
+                { "page", n => { Page = n.GetIntValue(); } },
                 { "resolution_unit", n => { ResolutionUnit = n.GetObjectValue<global::Marechai.App.Models.DocumentScanDto.DocumentScanDto_resolution_unit>(global::Marechai.App.Models.DocumentScanDto.DocumentScanDto_resolution_unit.CreateFromDiscriminatorValue); } },
                 { "scanner_manufacturer", n => { ScannerManufacturer = n.GetStringValue(); } },
                 { "scanner_model", n => { ScannerModel = n.GetStringValue(); } },
@@ -185,7 +161,7 @@ namespace Marechai.App.Models
                 { "type", n => { Type = n.GetIntValue(); } },
                 { "upload_date", n => { UploadDate = n.GetDateTimeOffsetValue(); } },
                 { "user_id", n => { UserId = n.GetStringValue(); } },
-                { "vertical_resolution", n => { VerticalResolution = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
+                { "vertical_resolution", n => { VerticalResolution = n.GetDoubleValue(); } },
             };
         }
         /// <summary>
@@ -200,12 +176,12 @@ namespace Marechai.App.Models
             writer.WriteStringValue("comments", Comments);
             writer.WriteDateTimeOffsetValue("creation_date", CreationDate);
             writer.WriteStringValue("document", Document);
-            writer.WriteObjectValue<UntypedNode>("document_id", DocumentId);
+            writer.WriteLongValue("document_id", DocumentId);
             writer.WriteStringValue("exif_version", ExifVersion);
-            writer.WriteObjectValue<UntypedNode>("horizontal_resolution", HorizontalResolution);
+            writer.WriteDoubleValue("horizontal_resolution", HorizontalResolution);
             writer.WriteGuidValue("id", Id);
             writer.WriteStringValue("original_extension", OriginalExtension);
-            writer.WriteObjectValue<UntypedNode>("page", Page);
+            writer.WriteIntValue("page", Page);
             writer.WriteObjectValue<global::Marechai.App.Models.DocumentScanDto.DocumentScanDto_resolution_unit>("resolution_unit", ResolutionUnit);
             writer.WriteStringValue("scanner_manufacturer", ScannerManufacturer);
             writer.WriteStringValue("scanner_model", ScannerModel);
@@ -213,7 +189,7 @@ namespace Marechai.App.Models
             writer.WriteIntValue("type", Type);
             writer.WriteDateTimeOffsetValue("upload_date", UploadDate);
             writer.WriteStringValue("user_id", UserId);
-            writer.WriteObjectValue<UntypedNode>("vertical_resolution", VerticalResolution);
+            writer.WriteDoubleValue("vertical_resolution", VerticalResolution);
             writer.WriteAdditionalData(AdditionalData);
         }
         /// <summary>
diff --git a/Marechai.App/Services/Client/Models/DumpDto.cs b/Marechai.App/Services/Client/Models/DumpDto.cs
index 2961e8fc..5887af2f 100644
--- a/Marechai.App/Services/Client/Models/DumpDto.cs
+++ b/Marechai.App/Services/Client/Models/DumpDto.cs
@@ -33,29 +33,11 @@ namespace Marechai.App.Models
         public string DumpingGroup { get; set; }
 #endif
         /// <summary>The id property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? Id { get; set; }
-#nullable restore
-#else
-        public UntypedNode Id { get; set; }
-#endif
+        public int? Id { get; set; }
         /// <summary>The media_dump_id property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? MediaDumpId { get; set; }
-#nullable restore
-#else
-        public UntypedNode MediaDumpId { get; set; }
-#endif
+        public int? MediaDumpId { get; set; }
         /// <summary>The media_id property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? MediaId { get; set; }
-#nullable restore
-#else
-        public UntypedNode MediaId { get; set; }
-#endif
+        public int? MediaId { get; set; }
         /// <summary>The media_title property</summary>
 #if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
 #nullable enable
@@ -108,9 +90,9 @@ namespace Marechai.App.Models
                 { "dump_date", n => { DumpDate = n.GetDateTimeOffsetValue(); } },
                 { "dumper", n => { Dumper = n.GetStringValue(); } },
                 { "dumping_group", n => { DumpingGroup = n.GetStringValue(); } },
-                { "id", n => { Id = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
-                { "media_dump_id", n => { MediaDumpId = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
-                { "media_id", n => { MediaId = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
+                { "id", n => { Id = n.GetIntValue(); } },
+                { "media_dump_id", n => { MediaDumpId = n.GetIntValue(); } },
+                { "media_id", n => { MediaId = n.GetIntValue(); } },
                 { "media_title", n => { MediaTitle = n.GetStringValue(); } },
                 { "user_id", n => { UserId = n.GetStringValue(); } },
                 { "username", n => { Username = n.GetStringValue(); } },
@@ -126,9 +108,9 @@ namespace Marechai.App.Models
             writer.WriteDateTimeOffsetValue("dump_date", DumpDate);
             writer.WriteStringValue("dumper", Dumper);
             writer.WriteStringValue("dumping_group", DumpingGroup);
-            writer.WriteObjectValue<UntypedNode>("id", Id);
-            writer.WriteObjectValue<UntypedNode>("media_dump_id", MediaDumpId);
-            writer.WriteObjectValue<UntypedNode>("media_id", MediaId);
+            writer.WriteIntValue("id", Id);
+            writer.WriteIntValue("media_dump_id", MediaDumpId);
+            writer.WriteIntValue("media_id", MediaId);
             writer.WriteStringValue("media_title", MediaTitle);
             writer.WriteStringValue("user_id", UserId);
             writer.WriteStringValue("username", Username);
diff --git a/Marechai.App/Services/Client/Models/GpuByMachineDto.cs b/Marechai.App/Services/Client/Models/GpuByMachineDto.cs
index 164af8f4..b8df8cc8 100644
--- a/Marechai.App/Services/Client/Models/GpuByMachineDto.cs
+++ b/Marechai.App/Services/Client/Models/GpuByMachineDto.cs
@@ -23,29 +23,11 @@ namespace Marechai.App.Models
         public string Company { get; set; }
 #endif
         /// <summary>The gpu_id property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? GpuId { get; set; }
-#nullable restore
-#else
-        public UntypedNode GpuId { get; set; }
-#endif
+        public int? GpuId { get; set; }
         /// <summary>The id property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? Id { get; set; }
-#nullable restore
-#else
-        public UntypedNode Id { get; set; }
-#endif
+        public long? Id { get; set; }
         /// <summary>The machine_id property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? MachineId { get; set; }
-#nullable restore
-#else
-        public UntypedNode MachineId { get; set; }
-#endif
+        public int? MachineId { get; set; }
         /// <summary>The name property</summary>
 #if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
 #nullable enable
@@ -80,9 +62,9 @@ namespace Marechai.App.Models
             return new Dictionary<string, Action<IParseNode>>
             {
                 { "company", n => { Company = n.GetStringValue(); } },
-                { "gpu_id", n => { GpuId = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
-                { "id", n => { Id = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
-                { "machine_id", n => { MachineId = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
+                { "gpu_id", n => { GpuId = n.GetIntValue(); } },
+                { "id", n => { Id = n.GetLongValue(); } },
+                { "machine_id", n => { MachineId = n.GetIntValue(); } },
                 { "name", n => { Name = n.GetStringValue(); } },
             };
         }
@@ -94,9 +76,9 @@ namespace Marechai.App.Models
         {
             if(ReferenceEquals(writer, null)) throw new ArgumentNullException(nameof(writer));
             writer.WriteStringValue("company", Company);
-            writer.WriteObjectValue<UntypedNode>("gpu_id", GpuId);
-            writer.WriteObjectValue<UntypedNode>("id", Id);
-            writer.WriteObjectValue<UntypedNode>("machine_id", MachineId);
+            writer.WriteIntValue("gpu_id", GpuId);
+            writer.WriteLongValue("id", Id);
+            writer.WriteIntValue("machine_id", MachineId);
             writer.WriteStringValue("name", Name);
             writer.WriteAdditionalData(AdditionalData);
         }
diff --git a/Marechai.App/Services/Client/Models/GpuDto.cs b/Marechai.App/Services/Client/Models/GpuDto.cs
index 17bd2d10..76796cb1 100644
--- a/Marechai.App/Services/Client/Models/GpuDto.cs
+++ b/Marechai.App/Services/Client/Models/GpuDto.cs
@@ -23,29 +23,11 @@ namespace Marechai.App.Models
         public string Company { get; set; }
 #endif
         /// <summary>The company_id property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? CompanyId { get; set; }
-#nullable restore
-#else
-        public UntypedNode CompanyId { get; set; }
-#endif
+        public int? CompanyId { get; set; }
         /// <summary>The die_size property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? DieSize { get; set; }
-#nullable restore
-#else
-        public UntypedNode DieSize { get; set; }
-#endif
+        public float? DieSize { get; set; }
         /// <summary>The id property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? Id { get; set; }
-#nullable restore
-#else
-        public UntypedNode Id { get; set; }
-#endif
+        public int? Id { get; set; }
         /// <summary>The introduced property</summary>
         public DateTimeOffset? Introduced { get; set; }
         /// <summary>The model_code property</summary>
@@ -81,21 +63,9 @@ namespace Marechai.App.Models
         public string Process { get; set; }
 #endif
         /// <summary>The process_nm property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? ProcessNm { get; set; }
-#nullable restore
-#else
-        public UntypedNode ProcessNm { get; set; }
-#endif
+        public float? ProcessNm { get; set; }
         /// <summary>The transistors property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? Transistors { get; set; }
-#nullable restore
-#else
-        public UntypedNode Transistors { get; set; }
-#endif
+        public long? Transistors { get; set; }
         /// <summary>
         /// Instantiates a new <see cref="global::Marechai.App.Models.GpuDto"/> and sets the default values.
         /// </summary>
@@ -122,16 +92,16 @@ namespace Marechai.App.Models
             return new Dictionary<string, Action<IParseNode>>
             {
                 { "company", n => { Company = n.GetStringValue(); } },
-                { "company_id", n => { CompanyId = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
-                { "die_size", n => { DieSize = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
-                { "id", n => { Id = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
+                { "company_id", n => { CompanyId = n.GetIntValue(); } },
+                { "die_size", n => { DieSize = n.GetFloatValue(); } },
+                { "id", n => { Id = n.GetIntValue(); } },
                 { "introduced", n => { Introduced = n.GetDateTimeOffsetValue(); } },
                 { "model_code", n => { ModelCode = n.GetStringValue(); } },
                 { "name", n => { Name = n.GetStringValue(); } },
                 { "package", n => { Package = n.GetStringValue(); } },
                 { "process", n => { Process = n.GetStringValue(); } },
-                { "process_nm", n => { ProcessNm = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
-                { "transistors", n => { Transistors = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
+                { "process_nm", n => { ProcessNm = n.GetFloatValue(); } },
+                { "transistors", n => { Transistors = n.GetLongValue(); } },
             };
         }
         /// <summary>
@@ -142,16 +112,16 @@ namespace Marechai.App.Models
         {
             if(ReferenceEquals(writer, null)) throw new ArgumentNullException(nameof(writer));
             writer.WriteStringValue("company", Company);
-            writer.WriteObjectValue<UntypedNode>("company_id", CompanyId);
-            writer.WriteObjectValue<UntypedNode>("die_size", DieSize);
-            writer.WriteObjectValue<UntypedNode>("id", Id);
+            writer.WriteIntValue("company_id", CompanyId);
+            writer.WriteFloatValue("die_size", DieSize);
+            writer.WriteIntValue("id", Id);
             writer.WriteDateTimeOffsetValue("introduced", Introduced);
             writer.WriteStringValue("model_code", ModelCode);
             writer.WriteStringValue("name", Name);
             writer.WriteStringValue("package", Package);
             writer.WriteStringValue("process", Process);
-            writer.WriteObjectValue<UntypedNode>("process_nm", ProcessNm);
-            writer.WriteObjectValue<UntypedNode>("transistors", Transistors);
+            writer.WriteFloatValue("process_nm", ProcessNm);
+            writer.WriteLongValue("transistors", Transistors);
             writer.WriteAdditionalData(AdditionalData);
         }
     }
diff --git a/Marechai.App/Services/Client/Models/InstructionSetDto.cs b/Marechai.App/Services/Client/Models/InstructionSetDto.cs
index 36a153be..44186724 100644
--- a/Marechai.App/Services/Client/Models/InstructionSetDto.cs
+++ b/Marechai.App/Services/Client/Models/InstructionSetDto.cs
@@ -15,13 +15,7 @@ namespace Marechai.App.Models
         /// <summary>Stores additional data not described in the OpenAPI description found when deserializing. Can be used for serialization as well.</summary>
         public IDictionary<string, object> AdditionalData { get; set; }
         /// <summary>The id property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? Id { get; set; }
-#nullable restore
-#else
-        public UntypedNode Id { get; set; }
-#endif
+        public int? Id { get; set; }
         /// <summary>The name property</summary>
 #if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
 #nullable enable
@@ -55,7 +49,7 @@ namespace Marechai.App.Models
         {
             return new Dictionary<string, Action<IParseNode>>
             {
-                { "id", n => { Id = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
+                { "id", n => { Id = n.GetIntValue(); } },
                 { "name", n => { Name = n.GetStringValue(); } },
             };
         }
@@ -66,7 +60,7 @@ namespace Marechai.App.Models
         public virtual void Serialize(ISerializationWriter writer)
         {
             if(ReferenceEquals(writer, null)) throw new ArgumentNullException(nameof(writer));
-            writer.WriteObjectValue<UntypedNode>("id", Id);
+            writer.WriteIntValue("id", Id);
             writer.WriteStringValue("name", Name);
             writer.WriteAdditionalData(AdditionalData);
         }
diff --git a/Marechai.App/Services/Client/Models/InstructionSetExtensionByProcessorDto.cs b/Marechai.App/Services/Client/Models/InstructionSetExtensionByProcessorDto.cs
index 752158bd..2c6b5187 100644
--- a/Marechai.App/Services/Client/Models/InstructionSetExtensionByProcessorDto.cs
+++ b/Marechai.App/Services/Client/Models/InstructionSetExtensionByProcessorDto.cs
@@ -15,13 +15,7 @@ namespace Marechai.App.Models
         /// <summary>Stores additional data not described in the OpenAPI description found when deserializing. Can be used for serialization as well.</summary>
         public IDictionary<string, object> AdditionalData { get; set; }
         /// <summary>The extension_id property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? ExtensionId { get; set; }
-#nullable restore
-#else
-        public UntypedNode ExtensionId { get; set; }
-#endif
+        public int? ExtensionId { get; set; }
         /// <summary>The extensions property</summary>
 #if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
 #nullable enable
@@ -31,13 +25,7 @@ namespace Marechai.App.Models
         public string Extensions { get; set; }
 #endif
         /// <summary>The id property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? Id { get; set; }
-#nullable restore
-#else
-        public UntypedNode Id { get; set; }
-#endif
+        public int? Id { get; set; }
         /// <summary>The processor property</summary>
 #if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
 #nullable enable
@@ -47,13 +35,7 @@ namespace Marechai.App.Models
         public string Processor { get; set; }
 #endif
         /// <summary>The processor_id property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? ProcessorId { get; set; }
-#nullable restore
-#else
-        public UntypedNode ProcessorId { get; set; }
-#endif
+        public int? ProcessorId { get; set; }
         /// <summary>
         /// Instantiates a new <see cref="global::Marechai.App.Models.InstructionSetExtensionByProcessorDto"/> and sets the default values.
         /// </summary>
@@ -79,11 +61,11 @@ namespace Marechai.App.Models
         {
             return new Dictionary<string, Action<IParseNode>>
             {
-                { "extension_id", n => { ExtensionId = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
+                { "extension_id", n => { ExtensionId = n.GetIntValue(); } },
                 { "extensions", n => { Extensions = n.GetStringValue(); } },
-                { "id", n => { Id = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
+                { "id", n => { Id = n.GetIntValue(); } },
                 { "processor", n => { Processor = n.GetStringValue(); } },
-                { "processor_id", n => { ProcessorId = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
+                { "processor_id", n => { ProcessorId = n.GetIntValue(); } },
             };
         }
         /// <summary>
@@ -93,11 +75,11 @@ namespace Marechai.App.Models
         public virtual void Serialize(ISerializationWriter writer)
         {
             if(ReferenceEquals(writer, null)) throw new ArgumentNullException(nameof(writer));
-            writer.WriteObjectValue<UntypedNode>("extension_id", ExtensionId);
+            writer.WriteIntValue("extension_id", ExtensionId);
             writer.WriteStringValue("extensions", Extensions);
-            writer.WriteObjectValue<UntypedNode>("id", Id);
+            writer.WriteIntValue("id", Id);
             writer.WriteStringValue("processor", Processor);
-            writer.WriteObjectValue<UntypedNode>("processor_id", ProcessorId);
+            writer.WriteIntValue("processor_id", ProcessorId);
             writer.WriteAdditionalData(AdditionalData);
         }
     }
diff --git a/Marechai.App/Services/Client/Models/InstructionSetExtensionDto.cs b/Marechai.App/Services/Client/Models/InstructionSetExtensionDto.cs
index 8652d4a3..08e1f49f 100644
--- a/Marechai.App/Services/Client/Models/InstructionSetExtensionDto.cs
+++ b/Marechai.App/Services/Client/Models/InstructionSetExtensionDto.cs
@@ -23,13 +23,7 @@ namespace Marechai.App.Models
         public string Extension { get; set; }
 #endif
         /// <summary>The id property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? Id { get; set; }
-#nullable restore
-#else
-        public UntypedNode Id { get; set; }
-#endif
+        public int? Id { get; set; }
         /// <summary>
         /// Instantiates a new <see cref="global::Marechai.App.Models.InstructionSetExtensionDto"/> and sets the default values.
         /// </summary>
@@ -56,7 +50,7 @@ namespace Marechai.App.Models
             return new Dictionary<string, Action<IParseNode>>
             {
                 { "extension", n => { Extension = n.GetStringValue(); } },
-                { "id", n => { Id = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
+                { "id", n => { Id = n.GetIntValue(); } },
             };
         }
         /// <summary>
@@ -67,7 +61,7 @@ namespace Marechai.App.Models
         {
             if(ReferenceEquals(writer, null)) throw new ArgumentNullException(nameof(writer));
             writer.WriteStringValue("extension", Extension);
-            writer.WriteObjectValue<UntypedNode>("id", Id);
+            writer.WriteIntValue("id", Id);
             writer.WriteAdditionalData(AdditionalData);
         }
     }
diff --git a/Marechai.App/Services/Client/Models/Iso31661NumericDto.cs b/Marechai.App/Services/Client/Models/Iso31661NumericDto.cs
index 3d41056a..616fd2d0 100644
--- a/Marechai.App/Services/Client/Models/Iso31661NumericDto.cs
+++ b/Marechai.App/Services/Client/Models/Iso31661NumericDto.cs
@@ -15,13 +15,7 @@ namespace Marechai.App.Models
         /// <summary>Stores additional data not described in the OpenAPI description found when deserializing. Can be used for serialization as well.</summary>
         public IDictionary<string, object> AdditionalData { get; set; }
         /// <summary>The id property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? Id { get; set; }
-#nullable restore
-#else
-        public UntypedNode Id { get; set; }
-#endif
+        public int? Id { get; set; }
         /// <summary>The name property</summary>
 #if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
 #nullable enable
@@ -55,7 +49,7 @@ namespace Marechai.App.Models
         {
             return new Dictionary<string, Action<IParseNode>>
             {
-                { "id", n => { Id = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
+                { "id", n => { Id = n.GetIntValue(); } },
                 { "name", n => { Name = n.GetStringValue(); } },
             };
         }
@@ -66,7 +60,7 @@ namespace Marechai.App.Models
         public virtual void Serialize(ISerializationWriter writer)
         {
             if(ReferenceEquals(writer, null)) throw new ArgumentNullException(nameof(writer));
-            writer.WriteObjectValue<UntypedNode>("id", Id);
+            writer.WriteIntValue("id", Id);
             writer.WriteStringValue("name", Name);
             writer.WriteAdditionalData(AdditionalData);
         }
diff --git a/Marechai.App/Services/Client/Models/Iso4217Dto.cs b/Marechai.App/Services/Client/Models/Iso4217Dto.cs
index e1948c25..87d670af 100644
--- a/Marechai.App/Services/Client/Models/Iso4217Dto.cs
+++ b/Marechai.App/Services/Client/Models/Iso4217Dto.cs
@@ -23,13 +23,7 @@ namespace Marechai.App.Models
         public string Code { get; set; }
 #endif
         /// <summary>The minor_units property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? MinorUnits { get; set; }
-#nullable restore
-#else
-        public UntypedNode MinorUnits { get; set; }
-#endif
+        public byte? MinorUnits { get; set; }
         /// <summary>The name property</summary>
 #if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
 #nullable enable
@@ -39,13 +33,7 @@ namespace Marechai.App.Models
         public string Name { get; set; }
 #endif
         /// <summary>The numeric property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? Numeric { get; set; }
-#nullable restore
-#else
-        public UntypedNode Numeric { get; set; }
-#endif
+        public int? Numeric { get; set; }
         /// <summary>The withdrawn property</summary>
         public DateTimeOffset? Withdrawn { get; set; }
         /// <summary>
@@ -74,9 +62,9 @@ namespace Marechai.App.Models
             return new Dictionary<string, Action<IParseNode>>
             {
                 { "code", n => { Code = n.GetStringValue(); } },
-                { "minor_units", n => { MinorUnits = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
+                { "minor_units", n => { MinorUnits = n.GetByteValue(); } },
                 { "name", n => { Name = n.GetStringValue(); } },
-                { "numeric", n => { Numeric = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
+                { "numeric", n => { Numeric = n.GetIntValue(); } },
                 { "withdrawn", n => { Withdrawn = n.GetDateTimeOffsetValue(); } },
             };
         }
@@ -88,9 +76,9 @@ namespace Marechai.App.Models
         {
             if(ReferenceEquals(writer, null)) throw new ArgumentNullException(nameof(writer));
             writer.WriteStringValue("code", Code);
-            writer.WriteObjectValue<UntypedNode>("minor_units", MinorUnits);
+            writer.WriteByteValue("minor_units", MinorUnits);
             writer.WriteStringValue("name", Name);
-            writer.WriteObjectValue<UntypedNode>("numeric", Numeric);
+            writer.WriteIntValue("numeric", Numeric);
             writer.WriteDateTimeOffsetValue("withdrawn", Withdrawn);
             writer.WriteAdditionalData(AdditionalData);
         }
diff --git a/Marechai.App/Services/Client/Models/LicenseDto.cs b/Marechai.App/Services/Client/Models/LicenseDto.cs
index 65eb8898..36d02c20 100644
--- a/Marechai.App/Services/Client/Models/LicenseDto.cs
+++ b/Marechai.App/Services/Client/Models/LicenseDto.cs
@@ -17,13 +17,7 @@ namespace Marechai.App.Models
         /// <summary>The fsf_approved property</summary>
         public bool? FsfApproved { get; set; }
         /// <summary>The id property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? Id { get; set; }
-#nullable restore
-#else
-        public UntypedNode Id { get; set; }
-#endif
+        public int? Id { get; set; }
         /// <summary>The link property</summary>
 #if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
 #nullable enable
@@ -84,7 +78,7 @@ namespace Marechai.App.Models
             return new Dictionary<string, Action<IParseNode>>
             {
                 { "fsf_approved", n => { FsfApproved = n.GetBoolValue(); } },
-                { "id", n => { Id = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
+                { "id", n => { Id = n.GetIntValue(); } },
                 { "link", n => { Link = n.GetStringValue(); } },
                 { "name", n => { Name = n.GetStringValue(); } },
                 { "osi_approved", n => { OsiApproved = n.GetBoolValue(); } },
@@ -100,7 +94,7 @@ namespace Marechai.App.Models
         {
             if(ReferenceEquals(writer, null)) throw new ArgumentNullException(nameof(writer));
             writer.WriteBoolValue("fsf_approved", FsfApproved);
-            writer.WriteObjectValue<UntypedNode>("id", Id);
+            writer.WriteIntValue("id", Id);
             writer.WriteStringValue("link", Link);
             writer.WriteStringValue("name", Name);
             writer.WriteBoolValue("osi_approved", OsiApproved);
diff --git a/Marechai.App/Services/Client/Models/MachineDto.cs b/Marechai.App/Services/Client/Models/MachineDto.cs
index aa8dbe2c..42eec1ec 100644
--- a/Marechai.App/Services/Client/Models/MachineDto.cs
+++ b/Marechai.App/Services/Client/Models/MachineDto.cs
@@ -23,13 +23,7 @@ namespace Marechai.App.Models
         public string Company { get; set; }
 #endif
         /// <summary>The company_id property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? CompanyId { get; set; }
-#nullable restore
-#else
-        public UntypedNode CompanyId { get; set; }
-#endif
+        public int? CompanyId { get; set; }
         /// <summary>The company_logo property</summary>
         public Guid? CompanyLogo { get; set; }
         /// <summary>The family property</summary>
@@ -41,13 +35,7 @@ namespace Marechai.App.Models
         public string Family { get; set; }
 #endif
         /// <summary>The family_id property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? FamilyId { get; set; }
-#nullable restore
-#else
-        public UntypedNode FamilyId { get; set; }
-#endif
+        public int? FamilyId { get; set; }
         /// <summary>The family_name property</summary>
 #if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
 #nullable enable
@@ -65,13 +53,7 @@ namespace Marechai.App.Models
         public List<global::Marechai.App.Models.GpuDto> Gpus { get; set; }
 #endif
         /// <summary>The id property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? Id { get; set; }
-#nullable restore
-#else
-        public UntypedNode Id { get; set; }
-#endif
+        public int? Id { get; set; }
         /// <summary>The introduced property</summary>
         public DateTimeOffset? Introduced { get; set; }
         /// <summary>The memory property</summary>
@@ -150,13 +132,13 @@ namespace Marechai.App.Models
             return new Dictionary<string, Action<IParseNode>>
             {
                 { "company", n => { Company = n.GetStringValue(); } },
-                { "company_id", n => { CompanyId = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
+                { "company_id", n => { CompanyId = n.GetIntValue(); } },
                 { "company_logo", n => { CompanyLogo = n.GetGuidValue(); } },
                 { "family", n => { Family = n.GetStringValue(); } },
-                { "family_id", n => { FamilyId = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
+                { "family_id", n => { FamilyId = n.GetIntValue(); } },
                 { "family_name", n => { FamilyName = n.GetStringValue(); } },
                 { "gpus", n => { Gpus = n.GetCollectionOfObjectValues<global::Marechai.App.Models.GpuDto>(global::Marechai.App.Models.GpuDto.CreateFromDiscriminatorValue)?.AsList(); } },
-                { "id", n => { Id = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
+                { "id", n => { Id = n.GetIntValue(); } },
                 { "introduced", n => { Introduced = n.GetDateTimeOffsetValue(); } },
                 { "memory", n => { Memory = n.GetCollectionOfObjectValues<global::Marechai.App.Models.MemoryDto>(global::Marechai.App.Models.MemoryDto.CreateFromDiscriminatorValue)?.AsList(); } },
                 { "model", n => { Model = n.GetStringValue(); } },
@@ -175,13 +157,13 @@ namespace Marechai.App.Models
         {
             if(ReferenceEquals(writer, null)) throw new ArgumentNullException(nameof(writer));
             writer.WriteStringValue("company", Company);
-            writer.WriteObjectValue<UntypedNode>("company_id", CompanyId);
+            writer.WriteIntValue("company_id", CompanyId);
             writer.WriteGuidValue("company_logo", CompanyLogo);
             writer.WriteStringValue("family", Family);
-            writer.WriteObjectValue<UntypedNode>("family_id", FamilyId);
+            writer.WriteIntValue("family_id", FamilyId);
             writer.WriteStringValue("family_name", FamilyName);
             writer.WriteCollectionOfObjectValues<global::Marechai.App.Models.GpuDto>("gpus", Gpus);
-            writer.WriteObjectValue<UntypedNode>("id", Id);
+            writer.WriteIntValue("id", Id);
             writer.WriteDateTimeOffsetValue("introduced", Introduced);
             writer.WriteCollectionOfObjectValues<global::Marechai.App.Models.MemoryDto>("memory", Memory);
             writer.WriteStringValue("model", Model);
diff --git a/Marechai.App/Services/Client/Models/MachineFamilyDto.cs b/Marechai.App/Services/Client/Models/MachineFamilyDto.cs
index 31400b8c..2a1a5979 100644
--- a/Marechai.App/Services/Client/Models/MachineFamilyDto.cs
+++ b/Marechai.App/Services/Client/Models/MachineFamilyDto.cs
@@ -23,21 +23,9 @@ namespace Marechai.App.Models
         public string Company { get; set; }
 #endif
         /// <summary>The company_id property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? CompanyId { get; set; }
-#nullable restore
-#else
-        public UntypedNode CompanyId { get; set; }
-#endif
+        public int? CompanyId { get; set; }
         /// <summary>The id property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? Id { get; set; }
-#nullable restore
-#else
-        public UntypedNode Id { get; set; }
-#endif
+        public int? Id { get; set; }
         /// <summary>The name property</summary>
 #if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
 #nullable enable
@@ -72,8 +60,8 @@ namespace Marechai.App.Models
             return new Dictionary<string, Action<IParseNode>>
             {
                 { "company", n => { Company = n.GetStringValue(); } },
-                { "company_id", n => { CompanyId = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
-                { "id", n => { Id = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
+                { "company_id", n => { CompanyId = n.GetIntValue(); } },
+                { "id", n => { Id = n.GetIntValue(); } },
                 { "name", n => { Name = n.GetStringValue(); } },
             };
         }
@@ -85,8 +73,8 @@ namespace Marechai.App.Models
         {
             if(ReferenceEquals(writer, null)) throw new ArgumentNullException(nameof(writer));
             writer.WriteStringValue("company", Company);
-            writer.WriteObjectValue<UntypedNode>("company_id", CompanyId);
-            writer.WriteObjectValue<UntypedNode>("id", Id);
+            writer.WriteIntValue("company_id", CompanyId);
+            writer.WriteIntValue("id", Id);
             writer.WriteStringValue("name", Name);
             writer.WriteAdditionalData(AdditionalData);
         }
diff --git a/Marechai.App/Services/Client/Models/MachinePhotoDto.cs b/Marechai.App/Services/Client/Models/MachinePhotoDto.cs
index d3992dda..8fd17192 100644
--- a/Marechai.App/Services/Client/Models/MachinePhotoDto.cs
+++ b/Marechai.App/Services/Client/Models/MachinePhotoDto.cs
@@ -15,13 +15,7 @@ namespace Marechai.App.Models
         /// <summary>Stores additional data not described in the OpenAPI description found when deserializing. Can be used for serialization as well.</summary>
         public IDictionary<string, object> AdditionalData { get; set; }
         /// <summary>The aperture property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? Aperture { get; set; }
-#nullable restore
-#else
-        public UntypedNode Aperture { get; set; }
-#endif
+        public double? Aperture { get; set; }
         /// <summary>The author property</summary>
 #if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
 #nullable enable
@@ -73,13 +67,7 @@ namespace Marechai.App.Models
         /// <summary>The creation_date property</summary>
         public DateTimeOffset? CreationDate { get; set; }
         /// <summary>The digital_zoom property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? DigitalZoom { get; set; }
-#nullable restore
-#else
-        public UntypedNode DigitalZoom { get; set; }
-#endif
+        public double? DigitalZoom { get; set; }
         /// <summary>The exif_version property</summary>
 #if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
 #nullable enable
@@ -89,13 +77,7 @@ namespace Marechai.App.Models
         public string ExifVersion { get; set; }
 #endif
         /// <summary>The exposure property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? Exposure { get; set; }
-#nullable restore
-#else
-        public UntypedNode Exposure { get; set; }
-#endif
+        public double? Exposure { get; set; }
         /// <summary>The exposure_method property</summary>
 #if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
 #nullable enable
@@ -121,47 +103,17 @@ namespace Marechai.App.Models
         public global::Marechai.App.Models.MachinePhotoDto.MachinePhotoDto_flash Flash { get; set; }
 #endif
         /// <summary>The focal property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? Focal { get; set; }
-#nullable restore
-#else
-        public UntypedNode Focal { get; set; }
-#endif
+        public double? Focal { get; set; }
         /// <summary>The focal_equivalent property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? FocalEquivalent { get; set; }
-#nullable restore
-#else
-        public UntypedNode FocalEquivalent { get; set; }
-#endif
+        public double? FocalEquivalent { get; set; }
         /// <summary>The focal_length property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? FocalLength { get; set; }
-#nullable restore
-#else
-        public UntypedNode FocalLength { get; set; }
-#endif
+        public double? FocalLength { get; set; }
         /// <summary>The horizontal_resolution property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? HorizontalResolution { get; set; }
-#nullable restore
-#else
-        public UntypedNode HorizontalResolution { get; set; }
-#endif
+        public double? HorizontalResolution { get; set; }
         /// <summary>The id property</summary>
         public Guid? Id { get; set; }
         /// <summary>The iso property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? Iso { get; set; }
-#nullable restore
-#else
-        public UntypedNode Iso { get; set; }
-#endif
+        public int? Iso { get; set; }
         /// <summary>The lens property</summary>
 #if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
 #nullable enable
@@ -171,13 +123,7 @@ namespace Marechai.App.Models
         public string Lens { get; set; }
 #endif
         /// <summary>The license_id property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? LicenseId { get; set; }
-#nullable restore
-#else
-        public UntypedNode LicenseId { get; set; }
-#endif
+        public int? LicenseId { get; set; }
         /// <summary>The license_name property</summary>
 #if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
 #nullable enable
@@ -203,13 +149,7 @@ namespace Marechai.App.Models
         public string MachineCompanyName { get; set; }
 #endif
         /// <summary>The machine_id property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? MachineId { get; set; }
-#nullable restore
-#else
-        public UntypedNode MachineId { get; set; }
-#endif
+        public int? MachineId { get; set; }
         /// <summary>The machine_name property</summary>
 #if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
 #nullable enable
@@ -317,13 +257,7 @@ namespace Marechai.App.Models
         public string UserId { get; set; }
 #endif
         /// <summary>The vertical_resolution property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? VerticalResolution { get; set; }
-#nullable restore
-#else
-        public UntypedNode VerticalResolution { get; set; }
-#endif
+        public double? VerticalResolution { get; set; }
         /// <summary>The white_balance property</summary>
 #if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
 #nullable enable
@@ -357,7 +291,7 @@ namespace Marechai.App.Models
         {
             return new Dictionary<string, Action<IParseNode>>
             {
-                { "aperture", n => { Aperture = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
+                { "aperture", n => { Aperture = n.GetDoubleValue(); } },
                 { "author", n => { Author = n.GetStringValue(); } },
                 { "camera_manufacturer", n => { CameraManufacturer = n.GetStringValue(); } },
                 { "camera_model", n => { CameraModel = n.GetStringValue(); } },
@@ -365,24 +299,24 @@ namespace Marechai.App.Models
                 { "comments", n => { Comments = n.GetStringValue(); } },
                 { "contrast", n => { Contrast = n.GetObjectValue<global::Marechai.App.Models.MachinePhotoDto.MachinePhotoDto_contrast>(global::Marechai.App.Models.MachinePhotoDto.MachinePhotoDto_contrast.CreateFromDiscriminatorValue); } },
                 { "creation_date", n => { CreationDate = n.GetDateTimeOffsetValue(); } },
-                { "digital_zoom", n => { DigitalZoom = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
+                { "digital_zoom", n => { DigitalZoom = n.GetDoubleValue(); } },
                 { "exif_version", n => { ExifVersion = n.GetStringValue(); } },
-                { "exposure", n => { Exposure = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
+                { "exposure", n => { Exposure = n.GetDoubleValue(); } },
                 { "exposure_method", n => { ExposureMethod = n.GetObjectValue<global::Marechai.App.Models.MachinePhotoDto.MachinePhotoDto_exposure_method>(global::Marechai.App.Models.MachinePhotoDto.MachinePhotoDto_exposure_method.CreateFromDiscriminatorValue); } },
                 { "exposure_program", n => { ExposureProgram = n.GetObjectValue<global::Marechai.App.Models.MachinePhotoDto.MachinePhotoDto_exposure_program>(global::Marechai.App.Models.MachinePhotoDto.MachinePhotoDto_exposure_program.CreateFromDiscriminatorValue); } },
                 { "flash", n => { Flash = n.GetObjectValue<global::Marechai.App.Models.MachinePhotoDto.MachinePhotoDto_flash>(global::Marechai.App.Models.MachinePhotoDto.MachinePhotoDto_flash.CreateFromDiscriminatorValue); } },
-                { "focal", n => { Focal = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
-                { "focal_equivalent", n => { FocalEquivalent = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
-                { "focal_length", n => { FocalLength = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
-                { "horizontal_resolution", n => { HorizontalResolution = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
+                { "focal", n => { Focal = n.GetDoubleValue(); } },
+                { "focal_equivalent", n => { FocalEquivalent = n.GetDoubleValue(); } },
+                { "focal_length", n => { FocalLength = n.GetDoubleValue(); } },
+                { "horizontal_resolution", n => { HorizontalResolution = n.GetDoubleValue(); } },
                 { "id", n => { Id = n.GetGuidValue(); } },
-                { "iso", n => { Iso = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
+                { "iso", n => { Iso = n.GetIntValue(); } },
                 { "lens", n => { Lens = n.GetStringValue(); } },
-                { "license_id", n => { LicenseId = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
+                { "license_id", n => { LicenseId = n.GetIntValue(); } },
                 { "license_name", n => { LicenseName = n.GetStringValue(); } },
                 { "light_source", n => { LightSource = n.GetObjectValue<global::Marechai.App.Models.MachinePhotoDto.MachinePhotoDto_light_source>(global::Marechai.App.Models.MachinePhotoDto.MachinePhotoDto_light_source.CreateFromDiscriminatorValue); } },
                 { "machine_company_name", n => { MachineCompanyName = n.GetStringValue(); } },
-                { "machine_id", n => { MachineId = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
+                { "machine_id", n => { MachineId = n.GetIntValue(); } },
                 { "machine_name", n => { MachineName = n.GetStringValue(); } },
                 { "metering_mode", n => { MeteringMode = n.GetObjectValue<global::Marechai.App.Models.MachinePhotoDto.MachinePhotoDto_metering_mode>(global::Marechai.App.Models.MachinePhotoDto.MachinePhotoDto_metering_mode.CreateFromDiscriminatorValue); } },
                 { "orientation", n => { Orientation = n.GetObjectValue<global::Marechai.App.Models.MachinePhotoDto.MachinePhotoDto_orientation>(global::Marechai.App.Models.MachinePhotoDto.MachinePhotoDto_orientation.CreateFromDiscriminatorValue); } },
@@ -397,7 +331,7 @@ namespace Marechai.App.Models
                 { "subject_distance_range", n => { SubjectDistanceRange = n.GetObjectValue<global::Marechai.App.Models.MachinePhotoDto.MachinePhotoDto_subject_distance_range>(global::Marechai.App.Models.MachinePhotoDto.MachinePhotoDto_subject_distance_range.CreateFromDiscriminatorValue); } },
                 { "upload_date", n => { UploadDate = n.GetDateTimeOffsetValue(); } },
                 { "user_id", n => { UserId = n.GetStringValue(); } },
-                { "vertical_resolution", n => { VerticalResolution = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
+                { "vertical_resolution", n => { VerticalResolution = n.GetDoubleValue(); } },
                 { "white_balance", n => { WhiteBalance = n.GetObjectValue<global::Marechai.App.Models.MachinePhotoDto.MachinePhotoDto_white_balance>(global::Marechai.App.Models.MachinePhotoDto.MachinePhotoDto_white_balance.CreateFromDiscriminatorValue); } },
             };
         }
@@ -408,7 +342,7 @@ namespace Marechai.App.Models
         public virtual void Serialize(ISerializationWriter writer)
         {
             if(ReferenceEquals(writer, null)) throw new ArgumentNullException(nameof(writer));
-            writer.WriteObjectValue<UntypedNode>("aperture", Aperture);
+            writer.WriteDoubleValue("aperture", Aperture);
             writer.WriteStringValue("author", Author);
             writer.WriteStringValue("camera_manufacturer", CameraManufacturer);
             writer.WriteStringValue("camera_model", CameraModel);
@@ -416,24 +350,24 @@ namespace Marechai.App.Models
             writer.WriteStringValue("comments", Comments);
             writer.WriteObjectValue<global::Marechai.App.Models.MachinePhotoDto.MachinePhotoDto_contrast>("contrast", Contrast);
             writer.WriteDateTimeOffsetValue("creation_date", CreationDate);
-            writer.WriteObjectValue<UntypedNode>("digital_zoom", DigitalZoom);
+            writer.WriteDoubleValue("digital_zoom", DigitalZoom);
             writer.WriteStringValue("exif_version", ExifVersion);
-            writer.WriteObjectValue<UntypedNode>("exposure", Exposure);
+            writer.WriteDoubleValue("exposure", Exposure);
             writer.WriteObjectValue<global::Marechai.App.Models.MachinePhotoDto.MachinePhotoDto_exposure_method>("exposure_method", ExposureMethod);
             writer.WriteObjectValue<global::Marechai.App.Models.MachinePhotoDto.MachinePhotoDto_exposure_program>("exposure_program", ExposureProgram);
             writer.WriteObjectValue<global::Marechai.App.Models.MachinePhotoDto.MachinePhotoDto_flash>("flash", Flash);
-            writer.WriteObjectValue<UntypedNode>("focal", Focal);
-            writer.WriteObjectValue<UntypedNode>("focal_equivalent", FocalEquivalent);
-            writer.WriteObjectValue<UntypedNode>("focal_length", FocalLength);
-            writer.WriteObjectValue<UntypedNode>("horizontal_resolution", HorizontalResolution);
+            writer.WriteDoubleValue("focal", Focal);
+            writer.WriteDoubleValue("focal_equivalent", FocalEquivalent);
+            writer.WriteDoubleValue("focal_length", FocalLength);
+            writer.WriteDoubleValue("horizontal_resolution", HorizontalResolution);
             writer.WriteGuidValue("id", Id);
-            writer.WriteObjectValue<UntypedNode>("iso", Iso);
+            writer.WriteIntValue("iso", Iso);
             writer.WriteStringValue("lens", Lens);
-            writer.WriteObjectValue<UntypedNode>("license_id", LicenseId);
+            writer.WriteIntValue("license_id", LicenseId);
             writer.WriteStringValue("license_name", LicenseName);
             writer.WriteObjectValue<global::Marechai.App.Models.MachinePhotoDto.MachinePhotoDto_light_source>("light_source", LightSource);
             writer.WriteStringValue("machine_company_name", MachineCompanyName);
-            writer.WriteObjectValue<UntypedNode>("machine_id", MachineId);
+            writer.WriteIntValue("machine_id", MachineId);
             writer.WriteStringValue("machine_name", MachineName);
             writer.WriteObjectValue<global::Marechai.App.Models.MachinePhotoDto.MachinePhotoDto_metering_mode>("metering_mode", MeteringMode);
             writer.WriteObjectValue<global::Marechai.App.Models.MachinePhotoDto.MachinePhotoDto_orientation>("orientation", Orientation);
@@ -448,7 +382,7 @@ namespace Marechai.App.Models
             writer.WriteObjectValue<global::Marechai.App.Models.MachinePhotoDto.MachinePhotoDto_subject_distance_range>("subject_distance_range", SubjectDistanceRange);
             writer.WriteDateTimeOffsetValue("upload_date", UploadDate);
             writer.WriteStringValue("user_id", UserId);
-            writer.WriteObjectValue<UntypedNode>("vertical_resolution", VerticalResolution);
+            writer.WriteDoubleValue("vertical_resolution", VerticalResolution);
             writer.WriteObjectValue<global::Marechai.App.Models.MachinePhotoDto.MachinePhotoDto_white_balance>("white_balance", WhiteBalance);
             writer.WriteAdditionalData(AdditionalData);
         }
diff --git a/Marechai.App/Services/Client/Models/MagazineByMachineDto.cs b/Marechai.App/Services/Client/Models/MagazineByMachineDto.cs
index 4b9cce0a..1e2baaf2 100644
--- a/Marechai.App/Services/Client/Models/MagazineByMachineDto.cs
+++ b/Marechai.App/Services/Client/Models/MagazineByMachineDto.cs
@@ -15,13 +15,7 @@ namespace Marechai.App.Models
         /// <summary>Stores additional data not described in the OpenAPI description found when deserializing. Can be used for serialization as well.</summary>
         public IDictionary<string, object> AdditionalData { get; set; }
         /// <summary>The id property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? Id { get; set; }
-#nullable restore
-#else
-        public UntypedNode Id { get; set; }
-#endif
+        public long? Id { get; set; }
         /// <summary>The machine property</summary>
 #if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
 #nullable enable
@@ -31,13 +25,7 @@ namespace Marechai.App.Models
         public string Machine { get; set; }
 #endif
         /// <summary>The machine_id property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? MachineId { get; set; }
-#nullable restore
-#else
-        public UntypedNode MachineId { get; set; }
-#endif
+        public int? MachineId { get; set; }
         /// <summary>The magazine property</summary>
 #if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
 #nullable enable
@@ -47,13 +35,7 @@ namespace Marechai.App.Models
         public string Magazine { get; set; }
 #endif
         /// <summary>The magazine_id property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? MagazineId { get; set; }
-#nullable restore
-#else
-        public UntypedNode MagazineId { get; set; }
-#endif
+        public long? MagazineId { get; set; }
         /// <summary>
         /// Instantiates a new <see cref="global::Marechai.App.Models.MagazineByMachineDto"/> and sets the default values.
         /// </summary>
@@ -79,11 +61,11 @@ namespace Marechai.App.Models
         {
             return new Dictionary<string, Action<IParseNode>>
             {
-                { "id", n => { Id = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
+                { "id", n => { Id = n.GetLongValue(); } },
                 { "machine", n => { Machine = n.GetStringValue(); } },
-                { "machine_id", n => { MachineId = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
+                { "machine_id", n => { MachineId = n.GetIntValue(); } },
                 { "magazine", n => { Magazine = n.GetStringValue(); } },
-                { "magazine_id", n => { MagazineId = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
+                { "magazine_id", n => { MagazineId = n.GetLongValue(); } },
             };
         }
         /// <summary>
@@ -93,11 +75,11 @@ namespace Marechai.App.Models
         public virtual void Serialize(ISerializationWriter writer)
         {
             if(ReferenceEquals(writer, null)) throw new ArgumentNullException(nameof(writer));
-            writer.WriteObjectValue<UntypedNode>("id", Id);
+            writer.WriteLongValue("id", Id);
             writer.WriteStringValue("machine", Machine);
-            writer.WriteObjectValue<UntypedNode>("machine_id", MachineId);
+            writer.WriteIntValue("machine_id", MachineId);
             writer.WriteStringValue("magazine", Magazine);
-            writer.WriteObjectValue<UntypedNode>("magazine_id", MagazineId);
+            writer.WriteLongValue("magazine_id", MagazineId);
             writer.WriteAdditionalData(AdditionalData);
         }
     }
diff --git a/Marechai.App/Services/Client/Models/MagazineByMachineFamilyDto.cs b/Marechai.App/Services/Client/Models/MagazineByMachineFamilyDto.cs
index 93376d37..a1ec0424 100644
--- a/Marechai.App/Services/Client/Models/MagazineByMachineFamilyDto.cs
+++ b/Marechai.App/Services/Client/Models/MagazineByMachineFamilyDto.cs
@@ -15,13 +15,7 @@ namespace Marechai.App.Models
         /// <summary>Stores additional data not described in the OpenAPI description found when deserializing. Can be used for serialization as well.</summary>
         public IDictionary<string, object> AdditionalData { get; set; }
         /// <summary>The id property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? Id { get; set; }
-#nullable restore
-#else
-        public UntypedNode Id { get; set; }
-#endif
+        public long? Id { get; set; }
         /// <summary>The machine_family property</summary>
 #if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
 #nullable enable
@@ -31,13 +25,7 @@ namespace Marechai.App.Models
         public string MachineFamily { get; set; }
 #endif
         /// <summary>The machine_family_id property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? MachineFamilyId { get; set; }
-#nullable restore
-#else
-        public UntypedNode MachineFamilyId { get; set; }
-#endif
+        public int? MachineFamilyId { get; set; }
         /// <summary>The magazine property</summary>
 #if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
 #nullable enable
@@ -47,13 +35,7 @@ namespace Marechai.App.Models
         public string Magazine { get; set; }
 #endif
         /// <summary>The magazine_id property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? MagazineId { get; set; }
-#nullable restore
-#else
-        public UntypedNode MagazineId { get; set; }
-#endif
+        public long? MagazineId { get; set; }
         /// <summary>
         /// Instantiates a new <see cref="global::Marechai.App.Models.MagazineByMachineFamilyDto"/> and sets the default values.
         /// </summary>
@@ -79,11 +61,11 @@ namespace Marechai.App.Models
         {
             return new Dictionary<string, Action<IParseNode>>
             {
-                { "id", n => { Id = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
+                { "id", n => { Id = n.GetLongValue(); } },
                 { "machine_family", n => { MachineFamily = n.GetStringValue(); } },
-                { "machine_family_id", n => { MachineFamilyId = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
+                { "machine_family_id", n => { MachineFamilyId = n.GetIntValue(); } },
                 { "magazine", n => { Magazine = n.GetStringValue(); } },
-                { "magazine_id", n => { MagazineId = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
+                { "magazine_id", n => { MagazineId = n.GetLongValue(); } },
             };
         }
         /// <summary>
@@ -93,11 +75,11 @@ namespace Marechai.App.Models
         public virtual void Serialize(ISerializationWriter writer)
         {
             if(ReferenceEquals(writer, null)) throw new ArgumentNullException(nameof(writer));
-            writer.WriteObjectValue<UntypedNode>("id", Id);
+            writer.WriteLongValue("id", Id);
             writer.WriteStringValue("machine_family", MachineFamily);
-            writer.WriteObjectValue<UntypedNode>("machine_family_id", MachineFamilyId);
+            writer.WriteIntValue("machine_family_id", MachineFamilyId);
             writer.WriteStringValue("magazine", Magazine);
-            writer.WriteObjectValue<UntypedNode>("magazine_id", MagazineId);
+            writer.WriteLongValue("magazine_id", MagazineId);
             writer.WriteAdditionalData(AdditionalData);
         }
     }
diff --git a/Marechai.App/Services/Client/Models/MagazineDto.cs b/Marechai.App/Services/Client/Models/MagazineDto.cs
index 9cd2a703..f8c44eee 100644
--- a/Marechai.App/Services/Client/Models/MagazineDto.cs
+++ b/Marechai.App/Services/Client/Models/MagazineDto.cs
@@ -23,23 +23,11 @@ namespace Marechai.App.Models
         public string Country { get; set; }
 #endif
         /// <summary>The country_id property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? CountryId { get; set; }
-#nullable restore
-#else
-        public UntypedNode CountryId { get; set; }
-#endif
+        public int? CountryId { get; set; }
         /// <summary>The first_publication property</summary>
         public DateTimeOffset? FirstPublication { get; set; }
         /// <summary>The id property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? Id { get; set; }
-#nullable restore
-#else
-        public UntypedNode Id { get; set; }
-#endif
+        public long? Id { get; set; }
         /// <summary>The issn property</summary>
 #if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
 #nullable enable
@@ -100,9 +88,9 @@ namespace Marechai.App.Models
             return new Dictionary<string, Action<IParseNode>>
             {
                 { "country", n => { Country = n.GetStringValue(); } },
-                { "country_id", n => { CountryId = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
+                { "country_id", n => { CountryId = n.GetIntValue(); } },
                 { "first_publication", n => { FirstPublication = n.GetDateTimeOffsetValue(); } },
-                { "id", n => { Id = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
+                { "id", n => { Id = n.GetLongValue(); } },
                 { "issn", n => { Issn = n.GetStringValue(); } },
                 { "native_title", n => { NativeTitle = n.GetStringValue(); } },
                 { "published", n => { Published = n.GetDateTimeOffsetValue(); } },
@@ -118,9 +106,9 @@ namespace Marechai.App.Models
         {
             if(ReferenceEquals(writer, null)) throw new ArgumentNullException(nameof(writer));
             writer.WriteStringValue("country", Country);
-            writer.WriteObjectValue<UntypedNode>("country_id", CountryId);
+            writer.WriteIntValue("country_id", CountryId);
             writer.WriteDateTimeOffsetValue("first_publication", FirstPublication);
-            writer.WriteObjectValue<UntypedNode>("id", Id);
+            writer.WriteLongValue("id", Id);
             writer.WriteStringValue("issn", Issn);
             writer.WriteStringValue("native_title", NativeTitle);
             writer.WriteDateTimeOffsetValue("published", Published);
diff --git a/Marechai.App/Services/Client/Models/MagazineIssueDto.cs b/Marechai.App/Services/Client/Models/MagazineIssueDto.cs
index 87b5828c..37e4c4bd 100644
--- a/Marechai.App/Services/Client/Models/MagazineIssueDto.cs
+++ b/Marechai.App/Services/Client/Models/MagazineIssueDto.cs
@@ -23,29 +23,11 @@ namespace Marechai.App.Models
         public string Caption { get; set; }
 #endif
         /// <summary>The id property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? Id { get; set; }
-#nullable restore
-#else
-        public UntypedNode Id { get; set; }
-#endif
+        public long? Id { get; set; }
         /// <summary>The issue_number property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? IssueNumber { get; set; }
-#nullable restore
-#else
-        public UntypedNode IssueNumber { get; set; }
-#endif
+        public int? IssueNumber { get; set; }
         /// <summary>The magazine_id property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? MagazineId { get; set; }
-#nullable restore
-#else
-        public UntypedNode MagazineId { get; set; }
-#endif
+        public long? MagazineId { get; set; }
         /// <summary>The magazine_title property</summary>
 #if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
 #nullable enable
@@ -63,13 +45,7 @@ namespace Marechai.App.Models
         public string NativeCaption { get; set; }
 #endif
         /// <summary>The pages property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? Pages { get; set; }
-#nullable restore
-#else
-        public UntypedNode Pages { get; set; }
-#endif
+        public int? Pages { get; set; }
         /// <summary>The product_code property</summary>
 #if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
 #nullable enable
@@ -106,12 +82,12 @@ namespace Marechai.App.Models
             return new Dictionary<string, Action<IParseNode>>
             {
                 { "caption", n => { Caption = n.GetStringValue(); } },
-                { "id", n => { Id = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
-                { "issue_number", n => { IssueNumber = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
-                { "magazine_id", n => { MagazineId = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
+                { "id", n => { Id = n.GetLongValue(); } },
+                { "issue_number", n => { IssueNumber = n.GetIntValue(); } },
+                { "magazine_id", n => { MagazineId = n.GetLongValue(); } },
                 { "magazine_title", n => { MagazineTitle = n.GetStringValue(); } },
                 { "native_caption", n => { NativeCaption = n.GetStringValue(); } },
-                { "pages", n => { Pages = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
+                { "pages", n => { Pages = n.GetIntValue(); } },
                 { "product_code", n => { ProductCode = n.GetStringValue(); } },
                 { "published", n => { Published = n.GetDateTimeOffsetValue(); } },
             };
@@ -124,12 +100,12 @@ namespace Marechai.App.Models
         {
             if(ReferenceEquals(writer, null)) throw new ArgumentNullException(nameof(writer));
             writer.WriteStringValue("caption", Caption);
-            writer.WriteObjectValue<UntypedNode>("id", Id);
-            writer.WriteObjectValue<UntypedNode>("issue_number", IssueNumber);
-            writer.WriteObjectValue<UntypedNode>("magazine_id", MagazineId);
+            writer.WriteLongValue("id", Id);
+            writer.WriteIntValue("issue_number", IssueNumber);
+            writer.WriteLongValue("magazine_id", MagazineId);
             writer.WriteStringValue("magazine_title", MagazineTitle);
             writer.WriteStringValue("native_caption", NativeCaption);
-            writer.WriteObjectValue<UntypedNode>("pages", Pages);
+            writer.WriteIntValue("pages", Pages);
             writer.WriteStringValue("product_code", ProductCode);
             writer.WriteDateTimeOffsetValue("published", Published);
             writer.WriteAdditionalData(AdditionalData);
diff --git a/Marechai.App/Services/Client/Models/MagazineScanDto.cs b/Marechai.App/Services/Client/Models/MagazineScanDto.cs
index cad2afd9..20ba6fb4 100644
--- a/Marechai.App/Services/Client/Models/MagazineScanDto.cs
+++ b/Marechai.App/Services/Client/Models/MagazineScanDto.cs
@@ -49,13 +49,7 @@ namespace Marechai.App.Models
         public string ExifVersion { get; set; }
 #endif
         /// <summary>The horizontal_resolution property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? HorizontalResolution { get; set; }
-#nullable restore
-#else
-        public UntypedNode HorizontalResolution { get; set; }
-#endif
+        public double? HorizontalResolution { get; set; }
         /// <summary>The id property</summary>
         public Guid? Id { get; set; }
         /// <summary>The magazine property</summary>
@@ -67,13 +61,7 @@ namespace Marechai.App.Models
         public string Magazine { get; set; }
 #endif
         /// <summary>The magazine_id property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? MagazineId { get; set; }
-#nullable restore
-#else
-        public UntypedNode MagazineId { get; set; }
-#endif
+        public long? MagazineId { get; set; }
         /// <summary>The original_extension property</summary>
 #if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
 #nullable enable
@@ -83,13 +71,7 @@ namespace Marechai.App.Models
         public string OriginalExtension { get; set; }
 #endif
         /// <summary>The page property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? Page { get; set; }
-#nullable restore
-#else
-        public UntypedNode Page { get; set; }
-#endif
+        public int? Page { get; set; }
         /// <summary>The resolution_unit property</summary>
 #if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
 #nullable enable
@@ -135,13 +117,7 @@ namespace Marechai.App.Models
         public string UserId { get; set; }
 #endif
         /// <summary>The vertical_resolution property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? VerticalResolution { get; set; }
-#nullable restore
-#else
-        public UntypedNode VerticalResolution { get; set; }
-#endif
+        public double? VerticalResolution { get; set; }
         /// <summary>
         /// Instantiates a new <see cref="global::Marechai.App.Models.MagazineScanDto"/> and sets the default values.
         /// </summary>
@@ -172,12 +148,12 @@ namespace Marechai.App.Models
                 { "comments", n => { Comments = n.GetStringValue(); } },
                 { "creation_date", n => { CreationDate = n.GetDateTimeOffsetValue(); } },
                 { "exif_version", n => { ExifVersion = n.GetStringValue(); } },
-                { "horizontal_resolution", n => { HorizontalResolution = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
+                { "horizontal_resolution", n => { HorizontalResolution = n.GetDoubleValue(); } },
                 { "id", n => { Id = n.GetGuidValue(); } },
                 { "magazine", n => { Magazine = n.GetStringValue(); } },
-                { "magazine_id", n => { MagazineId = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
+                { "magazine_id", n => { MagazineId = n.GetLongValue(); } },
                 { "original_extension", n => { OriginalExtension = n.GetStringValue(); } },
-                { "page", n => { Page = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
+                { "page", n => { Page = n.GetIntValue(); } },
                 { "resolution_unit", n => { ResolutionUnit = n.GetObjectValue<global::Marechai.App.Models.MagazineScanDto.MagazineScanDto_resolution_unit>(global::Marechai.App.Models.MagazineScanDto.MagazineScanDto_resolution_unit.CreateFromDiscriminatorValue); } },
                 { "scanner_manufacturer", n => { ScannerManufacturer = n.GetStringValue(); } },
                 { "scanner_model", n => { ScannerModel = n.GetStringValue(); } },
@@ -185,7 +161,7 @@ namespace Marechai.App.Models
                 { "type", n => { Type = n.GetIntValue(); } },
                 { "upload_date", n => { UploadDate = n.GetDateTimeOffsetValue(); } },
                 { "user_id", n => { UserId = n.GetStringValue(); } },
-                { "vertical_resolution", n => { VerticalResolution = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
+                { "vertical_resolution", n => { VerticalResolution = n.GetDoubleValue(); } },
             };
         }
         /// <summary>
@@ -200,12 +176,12 @@ namespace Marechai.App.Models
             writer.WriteStringValue("comments", Comments);
             writer.WriteDateTimeOffsetValue("creation_date", CreationDate);
             writer.WriteStringValue("exif_version", ExifVersion);
-            writer.WriteObjectValue<UntypedNode>("horizontal_resolution", HorizontalResolution);
+            writer.WriteDoubleValue("horizontal_resolution", HorizontalResolution);
             writer.WriteGuidValue("id", Id);
             writer.WriteStringValue("magazine", Magazine);
-            writer.WriteObjectValue<UntypedNode>("magazine_id", MagazineId);
+            writer.WriteLongValue("magazine_id", MagazineId);
             writer.WriteStringValue("original_extension", OriginalExtension);
-            writer.WriteObjectValue<UntypedNode>("page", Page);
+            writer.WriteIntValue("page", Page);
             writer.WriteObjectValue<global::Marechai.App.Models.MagazineScanDto.MagazineScanDto_resolution_unit>("resolution_unit", ResolutionUnit);
             writer.WriteStringValue("scanner_manufacturer", ScannerManufacturer);
             writer.WriteStringValue("scanner_model", ScannerModel);
@@ -213,7 +189,7 @@ namespace Marechai.App.Models
             writer.WriteIntValue("type", Type);
             writer.WriteDateTimeOffsetValue("upload_date", UploadDate);
             writer.WriteStringValue("user_id", UserId);
-            writer.WriteObjectValue<UntypedNode>("vertical_resolution", VerticalResolution);
+            writer.WriteDoubleValue("vertical_resolution", VerticalResolution);
             writer.WriteAdditionalData(AdditionalData);
         }
         /// <summary>
diff --git a/Marechai.App/Services/Client/Models/MediaDto.cs b/Marechai.App/Services/Client/Models/MediaDto.cs
index 7730dfce..71bf3ee3 100644
--- a/Marechai.App/Services/Client/Models/MediaDto.cs
+++ b/Marechai.App/Services/Client/Models/MediaDto.cs
@@ -55,37 +55,13 @@ namespace Marechai.App.Models
         public string Firmware { get; set; }
 #endif
         /// <summary>The id property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? Id { get; set; }
-#nullable restore
-#else
-        public UntypedNode Id { get; set; }
-#endif
+        public int? Id { get; set; }
         /// <summary>The last_sequence property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? LastSequence { get; set; }
-#nullable restore
-#else
-        public UntypedNode LastSequence { get; set; }
-#endif
+        public int? LastSequence { get; set; }
         /// <summary>The layers property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? Layers { get; set; }
-#nullable restore
-#else
-        public UntypedNode Layers { get; set; }
-#endif
+        public int? Layers { get; set; }
         /// <summary>The logical_block_size property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? LogicalBlockSize { get; set; }
-#nullable restore
-#else
-        public UntypedNode LogicalBlockSize { get; set; }
-#endif
+        public int? LogicalBlockSize { get; set; }
         /// <summary>The manufacturer property</summary>
 #if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
 #nullable enable
@@ -111,13 +87,7 @@ namespace Marechai.App.Models
         public string PartNumber { get; set; }
 #endif
         /// <summary>The physical_block_size property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? PhysicalBlockSize { get; set; }
-#nullable restore
-#else
-        public UntypedNode PhysicalBlockSize { get; set; }
-#endif
+        public int? PhysicalBlockSize { get; set; }
         /// <summary>The revision property</summary>
 #if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
 #nullable enable
@@ -127,21 +97,9 @@ namespace Marechai.App.Models
         public string Revision { get; set; }
 #endif
         /// <summary>The sectors property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? Sectors { get; set; }
-#nullable restore
-#else
-        public UntypedNode Sectors { get; set; }
-#endif
+        public int? Sectors { get; set; }
         /// <summary>The sequence property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? Sequence { get; set; }
-#nullable restore
-#else
-        public UntypedNode Sequence { get; set; }
-#endif
+        public int? Sequence { get; set; }
         /// <summary>The serial_number property</summary>
 #if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
 #nullable enable
@@ -151,29 +109,11 @@ namespace Marechai.App.Models
         public string SerialNumber { get; set; }
 #endif
         /// <summary>The sessions property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? Sessions { get; set; }
-#nullable restore
-#else
-        public UntypedNode Sessions { get; set; }
-#endif
+        public int? Sessions { get; set; }
         /// <summary>The sides property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? Sides { get; set; }
-#nullable restore
-#else
-        public UntypedNode Sides { get; set; }
-#endif
+        public int? Sides { get; set; }
         /// <summary>The size property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? Size { get; set; }
-#nullable restore
-#else
-        public UntypedNode Size { get; set; }
-#endif
+        public int? Size { get; set; }
         /// <summary>The storage_interface property</summary>
 #if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
 #nullable enable
@@ -199,23 +139,11 @@ namespace Marechai.App.Models
         public string Title { get; set; }
 #endif
         /// <summary>The tracks property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? Tracks { get; set; }
-#nullable restore
-#else
-        public UntypedNode Tracks { get; set; }
-#endif
+        public int? Tracks { get; set; }
         /// <summary>The type property</summary>
         public int? Type { get; set; }
         /// <summary>The write_offset property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? WriteOffset { get; set; }
-#nullable restore
-#else
-        public UntypedNode WriteOffset { get; set; }
-#endif
+        public int? WriteOffset { get; set; }
         /// <summary>
         /// Instantiates a new <see cref="global::Marechai.App.Models.MediaDto"/> and sets the default values.
         /// </summary>
@@ -246,27 +174,27 @@ namespace Marechai.App.Models
                 { "catalogue_number", n => { CatalogueNumber = n.GetStringValue(); } },
                 { "copy_protection", n => { CopyProtection = n.GetStringValue(); } },
                 { "firmware", n => { Firmware = n.GetStringValue(); } },
-                { "id", n => { Id = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
-                { "last_sequence", n => { LastSequence = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
-                { "layers", n => { Layers = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
-                { "logical_block_size", n => { LogicalBlockSize = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
+                { "id", n => { Id = n.GetIntValue(); } },
+                { "last_sequence", n => { LastSequence = n.GetIntValue(); } },
+                { "layers", n => { Layers = n.GetIntValue(); } },
+                { "logical_block_size", n => { LogicalBlockSize = n.GetIntValue(); } },
                 { "manufacturer", n => { Manufacturer = n.GetStringValue(); } },
                 { "model", n => { Model = n.GetStringValue(); } },
                 { "part_number", n => { PartNumber = n.GetStringValue(); } },
-                { "physical_block_size", n => { PhysicalBlockSize = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
+                { "physical_block_size", n => { PhysicalBlockSize = n.GetIntValue(); } },
                 { "revision", n => { Revision = n.GetStringValue(); } },
-                { "sectors", n => { Sectors = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
-                { "sequence", n => { Sequence = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
+                { "sectors", n => { Sectors = n.GetIntValue(); } },
+                { "sequence", n => { Sequence = n.GetIntValue(); } },
                 { "serial_number", n => { SerialNumber = n.GetStringValue(); } },
-                { "sessions", n => { Sessions = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
-                { "sides", n => { Sides = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
-                { "size", n => { Size = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
+                { "sessions", n => { Sessions = n.GetIntValue(); } },
+                { "sides", n => { Sides = n.GetIntValue(); } },
+                { "size", n => { Size = n.GetIntValue(); } },
                 { "storage_interface", n => { StorageInterface = n.GetObjectValue<global::Marechai.App.Models.MediaDto.MediaDto_storage_interface>(global::Marechai.App.Models.MediaDto.MediaDto_storage_interface.CreateFromDiscriminatorValue); } },
                 { "table_of_contents", n => { TableOfContents = n.GetCollectionOfObjectValues<global::Marechai.App.Models.OpticalDiscTrack>(global::Marechai.App.Models.OpticalDiscTrack.CreateFromDiscriminatorValue)?.AsList(); } },
                 { "title", n => { Title = n.GetStringValue(); } },
-                { "tracks", n => { Tracks = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
+                { "tracks", n => { Tracks = n.GetIntValue(); } },
                 { "type", n => { Type = n.GetIntValue(); } },
-                { "write_offset", n => { WriteOffset = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
+                { "write_offset", n => { WriteOffset = n.GetIntValue(); } },
             };
         }
         /// <summary>
@@ -281,27 +209,27 @@ namespace Marechai.App.Models
             writer.WriteStringValue("catalogue_number", CatalogueNumber);
             writer.WriteStringValue("copy_protection", CopyProtection);
             writer.WriteStringValue("firmware", Firmware);
-            writer.WriteObjectValue<UntypedNode>("id", Id);
-            writer.WriteObjectValue<UntypedNode>("last_sequence", LastSequence);
-            writer.WriteObjectValue<UntypedNode>("layers", Layers);
-            writer.WriteObjectValue<UntypedNode>("logical_block_size", LogicalBlockSize);
+            writer.WriteIntValue("id", Id);
+            writer.WriteIntValue("last_sequence", LastSequence);
+            writer.WriteIntValue("layers", Layers);
+            writer.WriteIntValue("logical_block_size", LogicalBlockSize);
             writer.WriteStringValue("manufacturer", Manufacturer);
             writer.WriteStringValue("model", Model);
             writer.WriteStringValue("part_number", PartNumber);
-            writer.WriteObjectValue<UntypedNode>("physical_block_size", PhysicalBlockSize);
+            writer.WriteIntValue("physical_block_size", PhysicalBlockSize);
             writer.WriteStringValue("revision", Revision);
-            writer.WriteObjectValue<UntypedNode>("sectors", Sectors);
-            writer.WriteObjectValue<UntypedNode>("sequence", Sequence);
+            writer.WriteIntValue("sectors", Sectors);
+            writer.WriteIntValue("sequence", Sequence);
             writer.WriteStringValue("serial_number", SerialNumber);
-            writer.WriteObjectValue<UntypedNode>("sessions", Sessions);
-            writer.WriteObjectValue<UntypedNode>("sides", Sides);
-            writer.WriteObjectValue<UntypedNode>("size", Size);
+            writer.WriteIntValue("sessions", Sessions);
+            writer.WriteIntValue("sides", Sides);
+            writer.WriteIntValue("size", Size);
             writer.WriteObjectValue<global::Marechai.App.Models.MediaDto.MediaDto_storage_interface>("storage_interface", StorageInterface);
             writer.WriteCollectionOfObjectValues<global::Marechai.App.Models.OpticalDiscTrack>("table_of_contents", TableOfContents);
             writer.WriteStringValue("title", Title);
-            writer.WriteObjectValue<UntypedNode>("tracks", Tracks);
+            writer.WriteIntValue("tracks", Tracks);
             writer.WriteIntValue("type", Type);
-            writer.WriteObjectValue<UntypedNode>("write_offset", WriteOffset);
+            writer.WriteIntValue("write_offset", WriteOffset);
             writer.WriteAdditionalData(AdditionalData);
         }
         /// <summary>
diff --git a/Marechai.App/Services/Client/Models/MemoryByMachineDto.cs b/Marechai.App/Services/Client/Models/MemoryByMachineDto.cs
index b84933fb..e77954e6 100644
--- a/Marechai.App/Services/Client/Models/MemoryByMachineDto.cs
+++ b/Marechai.App/Services/Client/Models/MemoryByMachineDto.cs
@@ -15,37 +15,13 @@ namespace Marechai.App.Models
         /// <summary>Stores additional data not described in the OpenAPI description found when deserializing. Can be used for serialization as well.</summary>
         public IDictionary<string, object> AdditionalData { get; set; }
         /// <summary>The id property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? Id { get; set; }
-#nullable restore
-#else
-        public UntypedNode Id { get; set; }
-#endif
+        public long? Id { get; set; }
         /// <summary>The machine_id property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? MachineId { get; set; }
-#nullable restore
-#else
-        public UntypedNode MachineId { get; set; }
-#endif
+        public int? MachineId { get; set; }
         /// <summary>The size property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? Size { get; set; }
-#nullable restore
-#else
-        public UntypedNode Size { get; set; }
-#endif
+        public long? Size { get; set; }
         /// <summary>The speed property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? Speed { get; set; }
-#nullable restore
-#else
-        public UntypedNode Speed { get; set; }
-#endif
+        public double? Speed { get; set; }
         /// <summary>The type property</summary>
         public int? Type { get; set; }
         /// <summary>The usage property</summary>
@@ -75,10 +51,10 @@ namespace Marechai.App.Models
         {
             return new Dictionary<string, Action<IParseNode>>
             {
-                { "id", n => { Id = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
-                { "machine_id", n => { MachineId = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
-                { "size", n => { Size = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
-                { "speed", n => { Speed = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
+                { "id", n => { Id = n.GetLongValue(); } },
+                { "machine_id", n => { MachineId = n.GetIntValue(); } },
+                { "size", n => { Size = n.GetLongValue(); } },
+                { "speed", n => { Speed = n.GetDoubleValue(); } },
                 { "type", n => { Type = n.GetIntValue(); } },
                 { "usage", n => { Usage = n.GetIntValue(); } },
             };
@@ -90,10 +66,10 @@ namespace Marechai.App.Models
         public virtual void Serialize(ISerializationWriter writer)
         {
             if(ReferenceEquals(writer, null)) throw new ArgumentNullException(nameof(writer));
-            writer.WriteObjectValue<UntypedNode>("id", Id);
-            writer.WriteObjectValue<UntypedNode>("machine_id", MachineId);
-            writer.WriteObjectValue<UntypedNode>("size", Size);
-            writer.WriteObjectValue<UntypedNode>("speed", Speed);
+            writer.WriteLongValue("id", Id);
+            writer.WriteIntValue("machine_id", MachineId);
+            writer.WriteLongValue("size", Size);
+            writer.WriteDoubleValue("speed", Speed);
             writer.WriteIntValue("type", Type);
             writer.WriteIntValue("usage", Usage);
             writer.WriteAdditionalData(AdditionalData);
diff --git a/Marechai.App/Services/Client/Models/MemoryDto.cs b/Marechai.App/Services/Client/Models/MemoryDto.cs
index 2565b64e..6374b37e 100644
--- a/Marechai.App/Services/Client/Models/MemoryDto.cs
+++ b/Marechai.App/Services/Client/Models/MemoryDto.cs
@@ -15,21 +15,9 @@ namespace Marechai.App.Models
         /// <summary>Stores additional data not described in the OpenAPI description found when deserializing. Can be used for serialization as well.</summary>
         public IDictionary<string, object> AdditionalData { get; set; }
         /// <summary>The size property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? Size { get; set; }
-#nullable restore
-#else
-        public UntypedNode Size { get; set; }
-#endif
+        public long? Size { get; set; }
         /// <summary>The speed property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? Speed { get; set; }
-#nullable restore
-#else
-        public UntypedNode Speed { get; set; }
-#endif
+        public double? Speed { get; set; }
         /// <summary>The type property</summary>
         public int? Type { get; set; }
         /// <summary>The usage property</summary>
@@ -59,8 +47,8 @@ namespace Marechai.App.Models
         {
             return new Dictionary<string, Action<IParseNode>>
             {
-                { "size", n => { Size = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
-                { "speed", n => { Speed = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
+                { "size", n => { Size = n.GetLongValue(); } },
+                { "speed", n => { Speed = n.GetDoubleValue(); } },
                 { "type", n => { Type = n.GetIntValue(); } },
                 { "usage", n => { Usage = n.GetIntValue(); } },
             };
@@ -72,8 +60,8 @@ namespace Marechai.App.Models
         public virtual void Serialize(ISerializationWriter writer)
         {
             if(ReferenceEquals(writer, null)) throw new ArgumentNullException(nameof(writer));
-            writer.WriteObjectValue<UntypedNode>("size", Size);
-            writer.WriteObjectValue<UntypedNode>("speed", Speed);
+            writer.WriteLongValue("size", Size);
+            writer.WriteDoubleValue("speed", Speed);
             writer.WriteIntValue("type", Type);
             writer.WriteIntValue("usage", Usage);
             writer.WriteAdditionalData(AdditionalData);
diff --git a/Marechai.App/Services/Client/Models/NewsDto.cs b/Marechai.App/Services/Client/Models/NewsDto.cs
index 1cbdd871..18d41396 100644
--- a/Marechai.App/Services/Client/Models/NewsDto.cs
+++ b/Marechai.App/Services/Client/Models/NewsDto.cs
@@ -15,13 +15,7 @@ namespace Marechai.App.Models
         /// <summary>Stores additional data not described in the OpenAPI description found when deserializing. Can be used for serialization as well.</summary>
         public IDictionary<string, object> AdditionalData { get; set; }
         /// <summary>The affected_id property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? AffectedId { get; set; }
-#nullable restore
-#else
-        public UntypedNode AffectedId { get; set; }
-#endif
+        public int? AffectedId { get; set; }
         /// <summary>The controller property</summary>
 #if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
 #nullable enable
@@ -31,13 +25,7 @@ namespace Marechai.App.Models
         public string Controller { get; set; }
 #endif
         /// <summary>The id property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? Id { get; set; }
-#nullable restore
-#else
-        public UntypedNode Id { get; set; }
-#endif
+        public int? Id { get; set; }
         /// <summary>The item_name property</summary>
 #if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
 #nullable enable
@@ -83,9 +71,9 @@ namespace Marechai.App.Models
         {
             return new Dictionary<string, Action<IParseNode>>
             {
-                { "affected_id", n => { AffectedId = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
+                { "affected_id", n => { AffectedId = n.GetIntValue(); } },
                 { "controller", n => { Controller = n.GetStringValue(); } },
-                { "id", n => { Id = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
+                { "id", n => { Id = n.GetIntValue(); } },
                 { "item_name", n => { ItemName = n.GetStringValue(); } },
                 { "text", n => { Text = n.GetStringValue(); } },
                 { "timestamp", n => { Timestamp = n.GetDateTimeOffsetValue(); } },
@@ -99,9 +87,9 @@ namespace Marechai.App.Models
         public virtual void Serialize(ISerializationWriter writer)
         {
             if(ReferenceEquals(writer, null)) throw new ArgumentNullException(nameof(writer));
-            writer.WriteObjectValue<UntypedNode>("affected_id", AffectedId);
+            writer.WriteIntValue("affected_id", AffectedId);
             writer.WriteStringValue("controller", Controller);
-            writer.WriteObjectValue<UntypedNode>("id", Id);
+            writer.WriteIntValue("id", Id);
             writer.WriteStringValue("item_name", ItemName);
             writer.WriteStringValue("text", Text);
             writer.WriteDateTimeOffsetValue("timestamp", Timestamp);
diff --git a/Marechai.App/Services/Client/Models/OpticalDiscTrack.cs b/Marechai.App/Services/Client/Models/OpticalDiscTrack.cs
index 3ab4c3e4..f6c1240e 100644
--- a/Marechai.App/Services/Client/Models/OpticalDiscTrack.cs
+++ b/Marechai.App/Services/Client/Models/OpticalDiscTrack.cs
@@ -15,37 +15,13 @@ namespace Marechai.App.Models
         /// <summary>Stores additional data not described in the OpenAPI description found when deserializing. Can be used for serialization as well.</summary>
         public IDictionary<string, object> AdditionalData { get; set; }
         /// <summary>The firstSector property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? FirstSector { get; set; }
-#nullable restore
-#else
-        public UntypedNode FirstSector { get; set; }
-#endif
+        public long? FirstSector { get; set; }
         /// <summary>The lastSector property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? LastSector { get; set; }
-#nullable restore
-#else
-        public UntypedNode LastSector { get; set; }
-#endif
+        public long? LastSector { get; set; }
         /// <summary>The sessionNumber property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? SessionNumber { get; set; }
-#nullable restore
-#else
-        public UntypedNode SessionNumber { get; set; }
-#endif
+        public int? SessionNumber { get; set; }
         /// <summary>The trackNumber property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? TrackNumber { get; set; }
-#nullable restore
-#else
-        public UntypedNode TrackNumber { get; set; }
-#endif
+        public int? TrackNumber { get; set; }
         /// <summary>The type property</summary>
         public int? Type { get; set; }
         /// <summary>
@@ -73,10 +49,10 @@ namespace Marechai.App.Models
         {
             return new Dictionary<string, Action<IParseNode>>
             {
-                { "firstSector", n => { FirstSector = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
-                { "lastSector", n => { LastSector = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
-                { "sessionNumber", n => { SessionNumber = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
-                { "trackNumber", n => { TrackNumber = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
+                { "firstSector", n => { FirstSector = n.GetLongValue(); } },
+                { "lastSector", n => { LastSector = n.GetLongValue(); } },
+                { "sessionNumber", n => { SessionNumber = n.GetIntValue(); } },
+                { "trackNumber", n => { TrackNumber = n.GetIntValue(); } },
                 { "type", n => { Type = n.GetIntValue(); } },
             };
         }
@@ -87,10 +63,10 @@ namespace Marechai.App.Models
         public virtual void Serialize(ISerializationWriter writer)
         {
             if(ReferenceEquals(writer, null)) throw new ArgumentNullException(nameof(writer));
-            writer.WriteObjectValue<UntypedNode>("firstSector", FirstSector);
-            writer.WriteObjectValue<UntypedNode>("lastSector", LastSector);
-            writer.WriteObjectValue<UntypedNode>("sessionNumber", SessionNumber);
-            writer.WriteObjectValue<UntypedNode>("trackNumber", TrackNumber);
+            writer.WriteLongValue("firstSector", FirstSector);
+            writer.WriteLongValue("lastSector", LastSector);
+            writer.WriteIntValue("sessionNumber", SessionNumber);
+            writer.WriteIntValue("trackNumber", TrackNumber);
             writer.WriteIntValue("type", Type);
             writer.WriteAdditionalData(AdditionalData);
         }
diff --git a/Marechai.App/Services/Client/Models/PersonByBookDto.cs b/Marechai.App/Services/Client/Models/PersonByBookDto.cs
index 12c384b8..936b2252 100644
--- a/Marechai.App/Services/Client/Models/PersonByBookDto.cs
+++ b/Marechai.App/Services/Client/Models/PersonByBookDto.cs
@@ -23,13 +23,7 @@ namespace Marechai.App.Models
         public string Alias { get; set; }
 #endif
         /// <summary>The book_id property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? BookId { get; set; }
-#nullable restore
-#else
-        public UntypedNode BookId { get; set; }
-#endif
+        public long? BookId { get; set; }
         /// <summary>The display_name property</summary>
 #if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
 #nullable enable
@@ -39,13 +33,7 @@ namespace Marechai.App.Models
         public string DisplayName { get; set; }
 #endif
         /// <summary>The id property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? Id { get; set; }
-#nullable restore
-#else
-        public UntypedNode Id { get; set; }
-#endif
+        public long? Id { get; set; }
         /// <summary>The name property</summary>
 #if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
 #nullable enable
@@ -55,13 +43,7 @@ namespace Marechai.App.Models
         public string Name { get; set; }
 #endif
         /// <summary>The person_id property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? PersonId { get; set; }
-#nullable restore
-#else
-        public UntypedNode PersonId { get; set; }
-#endif
+        public int? PersonId { get; set; }
         /// <summary>The role property</summary>
 #if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
 #nullable enable
@@ -112,11 +94,11 @@ namespace Marechai.App.Models
             return new Dictionary<string, Action<IParseNode>>
             {
                 { "alias", n => { Alias = n.GetStringValue(); } },
-                { "book_id", n => { BookId = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
+                { "book_id", n => { BookId = n.GetLongValue(); } },
                 { "display_name", n => { DisplayName = n.GetStringValue(); } },
-                { "id", n => { Id = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
+                { "id", n => { Id = n.GetLongValue(); } },
                 { "name", n => { Name = n.GetStringValue(); } },
-                { "person_id", n => { PersonId = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
+                { "person_id", n => { PersonId = n.GetIntValue(); } },
                 { "role", n => { Role = n.GetStringValue(); } },
                 { "role_id", n => { RoleId = n.GetStringValue(); } },
                 { "surname", n => { Surname = n.GetStringValue(); } },
@@ -130,11 +112,11 @@ namespace Marechai.App.Models
         {
             if(ReferenceEquals(writer, null)) throw new ArgumentNullException(nameof(writer));
             writer.WriteStringValue("alias", Alias);
-            writer.WriteObjectValue<UntypedNode>("book_id", BookId);
+            writer.WriteLongValue("book_id", BookId);
             writer.WriteStringValue("display_name", DisplayName);
-            writer.WriteObjectValue<UntypedNode>("id", Id);
+            writer.WriteLongValue("id", Id);
             writer.WriteStringValue("name", Name);
-            writer.WriteObjectValue<UntypedNode>("person_id", PersonId);
+            writer.WriteIntValue("person_id", PersonId);
             writer.WriteStringValue("role", Role);
             writer.WriteStringValue("role_id", RoleId);
             writer.WriteStringValue("surname", Surname);
diff --git a/Marechai.App/Services/Client/Models/PersonByDocumentDto.cs b/Marechai.App/Services/Client/Models/PersonByDocumentDto.cs
index d1590b00..88ee86a1 100644
--- a/Marechai.App/Services/Client/Models/PersonByDocumentDto.cs
+++ b/Marechai.App/Services/Client/Models/PersonByDocumentDto.cs
@@ -31,21 +31,9 @@ namespace Marechai.App.Models
         public string DisplayName { get; set; }
 #endif
         /// <summary>The document_id property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? DocumentId { get; set; }
-#nullable restore
-#else
-        public UntypedNode DocumentId { get; set; }
-#endif
+        public long? DocumentId { get; set; }
         /// <summary>The id property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? Id { get; set; }
-#nullable restore
-#else
-        public UntypedNode Id { get; set; }
-#endif
+        public long? Id { get; set; }
         /// <summary>The name property</summary>
 #if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
 #nullable enable
@@ -55,13 +43,7 @@ namespace Marechai.App.Models
         public string Name { get; set; }
 #endif
         /// <summary>The person_id property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? PersonId { get; set; }
-#nullable restore
-#else
-        public UntypedNode PersonId { get; set; }
-#endif
+        public int? PersonId { get; set; }
         /// <summary>The role property</summary>
 #if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
 #nullable enable
@@ -113,10 +95,10 @@ namespace Marechai.App.Models
             {
                 { "alias", n => { Alias = n.GetStringValue(); } },
                 { "display_name", n => { DisplayName = n.GetStringValue(); } },
-                { "document_id", n => { DocumentId = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
-                { "id", n => { Id = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
+                { "document_id", n => { DocumentId = n.GetLongValue(); } },
+                { "id", n => { Id = n.GetLongValue(); } },
                 { "name", n => { Name = n.GetStringValue(); } },
-                { "person_id", n => { PersonId = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
+                { "person_id", n => { PersonId = n.GetIntValue(); } },
                 { "role", n => { Role = n.GetStringValue(); } },
                 { "role_id", n => { RoleId = n.GetStringValue(); } },
                 { "surname", n => { Surname = n.GetStringValue(); } },
@@ -131,10 +113,10 @@ namespace Marechai.App.Models
             if(ReferenceEquals(writer, null)) throw new ArgumentNullException(nameof(writer));
             writer.WriteStringValue("alias", Alias);
             writer.WriteStringValue("display_name", DisplayName);
-            writer.WriteObjectValue<UntypedNode>("document_id", DocumentId);
-            writer.WriteObjectValue<UntypedNode>("id", Id);
+            writer.WriteLongValue("document_id", DocumentId);
+            writer.WriteLongValue("id", Id);
             writer.WriteStringValue("name", Name);
-            writer.WriteObjectValue<UntypedNode>("person_id", PersonId);
+            writer.WriteIntValue("person_id", PersonId);
             writer.WriteStringValue("role", Role);
             writer.WriteStringValue("role_id", RoleId);
             writer.WriteStringValue("surname", Surname);
diff --git a/Marechai.App/Services/Client/Models/PersonByMagazineDto.cs b/Marechai.App/Services/Client/Models/PersonByMagazineDto.cs
index 7c91198e..a4ca41e3 100644
--- a/Marechai.App/Services/Client/Models/PersonByMagazineDto.cs
+++ b/Marechai.App/Services/Client/Models/PersonByMagazineDto.cs
@@ -31,21 +31,9 @@ namespace Marechai.App.Models
         public string DisplayName { get; set; }
 #endif
         /// <summary>The id property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? Id { get; set; }
-#nullable restore
-#else
-        public UntypedNode Id { get; set; }
-#endif
+        public long? Id { get; set; }
         /// <summary>The magazine_id property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? MagazineId { get; set; }
-#nullable restore
-#else
-        public UntypedNode MagazineId { get; set; }
-#endif
+        public long? MagazineId { get; set; }
         /// <summary>The name property</summary>
 #if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
 #nullable enable
@@ -55,13 +43,7 @@ namespace Marechai.App.Models
         public string Name { get; set; }
 #endif
         /// <summary>The person_id property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? PersonId { get; set; }
-#nullable restore
-#else
-        public UntypedNode PersonId { get; set; }
-#endif
+        public int? PersonId { get; set; }
         /// <summary>The role property</summary>
 #if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
 #nullable enable
@@ -113,10 +95,10 @@ namespace Marechai.App.Models
             {
                 { "alias", n => { Alias = n.GetStringValue(); } },
                 { "display_name", n => { DisplayName = n.GetStringValue(); } },
-                { "id", n => { Id = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
-                { "magazine_id", n => { MagazineId = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
+                { "id", n => { Id = n.GetLongValue(); } },
+                { "magazine_id", n => { MagazineId = n.GetLongValue(); } },
                 { "name", n => { Name = n.GetStringValue(); } },
-                { "person_id", n => { PersonId = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
+                { "person_id", n => { PersonId = n.GetIntValue(); } },
                 { "role", n => { Role = n.GetStringValue(); } },
                 { "role_id", n => { RoleId = n.GetStringValue(); } },
                 { "surname", n => { Surname = n.GetStringValue(); } },
@@ -131,10 +113,10 @@ namespace Marechai.App.Models
             if(ReferenceEquals(writer, null)) throw new ArgumentNullException(nameof(writer));
             writer.WriteStringValue("alias", Alias);
             writer.WriteStringValue("display_name", DisplayName);
-            writer.WriteObjectValue<UntypedNode>("id", Id);
-            writer.WriteObjectValue<UntypedNode>("magazine_id", MagazineId);
+            writer.WriteLongValue("id", Id);
+            writer.WriteLongValue("magazine_id", MagazineId);
             writer.WriteStringValue("name", Name);
-            writer.WriteObjectValue<UntypedNode>("person_id", PersonId);
+            writer.WriteIntValue("person_id", PersonId);
             writer.WriteStringValue("role", Role);
             writer.WriteStringValue("role_id", RoleId);
             writer.WriteStringValue("surname", Surname);
diff --git a/Marechai.App/Services/Client/Models/PersonDto.cs b/Marechai.App/Services/Client/Models/PersonDto.cs
index 557e45c5..860223a5 100644
--- a/Marechai.App/Services/Client/Models/PersonDto.cs
+++ b/Marechai.App/Services/Client/Models/PersonDto.cs
@@ -33,13 +33,7 @@ namespace Marechai.App.Models
         public string Country { get; set; }
 #endif
         /// <summary>The country_id property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? CountryId { get; set; }
-#nullable restore
-#else
-        public UntypedNode CountryId { get; set; }
-#endif
+        public int? CountryId { get; set; }
         /// <summary>The death_date property</summary>
         public DateTimeOffset? DeathDate { get; set; }
         /// <summary>The display_name property</summary>
@@ -59,13 +53,7 @@ namespace Marechai.App.Models
         public string Facebook { get; set; }
 #endif
         /// <summary>The id property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? Id { get; set; }
-#nullable restore
-#else
-        public UntypedNode Id { get; set; }
-#endif
+        public int? Id { get; set; }
         /// <summary>The name property</summary>
 #if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
 #nullable enable
@@ -128,11 +116,11 @@ namespace Marechai.App.Models
                 { "alias", n => { Alias = n.GetStringValue(); } },
                 { "birthdate", n => { Birthdate = n.GetDateTimeOffsetValue(); } },
                 { "country", n => { Country = n.GetStringValue(); } },
-                { "country_id", n => { CountryId = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
+                { "country_id", n => { CountryId = n.GetIntValue(); } },
                 { "death_date", n => { DeathDate = n.GetDateTimeOffsetValue(); } },
                 { "display_name", n => { DisplayName = n.GetStringValue(); } },
                 { "facebook", n => { Facebook = n.GetStringValue(); } },
-                { "id", n => { Id = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
+                { "id", n => { Id = n.GetIntValue(); } },
                 { "name", n => { Name = n.GetStringValue(); } },
                 { "photo", n => { Photo = n.GetGuidValue(); } },
                 { "surname", n => { Surname = n.GetStringValue(); } },
@@ -150,11 +138,11 @@ namespace Marechai.App.Models
             writer.WriteStringValue("alias", Alias);
             writer.WriteDateTimeOffsetValue("birthdate", Birthdate);
             writer.WriteStringValue("country", Country);
-            writer.WriteObjectValue<UntypedNode>("country_id", CountryId);
+            writer.WriteIntValue("country_id", CountryId);
             writer.WriteDateTimeOffsetValue("death_date", DeathDate);
             writer.WriteStringValue("display_name", DisplayName);
             writer.WriteStringValue("facebook", Facebook);
-            writer.WriteObjectValue<UntypedNode>("id", Id);
+            writer.WriteIntValue("id", Id);
             writer.WriteStringValue("name", Name);
             writer.WriteGuidValue("photo", Photo);
             writer.WriteStringValue("surname", Surname);
diff --git a/Marechai.App/Services/Client/Models/ProblemDetails.cs b/Marechai.App/Services/Client/Models/ProblemDetails.cs
index bd152434..51cd9790 100644
--- a/Marechai.App/Services/Client/Models/ProblemDetails.cs
+++ b/Marechai.App/Services/Client/Models/ProblemDetails.cs
@@ -34,13 +34,7 @@ namespace Marechai.App.Models
         /// <summary>The primary error message.</summary>
         public override string Message { get => base.Message; }
         /// <summary>The status property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? Status { get; set; }
-#nullable restore
-#else
-        public UntypedNode Status { get; set; }
-#endif
+        public int? Status { get; set; }
         /// <summary>The title property</summary>
 #if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
 #nullable enable
@@ -84,7 +78,7 @@ namespace Marechai.App.Models
             {
                 { "detail", n => { Detail = n.GetStringValue(); } },
                 { "instance", n => { Instance = n.GetStringValue(); } },
-                { "status", n => { Status = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
+                { "status", n => { Status = n.GetIntValue(); } },
                 { "title", n => { Title = n.GetStringValue(); } },
                 { "type", n => { Type = n.GetStringValue(); } },
             };
@@ -98,7 +92,7 @@ namespace Marechai.App.Models
             if(ReferenceEquals(writer, null)) throw new ArgumentNullException(nameof(writer));
             writer.WriteStringValue("detail", Detail);
             writer.WriteStringValue("instance", Instance);
-            writer.WriteObjectValue<UntypedNode>("status", Status);
+            writer.WriteIntValue("status", Status);
             writer.WriteStringValue("title", Title);
             writer.WriteStringValue("type", Type);
             writer.WriteAdditionalData(AdditionalData);
diff --git a/Marechai.App/Services/Client/Models/ProcessorByMachineDto.cs b/Marechai.App/Services/Client/Models/ProcessorByMachineDto.cs
index b604baa3..17c3d6e0 100644
--- a/Marechai.App/Services/Client/Models/ProcessorByMachineDto.cs
+++ b/Marechai.App/Services/Client/Models/ProcessorByMachineDto.cs
@@ -23,21 +23,9 @@ namespace Marechai.App.Models
         public string Company { get; set; }
 #endif
         /// <summary>The id property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? Id { get; set; }
-#nullable restore
-#else
-        public UntypedNode Id { get; set; }
-#endif
+        public long? Id { get; set; }
         /// <summary>The machine_id property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? MachineId { get; set; }
-#nullable restore
-#else
-        public UntypedNode MachineId { get; set; }
-#endif
+        public int? MachineId { get; set; }
         /// <summary>The name property</summary>
 #if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
 #nullable enable
@@ -47,21 +35,9 @@ namespace Marechai.App.Models
         public string Name { get; set; }
 #endif
         /// <summary>The processor_id property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? ProcessorId { get; set; }
-#nullable restore
-#else
-        public UntypedNode ProcessorId { get; set; }
-#endif
+        public int? ProcessorId { get; set; }
         /// <summary>The speed property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? Speed { get; set; }
-#nullable restore
-#else
-        public UntypedNode Speed { get; set; }
-#endif
+        public float? Speed { get; set; }
         /// <summary>
         /// Instantiates a new <see cref="global::Marechai.App.Models.ProcessorByMachineDto"/> and sets the default values.
         /// </summary>
@@ -88,11 +64,11 @@ namespace Marechai.App.Models
             return new Dictionary<string, Action<IParseNode>>
             {
                 { "company", n => { Company = n.GetStringValue(); } },
-                { "id", n => { Id = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
-                { "machine_id", n => { MachineId = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
+                { "id", n => { Id = n.GetLongValue(); } },
+                { "machine_id", n => { MachineId = n.GetIntValue(); } },
                 { "name", n => { Name = n.GetStringValue(); } },
-                { "processor_id", n => { ProcessorId = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
-                { "speed", n => { Speed = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
+                { "processor_id", n => { ProcessorId = n.GetIntValue(); } },
+                { "speed", n => { Speed = n.GetFloatValue(); } },
             };
         }
         /// <summary>
@@ -103,11 +79,11 @@ namespace Marechai.App.Models
         {
             if(ReferenceEquals(writer, null)) throw new ArgumentNullException(nameof(writer));
             writer.WriteStringValue("company", Company);
-            writer.WriteObjectValue<UntypedNode>("id", Id);
-            writer.WriteObjectValue<UntypedNode>("machine_id", MachineId);
+            writer.WriteLongValue("id", Id);
+            writer.WriteIntValue("machine_id", MachineId);
             writer.WriteStringValue("name", Name);
-            writer.WriteObjectValue<UntypedNode>("processor_id", ProcessorId);
-            writer.WriteObjectValue<UntypedNode>("speed", Speed);
+            writer.WriteIntValue("processor_id", ProcessorId);
+            writer.WriteFloatValue("speed", Speed);
             writer.WriteAdditionalData(AdditionalData);
         }
     }
diff --git a/Marechai.App/Services/Client/Models/ProcessorDto.cs b/Marechai.App/Services/Client/Models/ProcessorDto.cs
index ff9047b8..04ec633a 100644
--- a/Marechai.App/Services/Client/Models/ProcessorDto.cs
+++ b/Marechai.App/Services/Client/Models/ProcessorDto.cs
@@ -15,13 +15,7 @@ namespace Marechai.App.Models
         /// <summary>Stores additional data not described in the OpenAPI description found when deserializing. Can be used for serialization as well.</summary>
         public IDictionary<string, object> AdditionalData { get; set; }
         /// <summary>The address_bus property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? AddressBus { get; set; }
-#nullable restore
-#else
-        public UntypedNode AddressBus { get; set; }
-#endif
+        public int? AddressBus { get; set; }
         /// <summary>The company property</summary>
 #if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
 #nullable enable
@@ -31,77 +25,23 @@ namespace Marechai.App.Models
         public string Company { get; set; }
 #endif
         /// <summary>The company_id property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? CompanyId { get; set; }
-#nullable restore
-#else
-        public UntypedNode CompanyId { get; set; }
-#endif
+        public int? CompanyId { get; set; }
         /// <summary>The cores property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? Cores { get; set; }
-#nullable restore
-#else
-        public UntypedNode Cores { get; set; }
-#endif
+        public int? Cores { get; set; }
         /// <summary>The data_bus property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? DataBus { get; set; }
-#nullable restore
-#else
-        public UntypedNode DataBus { get; set; }
-#endif
+        public int? DataBus { get; set; }
         /// <summary>The die_size property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? DieSize { get; set; }
-#nullable restore
-#else
-        public UntypedNode DieSize { get; set; }
-#endif
+        public float? DieSize { get; set; }
         /// <summary>The fprs property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? Fprs { get; set; }
-#nullable restore
-#else
-        public UntypedNode Fprs { get; set; }
-#endif
+        public int? Fprs { get; set; }
         /// <summary>The fpr_size property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? FprSize { get; set; }
-#nullable restore
-#else
-        public UntypedNode FprSize { get; set; }
-#endif
+        public int? FprSize { get; set; }
         /// <summary>The gprs property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? Gprs { get; set; }
-#nullable restore
-#else
-        public UntypedNode Gprs { get; set; }
-#endif
+        public int? Gprs { get; set; }
         /// <summary>The gpr_size property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? GprSize { get; set; }
-#nullable restore
-#else
-        public UntypedNode GprSize { get; set; }
-#endif
+        public int? GprSize { get; set; }
         /// <summary>The id property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? Id { get; set; }
-#nullable restore
-#else
-        public UntypedNode Id { get; set; }
-#endif
+        public int? Id { get; set; }
         /// <summary>The instruction_set property</summary>
 #if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
 #nullable enable
@@ -119,47 +59,17 @@ namespace Marechai.App.Models
         public List<string> InstructionSetExtensions { get; set; }
 #endif
         /// <summary>The instruction_set_id property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? InstructionSetId { get; set; }
-#nullable restore
-#else
-        public UntypedNode InstructionSetId { get; set; }
-#endif
+        public int? InstructionSetId { get; set; }
         /// <summary>The introduced property</summary>
         public DateTimeOffset? Introduced { get; set; }
         /// <summary>The l1_data property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? L1Data { get; set; }
-#nullable restore
-#else
-        public UntypedNode L1Data { get; set; }
-#endif
+        public float? L1Data { get; set; }
         /// <summary>The l1_instruction property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? L1Instruction { get; set; }
-#nullable restore
-#else
-        public UntypedNode L1Instruction { get; set; }
-#endif
+        public float? L1Instruction { get; set; }
         /// <summary>The l2 property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? L2 { get; set; }
-#nullable restore
-#else
-        public UntypedNode L2 { get; set; }
-#endif
+        public float? L2 { get; set; }
         /// <summary>The l3 property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? L3 { get; set; }
-#nullable restore
-#else
-        public UntypedNode L3 { get; set; }
-#endif
+        public float? L3 { get; set; }
         /// <summary>The model_code property</summary>
 #if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
 #nullable enable
@@ -193,53 +103,17 @@ namespace Marechai.App.Models
         public string Process { get; set; }
 #endif
         /// <summary>The process_nm property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? ProcessNm { get; set; }
-#nullable restore
-#else
-        public UntypedNode ProcessNm { get; set; }
-#endif
+        public float? ProcessNm { get; set; }
         /// <summary>The simd_registers property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? SimdRegisters { get; set; }
-#nullable restore
-#else
-        public UntypedNode SimdRegisters { get; set; }
-#endif
+        public int? SimdRegisters { get; set; }
         /// <summary>The simd_size property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? SimdSize { get; set; }
-#nullable restore
-#else
-        public UntypedNode SimdSize { get; set; }
-#endif
+        public int? SimdSize { get; set; }
         /// <summary>The speed property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? Speed { get; set; }
-#nullable restore
-#else
-        public UntypedNode Speed { get; set; }
-#endif
+        public double? Speed { get; set; }
         /// <summary>The threads_per_core property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? ThreadsPerCore { get; set; }
-#nullable restore
-#else
-        public UntypedNode ThreadsPerCore { get; set; }
-#endif
+        public int? ThreadsPerCore { get; set; }
         /// <summary>The transistors property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? Transistors { get; set; }
-#nullable restore
-#else
-        public UntypedNode Transistors { get; set; }
-#endif
+        public long? Transistors { get; set; }
         /// <summary>
         /// Instantiates a new <see cref="global::Marechai.App.Models.ProcessorDto"/> and sets the default values.
         /// </summary>
@@ -265,35 +139,35 @@ namespace Marechai.App.Models
         {
             return new Dictionary<string, Action<IParseNode>>
             {
-                { "address_bus", n => { AddressBus = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
+                { "address_bus", n => { AddressBus = n.GetIntValue(); } },
                 { "company", n => { Company = n.GetStringValue(); } },
-                { "company_id", n => { CompanyId = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
-                { "cores", n => { Cores = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
-                { "data_bus", n => { DataBus = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
-                { "die_size", n => { DieSize = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
-                { "fpr_size", n => { FprSize = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
-                { "fprs", n => { Fprs = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
-                { "gpr_size", n => { GprSize = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
-                { "gprs", n => { Gprs = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
-                { "id", n => { Id = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
+                { "company_id", n => { CompanyId = n.GetIntValue(); } },
+                { "cores", n => { Cores = n.GetIntValue(); } },
+                { "data_bus", n => { DataBus = n.GetIntValue(); } },
+                { "die_size", n => { DieSize = n.GetFloatValue(); } },
+                { "fpr_size", n => { FprSize = n.GetIntValue(); } },
+                { "fprs", n => { Fprs = n.GetIntValue(); } },
+                { "gpr_size", n => { GprSize = n.GetIntValue(); } },
+                { "gprs", n => { Gprs = n.GetIntValue(); } },
+                { "id", n => { Id = n.GetIntValue(); } },
                 { "instruction_set", n => { InstructionSet = n.GetStringValue(); } },
                 { "instruction_set_extensions", n => { InstructionSetExtensions = n.GetCollectionOfPrimitiveValues<string>()?.AsList(); } },
-                { "instruction_set_id", n => { InstructionSetId = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
+                { "instruction_set_id", n => { InstructionSetId = n.GetIntValue(); } },
                 { "introduced", n => { Introduced = n.GetDateTimeOffsetValue(); } },
-                { "l1_data", n => { L1Data = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
-                { "l1_instruction", n => { L1Instruction = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
-                { "l2", n => { L2 = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
-                { "l3", n => { L3 = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
+                { "l1_data", n => { L1Data = n.GetFloatValue(); } },
+                { "l1_instruction", n => { L1Instruction = n.GetFloatValue(); } },
+                { "l2", n => { L2 = n.GetFloatValue(); } },
+                { "l3", n => { L3 = n.GetFloatValue(); } },
                 { "model_code", n => { ModelCode = n.GetStringValue(); } },
                 { "name", n => { Name = n.GetStringValue(); } },
                 { "package", n => { Package = n.GetStringValue(); } },
                 { "process", n => { Process = n.GetStringValue(); } },
-                { "process_nm", n => { ProcessNm = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
-                { "simd_registers", n => { SimdRegisters = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
-                { "simd_size", n => { SimdSize = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
-                { "speed", n => { Speed = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
-                { "threads_per_core", n => { ThreadsPerCore = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
-                { "transistors", n => { Transistors = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
+                { "process_nm", n => { ProcessNm = n.GetFloatValue(); } },
+                { "simd_registers", n => { SimdRegisters = n.GetIntValue(); } },
+                { "simd_size", n => { SimdSize = n.GetIntValue(); } },
+                { "speed", n => { Speed = n.GetDoubleValue(); } },
+                { "threads_per_core", n => { ThreadsPerCore = n.GetIntValue(); } },
+                { "transistors", n => { Transistors = n.GetLongValue(); } },
             };
         }
         /// <summary>
@@ -303,35 +177,35 @@ namespace Marechai.App.Models
         public virtual void Serialize(ISerializationWriter writer)
         {
             if(ReferenceEquals(writer, null)) throw new ArgumentNullException(nameof(writer));
-            writer.WriteObjectValue<UntypedNode>("address_bus", AddressBus);
+            writer.WriteIntValue("address_bus", AddressBus);
             writer.WriteStringValue("company", Company);
-            writer.WriteObjectValue<UntypedNode>("company_id", CompanyId);
-            writer.WriteObjectValue<UntypedNode>("cores", Cores);
-            writer.WriteObjectValue<UntypedNode>("data_bus", DataBus);
-            writer.WriteObjectValue<UntypedNode>("die_size", DieSize);
-            writer.WriteObjectValue<UntypedNode>("fprs", Fprs);
-            writer.WriteObjectValue<UntypedNode>("fpr_size", FprSize);
-            writer.WriteObjectValue<UntypedNode>("gprs", Gprs);
-            writer.WriteObjectValue<UntypedNode>("gpr_size", GprSize);
-            writer.WriteObjectValue<UntypedNode>("id", Id);
+            writer.WriteIntValue("company_id", CompanyId);
+            writer.WriteIntValue("cores", Cores);
+            writer.WriteIntValue("data_bus", DataBus);
+            writer.WriteFloatValue("die_size", DieSize);
+            writer.WriteIntValue("fprs", Fprs);
+            writer.WriteIntValue("fpr_size", FprSize);
+            writer.WriteIntValue("gprs", Gprs);
+            writer.WriteIntValue("gpr_size", GprSize);
+            writer.WriteIntValue("id", Id);
             writer.WriteStringValue("instruction_set", InstructionSet);
             writer.WriteCollectionOfPrimitiveValues<string>("instruction_set_extensions", InstructionSetExtensions);
-            writer.WriteObjectValue<UntypedNode>("instruction_set_id", InstructionSetId);
+            writer.WriteIntValue("instruction_set_id", InstructionSetId);
             writer.WriteDateTimeOffsetValue("introduced", Introduced);
-            writer.WriteObjectValue<UntypedNode>("l1_data", L1Data);
-            writer.WriteObjectValue<UntypedNode>("l1_instruction", L1Instruction);
-            writer.WriteObjectValue<UntypedNode>("l2", L2);
-            writer.WriteObjectValue<UntypedNode>("l3", L3);
+            writer.WriteFloatValue("l1_data", L1Data);
+            writer.WriteFloatValue("l1_instruction", L1Instruction);
+            writer.WriteFloatValue("l2", L2);
+            writer.WriteFloatValue("l3", L3);
             writer.WriteStringValue("model_code", ModelCode);
             writer.WriteStringValue("name", Name);
             writer.WriteStringValue("package", Package);
             writer.WriteStringValue("process", Process);
-            writer.WriteObjectValue<UntypedNode>("process_nm", ProcessNm);
-            writer.WriteObjectValue<UntypedNode>("simd_registers", SimdRegisters);
-            writer.WriteObjectValue<UntypedNode>("simd_size", SimdSize);
-            writer.WriteObjectValue<UntypedNode>("speed", Speed);
-            writer.WriteObjectValue<UntypedNode>("threads_per_core", ThreadsPerCore);
-            writer.WriteObjectValue<UntypedNode>("transistors", Transistors);
+            writer.WriteFloatValue("process_nm", ProcessNm);
+            writer.WriteIntValue("simd_registers", SimdRegisters);
+            writer.WriteIntValue("simd_size", SimdSize);
+            writer.WriteDoubleValue("speed", Speed);
+            writer.WriteIntValue("threads_per_core", ThreadsPerCore);
+            writer.WriteLongValue("transistors", Transistors);
             writer.WriteAdditionalData(AdditionalData);
         }
     }
diff --git a/Marechai.App/Services/Client/Models/ResolutionByGpuDto.cs b/Marechai.App/Services/Client/Models/ResolutionByGpuDto.cs
index 5efcf7d4..7e741898 100644
--- a/Marechai.App/Services/Client/Models/ResolutionByGpuDto.cs
+++ b/Marechai.App/Services/Client/Models/ResolutionByGpuDto.cs
@@ -15,21 +15,9 @@ namespace Marechai.App.Models
         /// <summary>Stores additional data not described in the OpenAPI description found when deserializing. Can be used for serialization as well.</summary>
         public IDictionary<string, object> AdditionalData { get; set; }
         /// <summary>The gpu_id property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? GpuId { get; set; }
-#nullable restore
-#else
-        public UntypedNode GpuId { get; set; }
-#endif
+        public int? GpuId { get; set; }
         /// <summary>The id property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? Id { get; set; }
-#nullable restore
-#else
-        public UntypedNode Id { get; set; }
-#endif
+        public long? Id { get; set; }
         /// <summary>The resolution property</summary>
 #if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
 #nullable enable
@@ -39,13 +27,7 @@ namespace Marechai.App.Models
         public global::Marechai.App.Models.ResolutionByGpuDto.ResolutionByGpuDto_resolution Resolution { get; set; }
 #endif
         /// <summary>The resolution_id property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? ResolutionId { get; set; }
-#nullable restore
-#else
-        public UntypedNode ResolutionId { get; set; }
-#endif
+        public int? ResolutionId { get; set; }
         /// <summary>
         /// Instantiates a new <see cref="global::Marechai.App.Models.ResolutionByGpuDto"/> and sets the default values.
         /// </summary>
@@ -71,10 +53,10 @@ namespace Marechai.App.Models
         {
             return new Dictionary<string, Action<IParseNode>>
             {
-                { "gpu_id", n => { GpuId = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
-                { "id", n => { Id = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
+                { "gpu_id", n => { GpuId = n.GetIntValue(); } },
+                { "id", n => { Id = n.GetLongValue(); } },
                 { "resolution", n => { Resolution = n.GetObjectValue<global::Marechai.App.Models.ResolutionByGpuDto.ResolutionByGpuDto_resolution>(global::Marechai.App.Models.ResolutionByGpuDto.ResolutionByGpuDto_resolution.CreateFromDiscriminatorValue); } },
-                { "resolution_id", n => { ResolutionId = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
+                { "resolution_id", n => { ResolutionId = n.GetIntValue(); } },
             };
         }
         /// <summary>
@@ -84,10 +66,10 @@ namespace Marechai.App.Models
         public virtual void Serialize(ISerializationWriter writer)
         {
             if(ReferenceEquals(writer, null)) throw new ArgumentNullException(nameof(writer));
-            writer.WriteObjectValue<UntypedNode>("gpu_id", GpuId);
-            writer.WriteObjectValue<UntypedNode>("id", Id);
+            writer.WriteIntValue("gpu_id", GpuId);
+            writer.WriteLongValue("id", Id);
             writer.WriteObjectValue<global::Marechai.App.Models.ResolutionByGpuDto.ResolutionByGpuDto_resolution>("resolution", Resolution);
-            writer.WriteObjectValue<UntypedNode>("resolution_id", ResolutionId);
+            writer.WriteIntValue("resolution_id", ResolutionId);
             writer.WriteAdditionalData(AdditionalData);
         }
         /// <summary>
diff --git a/Marechai.App/Services/Client/Models/ResolutionByScreenDto.cs b/Marechai.App/Services/Client/Models/ResolutionByScreenDto.cs
index 9db2acc6..0abf0d9a 100644
--- a/Marechai.App/Services/Client/Models/ResolutionByScreenDto.cs
+++ b/Marechai.App/Services/Client/Models/ResolutionByScreenDto.cs
@@ -15,13 +15,7 @@ namespace Marechai.App.Models
         /// <summary>Stores additional data not described in the OpenAPI description found when deserializing. Can be used for serialization as well.</summary>
         public IDictionary<string, object> AdditionalData { get; set; }
         /// <summary>The id property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? Id { get; set; }
-#nullable restore
-#else
-        public UntypedNode Id { get; set; }
-#endif
+        public long? Id { get; set; }
         /// <summary>The resolution property</summary>
 #if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
 #nullable enable
@@ -31,21 +25,9 @@ namespace Marechai.App.Models
         public global::Marechai.App.Models.ResolutionByScreenDto.ResolutionByScreenDto_resolution Resolution { get; set; }
 #endif
         /// <summary>The resolution_id property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? ResolutionId { get; set; }
-#nullable restore
-#else
-        public UntypedNode ResolutionId { get; set; }
-#endif
+        public int? ResolutionId { get; set; }
         /// <summary>The screen_id property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? ScreenId { get; set; }
-#nullable restore
-#else
-        public UntypedNode ScreenId { get; set; }
-#endif
+        public int? ScreenId { get; set; }
         /// <summary>
         /// Instantiates a new <see cref="global::Marechai.App.Models.ResolutionByScreenDto"/> and sets the default values.
         /// </summary>
@@ -71,10 +53,10 @@ namespace Marechai.App.Models
         {
             return new Dictionary<string, Action<IParseNode>>
             {
-                { "id", n => { Id = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
+                { "id", n => { Id = n.GetLongValue(); } },
                 { "resolution", n => { Resolution = n.GetObjectValue<global::Marechai.App.Models.ResolutionByScreenDto.ResolutionByScreenDto_resolution>(global::Marechai.App.Models.ResolutionByScreenDto.ResolutionByScreenDto_resolution.CreateFromDiscriminatorValue); } },
-                { "resolution_id", n => { ResolutionId = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
-                { "screen_id", n => { ScreenId = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
+                { "resolution_id", n => { ResolutionId = n.GetIntValue(); } },
+                { "screen_id", n => { ScreenId = n.GetIntValue(); } },
             };
         }
         /// <summary>
@@ -84,10 +66,10 @@ namespace Marechai.App.Models
         public virtual void Serialize(ISerializationWriter writer)
         {
             if(ReferenceEquals(writer, null)) throw new ArgumentNullException(nameof(writer));
-            writer.WriteObjectValue<UntypedNode>("id", Id);
+            writer.WriteLongValue("id", Id);
             writer.WriteObjectValue<global::Marechai.App.Models.ResolutionByScreenDto.ResolutionByScreenDto_resolution>("resolution", Resolution);
-            writer.WriteObjectValue<UntypedNode>("resolution_id", ResolutionId);
-            writer.WriteObjectValue<UntypedNode>("screen_id", ScreenId);
+            writer.WriteIntValue("resolution_id", ResolutionId);
+            writer.WriteIntValue("screen_id", ScreenId);
             writer.WriteAdditionalData(AdditionalData);
         }
         /// <summary>
diff --git a/Marechai.App/Services/Client/Models/ResolutionDto.cs b/Marechai.App/Services/Client/Models/ResolutionDto.cs
index f4043537..54168139 100644
--- a/Marechai.App/Services/Client/Models/ResolutionDto.cs
+++ b/Marechai.App/Services/Client/Models/ResolutionDto.cs
@@ -17,47 +17,17 @@ namespace Marechai.App.Models
         /// <summary>The chars property</summary>
         public bool? Chars { get; set; }
         /// <summary>The colors property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? Colors { get; set; }
-#nullable restore
-#else
-        public UntypedNode Colors { get; set; }
-#endif
+        public long? Colors { get; set; }
         /// <summary>The grayscale property</summary>
         public bool? Grayscale { get; set; }
         /// <summary>The height property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? Height { get; set; }
-#nullable restore
-#else
-        public UntypedNode Height { get; set; }
-#endif
+        public int? Height { get; set; }
         /// <summary>The id property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? Id { get; set; }
-#nullable restore
-#else
-        public UntypedNode Id { get; set; }
-#endif
+        public int? Id { get; set; }
         /// <summary>The palette property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? Palette { get; set; }
-#nullable restore
-#else
-        public UntypedNode Palette { get; set; }
-#endif
+        public long? Palette { get; set; }
         /// <summary>The width property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? Width { get; set; }
-#nullable restore
-#else
-        public UntypedNode Width { get; set; }
-#endif
+        public int? Width { get; set; }
         /// <summary>
         /// Instantiates a new <see cref="global::Marechai.App.Models.ResolutionDto"/> and sets the default values.
         /// </summary>
@@ -84,12 +54,12 @@ namespace Marechai.App.Models
             return new Dictionary<string, Action<IParseNode>>
             {
                 { "chars", n => { Chars = n.GetBoolValue(); } },
-                { "colors", n => { Colors = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
+                { "colors", n => { Colors = n.GetLongValue(); } },
                 { "grayscale", n => { Grayscale = n.GetBoolValue(); } },
-                { "height", n => { Height = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
-                { "id", n => { Id = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
-                { "palette", n => { Palette = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
-                { "width", n => { Width = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
+                { "height", n => { Height = n.GetIntValue(); } },
+                { "id", n => { Id = n.GetIntValue(); } },
+                { "palette", n => { Palette = n.GetLongValue(); } },
+                { "width", n => { Width = n.GetIntValue(); } },
             };
         }
         /// <summary>
@@ -100,12 +70,12 @@ namespace Marechai.App.Models
         {
             if(ReferenceEquals(writer, null)) throw new ArgumentNullException(nameof(writer));
             writer.WriteBoolValue("chars", Chars);
-            writer.WriteObjectValue<UntypedNode>("colors", Colors);
+            writer.WriteLongValue("colors", Colors);
             writer.WriteBoolValue("grayscale", Grayscale);
-            writer.WriteObjectValue<UntypedNode>("height", Height);
-            writer.WriteObjectValue<UntypedNode>("id", Id);
-            writer.WriteObjectValue<UntypedNode>("palette", Palette);
-            writer.WriteObjectValue<UntypedNode>("width", Width);
+            writer.WriteIntValue("height", Height);
+            writer.WriteIntValue("id", Id);
+            writer.WriteLongValue("palette", Palette);
+            writer.WriteIntValue("width", Width);
             writer.WriteAdditionalData(AdditionalData);
         }
     }
diff --git a/Marechai.App/Services/Client/Models/ScreenByMachineDto.cs b/Marechai.App/Services/Client/Models/ScreenByMachineDto.cs
index 603bb3d9..c79cf105 100644
--- a/Marechai.App/Services/Client/Models/ScreenByMachineDto.cs
+++ b/Marechai.App/Services/Client/Models/ScreenByMachineDto.cs
@@ -15,21 +15,9 @@ namespace Marechai.App.Models
         /// <summary>Stores additional data not described in the OpenAPI description found when deserializing. Can be used for serialization as well.</summary>
         public IDictionary<string, object> AdditionalData { get; set; }
         /// <summary>The id property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? Id { get; set; }
-#nullable restore
-#else
-        public UntypedNode Id { get; set; }
-#endif
+        public long? Id { get; set; }
         /// <summary>The machine_id property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? MachineId { get; set; }
-#nullable restore
-#else
-        public UntypedNode MachineId { get; set; }
-#endif
+        public int? MachineId { get; set; }
         /// <summary>The screen property</summary>
 #if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
 #nullable enable
@@ -39,13 +27,7 @@ namespace Marechai.App.Models
         public global::Marechai.App.Models.ScreenByMachineDto.ScreenByMachineDto_screen Screen { get; set; }
 #endif
         /// <summary>The screen_id property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? ScreenId { get; set; }
-#nullable restore
-#else
-        public UntypedNode ScreenId { get; set; }
-#endif
+        public int? ScreenId { get; set; }
         /// <summary>
         /// Instantiates a new <see cref="global::Marechai.App.Models.ScreenByMachineDto"/> and sets the default values.
         /// </summary>
@@ -71,10 +53,10 @@ namespace Marechai.App.Models
         {
             return new Dictionary<string, Action<IParseNode>>
             {
-                { "id", n => { Id = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
-                { "machine_id", n => { MachineId = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
+                { "id", n => { Id = n.GetLongValue(); } },
+                { "machine_id", n => { MachineId = n.GetIntValue(); } },
                 { "screen", n => { Screen = n.GetObjectValue<global::Marechai.App.Models.ScreenByMachineDto.ScreenByMachineDto_screen>(global::Marechai.App.Models.ScreenByMachineDto.ScreenByMachineDto_screen.CreateFromDiscriminatorValue); } },
-                { "screen_id", n => { ScreenId = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
+                { "screen_id", n => { ScreenId = n.GetIntValue(); } },
             };
         }
         /// <summary>
@@ -84,10 +66,10 @@ namespace Marechai.App.Models
         public virtual void Serialize(ISerializationWriter writer)
         {
             if(ReferenceEquals(writer, null)) throw new ArgumentNullException(nameof(writer));
-            writer.WriteObjectValue<UntypedNode>("id", Id);
-            writer.WriteObjectValue<UntypedNode>("machine_id", MachineId);
+            writer.WriteLongValue("id", Id);
+            writer.WriteIntValue("machine_id", MachineId);
             writer.WriteObjectValue<global::Marechai.App.Models.ScreenByMachineDto.ScreenByMachineDto_screen>("screen", Screen);
-            writer.WriteObjectValue<UntypedNode>("screen_id", ScreenId);
+            writer.WriteIntValue("screen_id", ScreenId);
             writer.WriteAdditionalData(AdditionalData);
         }
         /// <summary>
diff --git a/Marechai.App/Services/Client/Models/ScreenDto.cs b/Marechai.App/Services/Client/Models/ScreenDto.cs
index 59759c1d..477ba7da 100644
--- a/Marechai.App/Services/Client/Models/ScreenDto.cs
+++ b/Marechai.App/Services/Client/Models/ScreenDto.cs
@@ -15,37 +15,13 @@ namespace Marechai.App.Models
         /// <summary>Stores additional data not described in the OpenAPI description found when deserializing. Can be used for serialization as well.</summary>
         public IDictionary<string, object> AdditionalData { get; set; }
         /// <summary>The diagonal property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? Diagonal { get; set; }
-#nullable restore
-#else
-        public UntypedNode Diagonal { get; set; }
-#endif
+        public double? Diagonal { get; set; }
         /// <summary>The effective_colors property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? EffectiveColors { get; set; }
-#nullable restore
-#else
-        public UntypedNode EffectiveColors { get; set; }
-#endif
+        public long? EffectiveColors { get; set; }
         /// <summary>The height property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? Height { get; set; }
-#nullable restore
-#else
-        public UntypedNode Height { get; set; }
-#endif
+        public double? Height { get; set; }
         /// <summary>The id property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? Id { get; set; }
-#nullable restore
-#else
-        public UntypedNode Id { get; set; }
-#endif
+        public int? Id { get; set; }
         /// <summary>The native_resolution property</summary>
 #if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
 #nullable enable
@@ -55,13 +31,7 @@ namespace Marechai.App.Models
         public global::Marechai.App.Models.ScreenDto.ScreenDto_native_resolution NativeResolution { get; set; }
 #endif
         /// <summary>The native_resolution_id property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? NativeResolutionId { get; set; }
-#nullable restore
-#else
-        public UntypedNode NativeResolutionId { get; set; }
-#endif
+        public int? NativeResolutionId { get; set; }
         /// <summary>The size property</summary>
 #if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
 #nullable enable
@@ -79,13 +49,7 @@ namespace Marechai.App.Models
         public string Type { get; set; }
 #endif
         /// <summary>The width property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? Width { get; set; }
-#nullable restore
-#else
-        public UntypedNode Width { get; set; }
-#endif
+        public double? Width { get; set; }
         /// <summary>
         /// Instantiates a new <see cref="global::Marechai.App.Models.ScreenDto"/> and sets the default values.
         /// </summary>
@@ -111,15 +75,15 @@ namespace Marechai.App.Models
         {
             return new Dictionary<string, Action<IParseNode>>
             {
-                { "diagonal", n => { Diagonal = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
-                { "effective_colors", n => { EffectiveColors = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
-                { "height", n => { Height = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
-                { "id", n => { Id = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
+                { "diagonal", n => { Diagonal = n.GetDoubleValue(); } },
+                { "effective_colors", n => { EffectiveColors = n.GetLongValue(); } },
+                { "height", n => { Height = n.GetDoubleValue(); } },
+                { "id", n => { Id = n.GetIntValue(); } },
                 { "native_resolution", n => { NativeResolution = n.GetObjectValue<global::Marechai.App.Models.ScreenDto.ScreenDto_native_resolution>(global::Marechai.App.Models.ScreenDto.ScreenDto_native_resolution.CreateFromDiscriminatorValue); } },
-                { "native_resolution_id", n => { NativeResolutionId = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
+                { "native_resolution_id", n => { NativeResolutionId = n.GetIntValue(); } },
                 { "size", n => { Size = n.GetStringValue(); } },
                 { "type", n => { Type = n.GetStringValue(); } },
-                { "width", n => { Width = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
+                { "width", n => { Width = n.GetDoubleValue(); } },
             };
         }
         /// <summary>
@@ -129,15 +93,15 @@ namespace Marechai.App.Models
         public virtual void Serialize(ISerializationWriter writer)
         {
             if(ReferenceEquals(writer, null)) throw new ArgumentNullException(nameof(writer));
-            writer.WriteObjectValue<UntypedNode>("diagonal", Diagonal);
-            writer.WriteObjectValue<UntypedNode>("effective_colors", EffectiveColors);
-            writer.WriteObjectValue<UntypedNode>("height", Height);
-            writer.WriteObjectValue<UntypedNode>("id", Id);
+            writer.WriteDoubleValue("diagonal", Diagonal);
+            writer.WriteLongValue("effective_colors", EffectiveColors);
+            writer.WriteDoubleValue("height", Height);
+            writer.WriteIntValue("id", Id);
             writer.WriteObjectValue<global::Marechai.App.Models.ScreenDto.ScreenDto_native_resolution>("native_resolution", NativeResolution);
-            writer.WriteObjectValue<UntypedNode>("native_resolution_id", NativeResolutionId);
+            writer.WriteIntValue("native_resolution_id", NativeResolutionId);
             writer.WriteStringValue("size", Size);
             writer.WriteStringValue("type", Type);
-            writer.WriteObjectValue<UntypedNode>("width", Width);
+            writer.WriteDoubleValue("width", Width);
             writer.WriteAdditionalData(AdditionalData);
         }
         /// <summary>
diff --git a/Marechai.App/Services/Client/Models/SoftwareFamilyDto.cs b/Marechai.App/Services/Client/Models/SoftwareFamilyDto.cs
index 55e320f9..c41c844a 100644
--- a/Marechai.App/Services/Client/Models/SoftwareFamilyDto.cs
+++ b/Marechai.App/Services/Client/Models/SoftwareFamilyDto.cs
@@ -15,13 +15,7 @@ namespace Marechai.App.Models
         /// <summary>Stores additional data not described in the OpenAPI description found when deserializing. Can be used for serialization as well.</summary>
         public IDictionary<string, object> AdditionalData { get; set; }
         /// <summary>The id property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? Id { get; set; }
-#nullable restore
-#else
-        public UntypedNode Id { get; set; }
-#endif
+        public int? Id { get; set; }
         /// <summary>The introduced property</summary>
         public DateTimeOffset? Introduced { get; set; }
         /// <summary>The name property</summary>
@@ -41,13 +35,7 @@ namespace Marechai.App.Models
         public string Parent { get; set; }
 #endif
         /// <summary>The parent_id property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? ParentId { get; set; }
-#nullable restore
-#else
-        public UntypedNode ParentId { get; set; }
-#endif
+        public int? ParentId { get; set; }
         /// <summary>
         /// Instantiates a new <see cref="global::Marechai.App.Models.SoftwareFamilyDto"/> and sets the default values.
         /// </summary>
@@ -73,11 +61,11 @@ namespace Marechai.App.Models
         {
             return new Dictionary<string, Action<IParseNode>>
             {
-                { "id", n => { Id = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
+                { "id", n => { Id = n.GetIntValue(); } },
                 { "introduced", n => { Introduced = n.GetDateTimeOffsetValue(); } },
                 { "name", n => { Name = n.GetStringValue(); } },
                 { "parent", n => { Parent = n.GetStringValue(); } },
-                { "parent_id", n => { ParentId = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
+                { "parent_id", n => { ParentId = n.GetIntValue(); } },
             };
         }
         /// <summary>
@@ -87,11 +75,11 @@ namespace Marechai.App.Models
         public virtual void Serialize(ISerializationWriter writer)
         {
             if(ReferenceEquals(writer, null)) throw new ArgumentNullException(nameof(writer));
-            writer.WriteObjectValue<UntypedNode>("id", Id);
+            writer.WriteIntValue("id", Id);
             writer.WriteDateTimeOffsetValue("introduced", Introduced);
             writer.WriteStringValue("name", Name);
             writer.WriteStringValue("parent", Parent);
-            writer.WriteObjectValue<UntypedNode>("parent_id", ParentId);
+            writer.WriteIntValue("parent_id", ParentId);
             writer.WriteAdditionalData(AdditionalData);
         }
     }
diff --git a/Marechai.App/Services/Client/Models/SoftwareVariantDto.cs b/Marechai.App/Services/Client/Models/SoftwareVariantDto.cs
index 281b9394..fd717881 100644
--- a/Marechai.App/Services/Client/Models/SoftwareVariantDto.cs
+++ b/Marechai.App/Services/Client/Models/SoftwareVariantDto.cs
@@ -33,23 +33,11 @@ namespace Marechai.App.Models
         public string Family { get; set; }
 #endif
         /// <summary>The id property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? Id { get; set; }
-#nullable restore
-#else
-        public UntypedNode Id { get; set; }
-#endif
+        public int? Id { get; set; }
         /// <summary>The introduced property</summary>
         public DateTimeOffset? Introduced { get; set; }
         /// <summary>The minimum_memory property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? MinimumMemory { get; set; }
-#nullable restore
-#else
-        public UntypedNode MinimumMemory { get; set; }
-#endif
+        public int? MinimumMemory { get; set; }
         /// <summary>The name property</summary>
 #if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
 #nullable enable
@@ -67,13 +55,7 @@ namespace Marechai.App.Models
         public string Parent { get; set; }
 #endif
         /// <summary>The parent_id property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? ParentId { get; set; }
-#nullable restore
-#else
-        public UntypedNode ParentId { get; set; }
-#endif
+        public int? ParentId { get; set; }
         /// <summary>The part_number property</summary>
 #if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
 #nullable enable
@@ -91,21 +73,9 @@ namespace Marechai.App.Models
         public string ProductCode { get; set; }
 #endif
         /// <summary>The recommended_memory property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? RecommendedMemory { get; set; }
-#nullable restore
-#else
-        public UntypedNode RecommendedMemory { get; set; }
-#endif
+        public int? RecommendedMemory { get; set; }
         /// <summary>The required_storage property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? RequiredStorage { get; set; }
-#nullable restore
-#else
-        public UntypedNode RequiredStorage { get; set; }
-#endif
+        public int? RequiredStorage { get; set; }
         /// <summary>The serial_number property</summary>
 #if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
 #nullable enable
@@ -131,13 +101,7 @@ namespace Marechai.App.Models
         public string Version { get; set; }
 #endif
         /// <summary>The version_id property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? VersionId { get; set; }
-#nullable restore
-#else
-        public UntypedNode VersionId { get; set; }
-#endif
+        public int? VersionId { get; set; }
         /// <summary>
         /// Instantiates a new <see cref="global::Marechai.App.Models.SoftwareVariantDto"/> and sets the default values.
         /// </summary>
@@ -166,20 +130,20 @@ namespace Marechai.App.Models
                 { "catalogue_number", n => { CatalogueNumber = n.GetStringValue(); } },
                 { "distribution_mode", n => { DistributionMode = n.GetIntValue(); } },
                 { "family", n => { Family = n.GetStringValue(); } },
-                { "id", n => { Id = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
+                { "id", n => { Id = n.GetIntValue(); } },
                 { "introduced", n => { Introduced = n.GetDateTimeOffsetValue(); } },
-                { "minimum_memory", n => { MinimumMemory = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
+                { "minimum_memory", n => { MinimumMemory = n.GetIntValue(); } },
                 { "name", n => { Name = n.GetStringValue(); } },
                 { "parent", n => { Parent = n.GetStringValue(); } },
-                { "parent_id", n => { ParentId = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
+                { "parent_id", n => { ParentId = n.GetIntValue(); } },
                 { "part_number", n => { PartNumber = n.GetStringValue(); } },
                 { "product_code", n => { ProductCode = n.GetStringValue(); } },
-                { "recommended_memory", n => { RecommendedMemory = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
-                { "required_storage", n => { RequiredStorage = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
+                { "recommended_memory", n => { RecommendedMemory = n.GetIntValue(); } },
+                { "required_storage", n => { RequiredStorage = n.GetIntValue(); } },
                 { "serial_number", n => { SerialNumber = n.GetStringValue(); } },
                 { "software_version", n => { SoftwareVersion = n.GetStringValue(); } },
                 { "version", n => { Version = n.GetStringValue(); } },
-                { "version_id", n => { VersionId = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
+                { "version_id", n => { VersionId = n.GetIntValue(); } },
             };
         }
         /// <summary>
@@ -192,20 +156,20 @@ namespace Marechai.App.Models
             writer.WriteStringValue("catalogue_number", CatalogueNumber);
             writer.WriteIntValue("distribution_mode", DistributionMode);
             writer.WriteStringValue("family", Family);
-            writer.WriteObjectValue<UntypedNode>("id", Id);
+            writer.WriteIntValue("id", Id);
             writer.WriteDateTimeOffsetValue("introduced", Introduced);
-            writer.WriteObjectValue<UntypedNode>("minimum_memory", MinimumMemory);
+            writer.WriteIntValue("minimum_memory", MinimumMemory);
             writer.WriteStringValue("name", Name);
             writer.WriteStringValue("parent", Parent);
-            writer.WriteObjectValue<UntypedNode>("parent_id", ParentId);
+            writer.WriteIntValue("parent_id", ParentId);
             writer.WriteStringValue("part_number", PartNumber);
             writer.WriteStringValue("product_code", ProductCode);
-            writer.WriteObjectValue<UntypedNode>("recommended_memory", RecommendedMemory);
-            writer.WriteObjectValue<UntypedNode>("required_storage", RequiredStorage);
+            writer.WriteIntValue("recommended_memory", RecommendedMemory);
+            writer.WriteIntValue("required_storage", RequiredStorage);
             writer.WriteStringValue("serial_number", SerialNumber);
             writer.WriteStringValue("software_version", SoftwareVersion);
             writer.WriteStringValue("version", Version);
-            writer.WriteObjectValue<UntypedNode>("version_id", VersionId);
+            writer.WriteIntValue("version_id", VersionId);
             writer.WriteAdditionalData(AdditionalData);
         }
     }
diff --git a/Marechai.App/Services/Client/Models/SoftwareVersionDto.cs b/Marechai.App/Services/Client/Models/SoftwareVersionDto.cs
index c23e6326..84cb5744 100644
--- a/Marechai.App/Services/Client/Models/SoftwareVersionDto.cs
+++ b/Marechai.App/Services/Client/Models/SoftwareVersionDto.cs
@@ -31,21 +31,9 @@ namespace Marechai.App.Models
         public string Family { get; set; }
 #endif
         /// <summary>The family_id property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? FamilyId { get; set; }
-#nullable restore
-#else
-        public UntypedNode FamilyId { get; set; }
-#endif
+        public int? FamilyId { get; set; }
         /// <summary>The id property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? Id { get; set; }
-#nullable restore
-#else
-        public UntypedNode Id { get; set; }
-#endif
+        public int? Id { get; set; }
         /// <summary>The introduced property</summary>
         public DateTimeOffset? Introduced { get; set; }
         /// <summary>The license property</summary>
@@ -57,13 +45,7 @@ namespace Marechai.App.Models
         public string License { get; set; }
 #endif
         /// <summary>The license_id property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? LicenseId { get; set; }
-#nullable restore
-#else
-        public UntypedNode LicenseId { get; set; }
-#endif
+        public int? LicenseId { get; set; }
         /// <summary>The name property</summary>
 #if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
 #nullable enable
@@ -81,13 +63,7 @@ namespace Marechai.App.Models
         public string Previous { get; set; }
 #endif
         /// <summary>The previous_id property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? PreviousId { get; set; }
-#nullable restore
-#else
-        public UntypedNode PreviousId { get; set; }
-#endif
+        public int? PreviousId { get; set; }
         /// <summary>The version property</summary>
 #if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
 #nullable enable
@@ -123,14 +99,14 @@ namespace Marechai.App.Models
             {
                 { "codename", n => { Codename = n.GetStringValue(); } },
                 { "family", n => { Family = n.GetStringValue(); } },
-                { "family_id", n => { FamilyId = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
-                { "id", n => { Id = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
+                { "family_id", n => { FamilyId = n.GetIntValue(); } },
+                { "id", n => { Id = n.GetIntValue(); } },
                 { "introduced", n => { Introduced = n.GetDateTimeOffsetValue(); } },
                 { "license", n => { License = n.GetStringValue(); } },
-                { "license_id", n => { LicenseId = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
+                { "license_id", n => { LicenseId = n.GetIntValue(); } },
                 { "name", n => { Name = n.GetStringValue(); } },
                 { "previous", n => { Previous = n.GetStringValue(); } },
-                { "previous_id", n => { PreviousId = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
+                { "previous_id", n => { PreviousId = n.GetIntValue(); } },
                 { "version", n => { Version = n.GetStringValue(); } },
             };
         }
@@ -143,14 +119,14 @@ namespace Marechai.App.Models
             if(ReferenceEquals(writer, null)) throw new ArgumentNullException(nameof(writer));
             writer.WriteStringValue("codename", Codename);
             writer.WriteStringValue("family", Family);
-            writer.WriteObjectValue<UntypedNode>("family_id", FamilyId);
-            writer.WriteObjectValue<UntypedNode>("id", Id);
+            writer.WriteIntValue("family_id", FamilyId);
+            writer.WriteIntValue("id", Id);
             writer.WriteDateTimeOffsetValue("introduced", Introduced);
             writer.WriteStringValue("license", License);
-            writer.WriteObjectValue<UntypedNode>("license_id", LicenseId);
+            writer.WriteIntValue("license_id", LicenseId);
             writer.WriteStringValue("name", Name);
             writer.WriteStringValue("previous", Previous);
-            writer.WriteObjectValue<UntypedNode>("previous_id", PreviousId);
+            writer.WriteIntValue("previous_id", PreviousId);
             writer.WriteStringValue("version", Version);
             writer.WriteAdditionalData(AdditionalData);
         }
diff --git a/Marechai.App/Services/Client/Models/SoundSynthByMachineDto.cs b/Marechai.App/Services/Client/Models/SoundSynthByMachineDto.cs
index 63520819..8b8462e1 100644
--- a/Marechai.App/Services/Client/Models/SoundSynthByMachineDto.cs
+++ b/Marechai.App/Services/Client/Models/SoundSynthByMachineDto.cs
@@ -23,21 +23,9 @@ namespace Marechai.App.Models
         public string Company { get; set; }
 #endif
         /// <summary>The id property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? Id { get; set; }
-#nullable restore
-#else
-        public UntypedNode Id { get; set; }
-#endif
+        public long? Id { get; set; }
         /// <summary>The machine_id property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? MachineId { get; set; }
-#nullable restore
-#else
-        public UntypedNode MachineId { get; set; }
-#endif
+        public int? MachineId { get; set; }
         /// <summary>The name property</summary>
 #if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
 #nullable enable
@@ -47,13 +35,7 @@ namespace Marechai.App.Models
         public string Name { get; set; }
 #endif
         /// <summary>The sound_synth_id property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? SoundSynthId { get; set; }
-#nullable restore
-#else
-        public UntypedNode SoundSynthId { get; set; }
-#endif
+        public int? SoundSynthId { get; set; }
         /// <summary>
         /// Instantiates a new <see cref="global::Marechai.App.Models.SoundSynthByMachineDto"/> and sets the default values.
         /// </summary>
@@ -80,10 +62,10 @@ namespace Marechai.App.Models
             return new Dictionary<string, Action<IParseNode>>
             {
                 { "company", n => { Company = n.GetStringValue(); } },
-                { "id", n => { Id = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
-                { "machine_id", n => { MachineId = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
+                { "id", n => { Id = n.GetLongValue(); } },
+                { "machine_id", n => { MachineId = n.GetIntValue(); } },
                 { "name", n => { Name = n.GetStringValue(); } },
-                { "sound_synth_id", n => { SoundSynthId = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
+                { "sound_synth_id", n => { SoundSynthId = n.GetIntValue(); } },
             };
         }
         /// <summary>
@@ -94,10 +76,10 @@ namespace Marechai.App.Models
         {
             if(ReferenceEquals(writer, null)) throw new ArgumentNullException(nameof(writer));
             writer.WriteStringValue("company", Company);
-            writer.WriteObjectValue<UntypedNode>("id", Id);
-            writer.WriteObjectValue<UntypedNode>("machine_id", MachineId);
+            writer.WriteLongValue("id", Id);
+            writer.WriteIntValue("machine_id", MachineId);
             writer.WriteStringValue("name", Name);
-            writer.WriteObjectValue<UntypedNode>("sound_synth_id", SoundSynthId);
+            writer.WriteIntValue("sound_synth_id", SoundSynthId);
             writer.WriteAdditionalData(AdditionalData);
         }
     }
diff --git a/Marechai.App/Services/Client/Models/SoundSynthDto.cs b/Marechai.App/Services/Client/Models/SoundSynthDto.cs
index 621b4a85..29bb8ca1 100644
--- a/Marechai.App/Services/Client/Models/SoundSynthDto.cs
+++ b/Marechai.App/Services/Client/Models/SoundSynthDto.cs
@@ -23,37 +23,13 @@ namespace Marechai.App.Models
         public string Company { get; set; }
 #endif
         /// <summary>The company_id property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? CompanyId { get; set; }
-#nullable restore
-#else
-        public UntypedNode CompanyId { get; set; }
-#endif
+        public int? CompanyId { get; set; }
         /// <summary>The depth property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? Depth { get; set; }
-#nullable restore
-#else
-        public UntypedNode Depth { get; set; }
-#endif
+        public int? Depth { get; set; }
         /// <summary>The frequency property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? Frequency { get; set; }
-#nullable restore
-#else
-        public UntypedNode Frequency { get; set; }
-#endif
+        public double? Frequency { get; set; }
         /// <summary>The id property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? Id { get; set; }
-#nullable restore
-#else
-        public UntypedNode Id { get; set; }
-#endif
+        public int? Id { get; set; }
         /// <summary>The introduced property</summary>
         public DateTimeOffset? Introduced { get; set; }
         /// <summary>The model_code property</summary>
@@ -73,37 +49,13 @@ namespace Marechai.App.Models
         public string Name { get; set; }
 #endif
         /// <summary>The square_wave property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? SquareWave { get; set; }
-#nullable restore
-#else
-        public UntypedNode SquareWave { get; set; }
-#endif
+        public int? SquareWave { get; set; }
         /// <summary>The type property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? Type { get; set; }
-#nullable restore
-#else
-        public UntypedNode Type { get; set; }
-#endif
+        public int? Type { get; set; }
         /// <summary>The voices property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? Voices { get; set; }
-#nullable restore
-#else
-        public UntypedNode Voices { get; set; }
-#endif
+        public int? Voices { get; set; }
         /// <summary>The white_noise property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? WhiteNoise { get; set; }
-#nullable restore
-#else
-        public UntypedNode WhiteNoise { get; set; }
-#endif
+        public int? WhiteNoise { get; set; }
         /// <summary>
         /// Instantiates a new <see cref="global::Marechai.App.Models.SoundSynthDto"/> and sets the default values.
         /// </summary>
@@ -130,17 +82,17 @@ namespace Marechai.App.Models
             return new Dictionary<string, Action<IParseNode>>
             {
                 { "company", n => { Company = n.GetStringValue(); } },
-                { "company_id", n => { CompanyId = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
-                { "depth", n => { Depth = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
-                { "frequency", n => { Frequency = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
-                { "id", n => { Id = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
+                { "company_id", n => { CompanyId = n.GetIntValue(); } },
+                { "depth", n => { Depth = n.GetIntValue(); } },
+                { "frequency", n => { Frequency = n.GetDoubleValue(); } },
+                { "id", n => { Id = n.GetIntValue(); } },
                 { "introduced", n => { Introduced = n.GetDateTimeOffsetValue(); } },
                 { "model_code", n => { ModelCode = n.GetStringValue(); } },
                 { "name", n => { Name = n.GetStringValue(); } },
-                { "square_wave", n => { SquareWave = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
-                { "type", n => { Type = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
-                { "voices", n => { Voices = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
-                { "white_noise", n => { WhiteNoise = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
+                { "square_wave", n => { SquareWave = n.GetIntValue(); } },
+                { "type", n => { Type = n.GetIntValue(); } },
+                { "voices", n => { Voices = n.GetIntValue(); } },
+                { "white_noise", n => { WhiteNoise = n.GetIntValue(); } },
             };
         }
         /// <summary>
@@ -151,17 +103,17 @@ namespace Marechai.App.Models
         {
             if(ReferenceEquals(writer, null)) throw new ArgumentNullException(nameof(writer));
             writer.WriteStringValue("company", Company);
-            writer.WriteObjectValue<UntypedNode>("company_id", CompanyId);
-            writer.WriteObjectValue<UntypedNode>("depth", Depth);
-            writer.WriteObjectValue<UntypedNode>("frequency", Frequency);
-            writer.WriteObjectValue<UntypedNode>("id", Id);
+            writer.WriteIntValue("company_id", CompanyId);
+            writer.WriteIntValue("depth", Depth);
+            writer.WriteDoubleValue("frequency", Frequency);
+            writer.WriteIntValue("id", Id);
             writer.WriteDateTimeOffsetValue("introduced", Introduced);
             writer.WriteStringValue("model_code", ModelCode);
             writer.WriteStringValue("name", Name);
-            writer.WriteObjectValue<UntypedNode>("square_wave", SquareWave);
-            writer.WriteObjectValue<UntypedNode>("type", Type);
-            writer.WriteObjectValue<UntypedNode>("voices", Voices);
-            writer.WriteObjectValue<UntypedNode>("white_noise", WhiteNoise);
+            writer.WriteIntValue("square_wave", SquareWave);
+            writer.WriteIntValue("type", Type);
+            writer.WriteIntValue("voices", Voices);
+            writer.WriteIntValue("white_noise", WhiteNoise);
             writer.WriteAdditionalData(AdditionalData);
         }
     }
diff --git a/Marechai.App/Services/Client/Models/StorageByMachineDto.cs b/Marechai.App/Services/Client/Models/StorageByMachineDto.cs
index 8e88daef..d9dc6081 100644
--- a/Marechai.App/Services/Client/Models/StorageByMachineDto.cs
+++ b/Marechai.App/Services/Client/Models/StorageByMachineDto.cs
@@ -15,31 +15,13 @@ namespace Marechai.App.Models
         /// <summary>Stores additional data not described in the OpenAPI description found when deserializing. Can be used for serialization as well.</summary>
         public IDictionary<string, object> AdditionalData { get; set; }
         /// <summary>The capacity property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? Capacity { get; set; }
-#nullable restore
-#else
-        public UntypedNode Capacity { get; set; }
-#endif
+        public long? Capacity { get; set; }
         /// <summary>The id property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? Id { get; set; }
-#nullable restore
-#else
-        public UntypedNode Id { get; set; }
-#endif
+        public long? Id { get; set; }
         /// <summary>The interface property</summary>
         public int? Interface { get; set; }
         /// <summary>The machine_id property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? MachineId { get; set; }
-#nullable restore
-#else
-        public UntypedNode MachineId { get; set; }
-#endif
+        public int? MachineId { get; set; }
         /// <summary>The type property</summary>
         public int? Type { get; set; }
         /// <summary>
@@ -67,10 +49,10 @@ namespace Marechai.App.Models
         {
             return new Dictionary<string, Action<IParseNode>>
             {
-                { "capacity", n => { Capacity = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
-                { "id", n => { Id = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
+                { "capacity", n => { Capacity = n.GetLongValue(); } },
+                { "id", n => { Id = n.GetLongValue(); } },
                 { "interface", n => { Interface = n.GetIntValue(); } },
-                { "machine_id", n => { MachineId = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
+                { "machine_id", n => { MachineId = n.GetIntValue(); } },
                 { "type", n => { Type = n.GetIntValue(); } },
             };
         }
@@ -81,10 +63,10 @@ namespace Marechai.App.Models
         public virtual void Serialize(ISerializationWriter writer)
         {
             if(ReferenceEquals(writer, null)) throw new ArgumentNullException(nameof(writer));
-            writer.WriteObjectValue<UntypedNode>("capacity", Capacity);
-            writer.WriteObjectValue<UntypedNode>("id", Id);
+            writer.WriteLongValue("capacity", Capacity);
+            writer.WriteLongValue("id", Id);
             writer.WriteIntValue("interface", Interface);
-            writer.WriteObjectValue<UntypedNode>("machine_id", MachineId);
+            writer.WriteIntValue("machine_id", MachineId);
             writer.WriteIntValue("type", Type);
             writer.WriteAdditionalData(AdditionalData);
         }
diff --git a/Marechai.App/Services/Client/Models/StorageDto.cs b/Marechai.App/Services/Client/Models/StorageDto.cs
index 75afce1d..0956fdbb 100644
--- a/Marechai.App/Services/Client/Models/StorageDto.cs
+++ b/Marechai.App/Services/Client/Models/StorageDto.cs
@@ -15,13 +15,7 @@ namespace Marechai.App.Models
         /// <summary>Stores additional data not described in the OpenAPI description found when deserializing. Can be used for serialization as well.</summary>
         public IDictionary<string, object> AdditionalData { get; set; }
         /// <summary>The capacity property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? Capacity { get; set; }
-#nullable restore
-#else
-        public UntypedNode Capacity { get; set; }
-#endif
+        public long? Capacity { get; set; }
         /// <summary>The interface property</summary>
         public int? Interface { get; set; }
         /// <summary>The type property</summary>
@@ -51,7 +45,7 @@ namespace Marechai.App.Models
         {
             return new Dictionary<string, Action<IParseNode>>
             {
-                { "capacity", n => { Capacity = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
+                { "capacity", n => { Capacity = n.GetLongValue(); } },
                 { "interface", n => { Interface = n.GetIntValue(); } },
                 { "type", n => { Type = n.GetIntValue(); } },
             };
@@ -63,7 +57,7 @@ namespace Marechai.App.Models
         public virtual void Serialize(ISerializationWriter writer)
         {
             if(ReferenceEquals(writer, null)) throw new ArgumentNullException(nameof(writer));
-            writer.WriteObjectValue<UntypedNode>("capacity", Capacity);
+            writer.WriteLongValue("capacity", Capacity);
             writer.WriteIntValue("interface", Interface);
             writer.WriteIntValue("type", Type);
             writer.WriteAdditionalData(AdditionalData);
diff --git a/Marechai.App/Services/Client/Models/VariableBlockSize.cs b/Marechai.App/Services/Client/Models/VariableBlockSize.cs
index 6a0a12af..812d605b 100644
--- a/Marechai.App/Services/Client/Models/VariableBlockSize.cs
+++ b/Marechai.App/Services/Client/Models/VariableBlockSize.cs
@@ -15,29 +15,11 @@ namespace Marechai.App.Models
         /// <summary>Stores additional data not described in the OpenAPI description found when deserializing. Can be used for serialization as well.</summary>
         public IDictionary<string, object> AdditionalData { get; set; }
         /// <summary>The end property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? End { get; set; }
-#nullable restore
-#else
-        public UntypedNode End { get; set; }
-#endif
+        public int? End { get; set; }
         /// <summary>The size property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? Size { get; set; }
-#nullable restore
-#else
-        public UntypedNode Size { get; set; }
-#endif
+        public int? Size { get; set; }
         /// <summary>The start property</summary>
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
-        public UntypedNode? Start { get; set; }
-#nullable restore
-#else
-        public UntypedNode Start { get; set; }
-#endif
+        public int? Start { get; set; }
         /// <summary>
         /// Instantiates a new <see cref="global::Marechai.App.Models.VariableBlockSize"/> and sets the default values.
         /// </summary>
@@ -63,9 +45,9 @@ namespace Marechai.App.Models
         {
             return new Dictionary<string, Action<IParseNode>>
             {
-                { "end", n => { End = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
-                { "size", n => { Size = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
-                { "start", n => { Start = n.GetObjectValue<UntypedNode>(UntypedNode.CreateFromDiscriminatorValue); } },
+                { "end", n => { End = n.GetIntValue(); } },
+                { "size", n => { Size = n.GetIntValue(); } },
+                { "start", n => { Start = n.GetIntValue(); } },
             };
         }
         /// <summary>
@@ -75,9 +57,9 @@ namespace Marechai.App.Models
         public virtual void Serialize(ISerializationWriter writer)
         {
             if(ReferenceEquals(writer, null)) throw new ArgumentNullException(nameof(writer));
-            writer.WriteObjectValue<UntypedNode>("end", End);
-            writer.WriteObjectValue<UntypedNode>("size", Size);
-            writer.WriteObjectValue<UntypedNode>("start", Start);
+            writer.WriteIntValue("end", End);
+            writer.WriteIntValue("size", Size);
+            writer.WriteIntValue("start", Start);
             writer.WriteAdditionalData(AdditionalData);
         }
     }
diff --git a/Marechai.App/Services/Client/News/NewsRequestBuilder.cs b/Marechai.App/Services/Client/News/NewsRequestBuilder.cs
index f667388a..aafabbd4 100644
--- a/Marechai.App/Services/Client/News/NewsRequestBuilder.cs
+++ b/Marechai.App/Services/Client/News/NewsRequestBuilder.cs
@@ -130,15 +130,8 @@ namespace Marechai.App.News
         public partial class NewsRequestBuilderDeleteQueryParameters 
         #pragma warning restore CS1591
         {
-#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
-#nullable enable
             [QueryParameter("id")]
-            public string? Id { get; set; }
-#nullable restore
-#else
-            [QueryParameter("id")]
-            public string Id { get; set; }
-#endif
+            public int? Id { get; set; }
         }
         /// <summary>
         /// Configuration for the request such as headers, query parameters, and middleware options.
diff --git a/Marechai.App/Services/Client/People/PeopleRequestBuilder.cs b/Marechai.App/Services/Client/People/PeopleRequestBuilder.cs
index bd7216a2..4766c05f 100644
--- a/Marechai.App/Services/Client/People/PeopleRequestBuilder.cs
+++ b/Marechai.App/Services/Client/People/PeopleRequestBuilder.cs
@@ -80,7 +80,7 @@ namespace Marechai.App.People
             var collectionResult = await RequestAdapter.SendCollectionAsync<global::Marechai.App.Models.PersonDto>(requestInfo, global::Marechai.App.Models.PersonDto.CreateFromDiscriminatorValue, errorMapping, cancellationToken).ConfigureAwait(false);
             return collectionResult?.AsList();
         }
-        /// <returns>A <see cref="UntypedNode"/></returns>
+        /// <returns>A <see cref="long"/></returns>
         /// <param name="body">The request body</param>
         /// <param name="cancellationToken">Cancellation token to use when cancelling requests</param>
         /// <param name="requestConfiguration">Configuration for the request such as headers, query parameters, and middleware options.</param>
@@ -88,11 +88,11 @@ namespace Marechai.App.People
         /// <exception cref="global::Marechai.App.Models.ProblemDetails">When receiving a 401 status code</exception>
 #if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
 #nullable enable
-        public async Task<UntypedNode?> PostAsync(global::Marechai.App.Models.PersonDto body, Action<RequestConfiguration<DefaultQueryParameters>>? requestConfiguration = default, CancellationToken cancellationToken = default)
+        public async Task<long?> PostAsync(global::Marechai.App.Models.PersonDto body, Action<RequestConfiguration<DefaultQueryParameters>>? requestConfiguration = default, CancellationToken cancellationToken = default)
         {
 #nullable restore
 #else
-        public async Task<UntypedNode> PostAsync(global::Marechai.App.Models.PersonDto body, Action<RequestConfiguration<DefaultQueryParameters>> requestConfiguration = default, CancellationToken cancellationToken = default)
+        public async Task<long?> PostAsync(global::Marechai.App.Models.PersonDto body, Action<RequestConfiguration<DefaultQueryParameters>> requestConfiguration = default, CancellationToken cancellationToken = default)
         {
 #endif
             if(ReferenceEquals(body, null)) throw new ArgumentNullException(nameof(body));
@@ -102,7 +102,7 @@ namespace Marechai.App.People
                 { "400", global::Marechai.App.Models.ProblemDetails.CreateFromDiscriminatorValue },
                 { "401", global::Marechai.App.Models.ProblemDetails.CreateFromDiscriminatorValue },
             };
-            return await RequestAdapter.SendAsync<UntypedNode>(requestInfo, UntypedNode.CreateFromDiscriminatorValue, errorMapping, cancellationToken).ConfigureAwait(false);
+            return await RequestAdapter.SendPrimitiveAsync<long?>(requestInfo, errorMapping, cancellationToken).ConfigureAwait(false);
         }
         /// <returns>A <see cref="RequestInformation"/></returns>
         /// <param name="requestConfiguration">Configuration for the request such as headers, query parameters, and middleware options.</param>
diff --git a/Marechai.App/Services/Client/PeopleByBook/PeopleByBookRequestBuilder.cs b/Marechai.App/Services/Client/PeopleByBook/PeopleByBookRequestBuilder.cs
index 9f216d26..01130c06 100644
--- a/Marechai.App/Services/Client/PeopleByBook/PeopleByBookRequestBuilder.cs
+++ b/Marechai.App/Services/Client/PeopleByBook/PeopleByBookRequestBuilder.cs
@@ -59,7 +59,7 @@ namespace Marechai.App.PeopleByBook
         public PeopleByBookRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) : base(requestAdapter, "{+baseurl}/people-by-book", rawUrl)
         {
         }
-        /// <returns>A <see cref="UntypedNode"/></returns>
+        /// <returns>A <see cref="long"/></returns>
         /// <param name="body">The request body</param>
         /// <param name="cancellationToken">Cancellation token to use when cancelling requests</param>
         /// <param name="requestConfiguration">Configuration for the request such as headers, query parameters, and middleware options.</param>
@@ -67,11 +67,11 @@ namespace Marechai.App.PeopleByBook
         /// <exception cref="global::Marechai.App.Models.ProblemDetails">When receiving a 401 status code</exception>
 #if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
 #nullable enable
-        public async Task<UntypedNode?> PostAsync(global::Marechai.App.Models.PersonByBookDto body, Action<RequestConfiguration<DefaultQueryParameters>>? requestConfiguration = default, CancellationToken cancellationToken = default)
+        public async Task<long?> PostAsync(global::Marechai.App.Models.PersonByBookDto body, Action<RequestConfiguration<DefaultQueryParameters>>? requestConfiguration = default, CancellationToken cancellationToken = default)
         {
 #nullable restore
 #else
-        public async Task<UntypedNode> PostAsync(global::Marechai.App.Models.PersonByBookDto body, Action<RequestConfiguration<DefaultQueryParameters>> requestConfiguration = default, CancellationToken cancellationToken = default)
+        public async Task<long?> PostAsync(global::Marechai.App.Models.PersonByBookDto body, Action<RequestConfiguration<DefaultQueryParameters>> requestConfiguration = default, CancellationToken cancellationToken = default)
         {
 #endif
             if(ReferenceEquals(body, null)) throw new ArgumentNullException(nameof(body));
@@ -81,7 +81,7 @@ namespace Marechai.App.PeopleByBook
                 { "400", global::Marechai.App.Models.ProblemDetails.CreateFromDiscriminatorValue },
                 { "401", global::Marechai.App.Models.ProblemDetails.CreateFromDiscriminatorValue },
             };
-            return await RequestAdapter.SendAsync<UntypedNode>(requestInfo, UntypedNode.CreateFromDiscriminatorValue, errorMapping, cancellationToken).ConfigureAwait(false);
+            return await RequestAdapter.SendPrimitiveAsync<long?>(requestInfo, errorMapping, cancellationToken).ConfigureAwait(false);
         }
         /// <returns>A <see cref="RequestInformation"/></returns>
         /// <param name="body">The request body</param>
diff --git a/Marechai.App/Services/Client/PeopleByDocument/PeopleByDocumentRequestBuilder.cs b/Marechai.App/Services/Client/PeopleByDocument/PeopleByDocumentRequestBuilder.cs
index 06039093..14669ab2 100644
--- a/Marechai.App/Services/Client/PeopleByDocument/PeopleByDocumentRequestBuilder.cs
+++ b/Marechai.App/Services/Client/PeopleByDocument/PeopleByDocumentRequestBuilder.cs
@@ -59,7 +59,7 @@ namespace Marechai.App.PeopleByDocument
         public PeopleByDocumentRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) : base(requestAdapter, "{+baseurl}/people-by-document", rawUrl)
         {
         }
-        /// <returns>A <see cref="UntypedNode"/></returns>
+        /// <returns>A <see cref="long"/></returns>
         /// <param name="body">The request body</param>
         /// <param name="cancellationToken">Cancellation token to use when cancelling requests</param>
         /// <param name="requestConfiguration">Configuration for the request such as headers, query parameters, and middleware options.</param>
@@ -67,11 +67,11 @@ namespace Marechai.App.PeopleByDocument
         /// <exception cref="global::Marechai.App.Models.ProblemDetails">When receiving a 401 status code</exception>
 #if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
 #nullable enable
-        public async Task<UntypedNode?> PostAsync(global::Marechai.App.Models.PersonByDocumentDto body, Action<RequestConfiguration<DefaultQueryParameters>>? requestConfiguration = default, CancellationToken cancellationToken = default)
+        public async Task<long?> PostAsync(global::Marechai.App.Models.PersonByDocumentDto body, Action<RequestConfiguration<DefaultQueryParameters>>? requestConfiguration = default, CancellationToken cancellationToken = default)
         {
 #nullable restore
 #else
-        public async Task<UntypedNode> PostAsync(global::Marechai.App.Models.PersonByDocumentDto body, Action<RequestConfiguration<DefaultQueryParameters>> requestConfiguration = default, CancellationToken cancellationToken = default)
+        public async Task<long?> PostAsync(global::Marechai.App.Models.PersonByDocumentDto body, Action<RequestConfiguration<DefaultQueryParameters>> requestConfiguration = default, CancellationToken cancellationToken = default)
         {
 #endif
             if(ReferenceEquals(body, null)) throw new ArgumentNullException(nameof(body));
@@ -81,7 +81,7 @@ namespace Marechai.App.PeopleByDocument
                 { "400", global::Marechai.App.Models.ProblemDetails.CreateFromDiscriminatorValue },
                 { "401", global::Marechai.App.Models.ProblemDetails.CreateFromDiscriminatorValue },
             };
-            return await RequestAdapter.SendAsync<UntypedNode>(requestInfo, UntypedNode.CreateFromDiscriminatorValue, errorMapping, cancellationToken).ConfigureAwait(false);
+            return await RequestAdapter.SendPrimitiveAsync<long?>(requestInfo, errorMapping, cancellationToken).ConfigureAwait(false);
         }
         /// <returns>A <see cref="RequestInformation"/></returns>
         /// <param name="body">The request body</param>
diff --git a/Marechai.App/Services/Client/PeopleByMagazine/PeopleByMagazineRequestBuilder.cs b/Marechai.App/Services/Client/PeopleByMagazine/PeopleByMagazineRequestBuilder.cs
index cbf2c29a..41996227 100644
--- a/Marechai.App/Services/Client/PeopleByMagazine/PeopleByMagazineRequestBuilder.cs
+++ b/Marechai.App/Services/Client/PeopleByMagazine/PeopleByMagazineRequestBuilder.cs
@@ -59,7 +59,7 @@ namespace Marechai.App.PeopleByMagazine
         public PeopleByMagazineRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) : base(requestAdapter, "{+baseurl}/people-by-magazine", rawUrl)
         {
         }
-        /// <returns>A <see cref="UntypedNode"/></returns>
+        /// <returns>A <see cref="long"/></returns>
         /// <param name="body">The request body</param>
         /// <param name="cancellationToken">Cancellation token to use when cancelling requests</param>
         /// <param name="requestConfiguration">Configuration for the request such as headers, query parameters, and middleware options.</param>
@@ -67,11 +67,11 @@ namespace Marechai.App.PeopleByMagazine
         /// <exception cref="global::Marechai.App.Models.ProblemDetails">When receiving a 401 status code</exception>
 #if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
 #nullable enable
-        public async Task<UntypedNode?> PostAsync(global::Marechai.App.Models.PersonByMagazineDto body, Action<RequestConfiguration<DefaultQueryParameters>>? requestConfiguration = default, CancellationToken cancellationToken = default)
+        public async Task<long?> PostAsync(global::Marechai.App.Models.PersonByMagazineDto body, Action<RequestConfiguration<DefaultQueryParameters>>? requestConfiguration = default, CancellationToken cancellationToken = default)
         {
 #nullable restore
 #else
-        public async Task<UntypedNode> PostAsync(global::Marechai.App.Models.PersonByMagazineDto body, Action<RequestConfiguration<DefaultQueryParameters>> requestConfiguration = default, CancellationToken cancellationToken = default)
+        public async Task<long?> PostAsync(global::Marechai.App.Models.PersonByMagazineDto body, Action<RequestConfiguration<DefaultQueryParameters>> requestConfiguration = default, CancellationToken cancellationToken = default)
         {
 #endif
             if(ReferenceEquals(body, null)) throw new ArgumentNullException(nameof(body));
@@ -81,7 +81,7 @@ namespace Marechai.App.PeopleByMagazine
                 { "400", global::Marechai.App.Models.ProblemDetails.CreateFromDiscriminatorValue },
                 { "401", global::Marechai.App.Models.ProblemDetails.CreateFromDiscriminatorValue },
             };
-            return await RequestAdapter.SendAsync<UntypedNode>(requestInfo, UntypedNode.CreateFromDiscriminatorValue, errorMapping, cancellationToken).ConfigureAwait(false);
+            return await RequestAdapter.SendPrimitiveAsync<long?>(requestInfo, errorMapping, cancellationToken).ConfigureAwait(false);
         }
         /// <returns>A <see cref="RequestInformation"/></returns>
         /// <param name="body">The request body</param>
diff --git a/Marechai.App/Services/Client/Processors/ProcessorsRequestBuilder.cs b/Marechai.App/Services/Client/Processors/ProcessorsRequestBuilder.cs
index 3f05746f..c472a19c 100644
--- a/Marechai.App/Services/Client/Processors/ProcessorsRequestBuilder.cs
+++ b/Marechai.App/Services/Client/Processors/ProcessorsRequestBuilder.cs
@@ -80,7 +80,7 @@ namespace Marechai.App.Processors
             var collectionResult = await RequestAdapter.SendCollectionAsync<global::Marechai.App.Models.ProcessorDto>(requestInfo, global::Marechai.App.Models.ProcessorDto.CreateFromDiscriminatorValue, errorMapping, cancellationToken).ConfigureAwait(false);
             return collectionResult?.AsList();
         }
-        /// <returns>A <see cref="UntypedNode"/></returns>
+        /// <returns>A <see cref="long"/></returns>
         /// <param name="body">The request body</param>
         /// <param name="cancellationToken">Cancellation token to use when cancelling requests</param>
         /// <param name="requestConfiguration">Configuration for the request such as headers, query parameters, and middleware options.</param>
@@ -88,11 +88,11 @@ namespace Marechai.App.Processors
         /// <exception cref="global::Marechai.App.Models.ProblemDetails">When receiving a 401 status code</exception>
 #if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
 #nullable enable
-        public async Task<UntypedNode?> PostAsync(global::Marechai.App.Models.ProcessorDto body, Action<RequestConfiguration<DefaultQueryParameters>>? requestConfiguration = default, CancellationToken cancellationToken = default)
+        public async Task<long?> PostAsync(global::Marechai.App.Models.ProcessorDto body, Action<RequestConfiguration<DefaultQueryParameters>>? requestConfiguration = default, CancellationToken cancellationToken = default)
         {
 #nullable restore
 #else
-        public async Task<UntypedNode> PostAsync(global::Marechai.App.Models.ProcessorDto body, Action<RequestConfiguration<DefaultQueryParameters>> requestConfiguration = default, CancellationToken cancellationToken = default)
+        public async Task<long?> PostAsync(global::Marechai.App.Models.ProcessorDto body, Action<RequestConfiguration<DefaultQueryParameters>> requestConfiguration = default, CancellationToken cancellationToken = default)
         {
 #endif
             if(ReferenceEquals(body, null)) throw new ArgumentNullException(nameof(body));
@@ -102,7 +102,7 @@ namespace Marechai.App.Processors
                 { "400", global::Marechai.App.Models.ProblemDetails.CreateFromDiscriminatorValue },
                 { "401", global::Marechai.App.Models.ProblemDetails.CreateFromDiscriminatorValue },
             };
-            return await RequestAdapter.SendAsync<UntypedNode>(requestInfo, UntypedNode.CreateFromDiscriminatorValue, errorMapping, cancellationToken).ConfigureAwait(false);
+            return await RequestAdapter.SendPrimitiveAsync<long?>(requestInfo, errorMapping, cancellationToken).ConfigureAwait(false);
         }
         /// <returns>A <see cref="RequestInformation"/></returns>
         /// <param name="requestConfiguration">Configuration for the request such as headers, query parameters, and middleware options.</param>
diff --git a/Marechai.App/Services/Client/ProcessorsByMachine/ProcessorsByMachineRequestBuilder.cs b/Marechai.App/Services/Client/ProcessorsByMachine/ProcessorsByMachineRequestBuilder.cs
index da3e0427..f2e8a082 100644
--- a/Marechai.App/Services/Client/ProcessorsByMachine/ProcessorsByMachineRequestBuilder.cs
+++ b/Marechai.App/Services/Client/ProcessorsByMachine/ProcessorsByMachineRequestBuilder.cs
@@ -65,7 +65,7 @@ namespace Marechai.App.ProcessorsByMachine
         public ProcessorsByMachineRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) : base(requestAdapter, "{+baseurl}/processors-by-machine", rawUrl)
         {
         }
-        /// <returns>A <see cref="UntypedNode"/></returns>
+        /// <returns>A <see cref="long"/></returns>
         /// <param name="body">The request body</param>
         /// <param name="cancellationToken">Cancellation token to use when cancelling requests</param>
         /// <param name="requestConfiguration">Configuration for the request such as headers, query parameters, and middleware options.</param>
@@ -73,11 +73,11 @@ namespace Marechai.App.ProcessorsByMachine
         /// <exception cref="global::Marechai.App.Models.ProblemDetails">When receiving a 401 status code</exception>
 #if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
 #nullable enable
-        public async Task<UntypedNode?> PostAsync(global::Marechai.App.Models.ProcessorByMachineDto body, Action<RequestConfiguration<DefaultQueryParameters>>? requestConfiguration = default, CancellationToken cancellationToken = default)
+        public async Task<long?> PostAsync(global::Marechai.App.Models.ProcessorByMachineDto body, Action<RequestConfiguration<DefaultQueryParameters>>? requestConfiguration = default, CancellationToken cancellationToken = default)
         {
 #nullable restore
 #else
-        public async Task<UntypedNode> PostAsync(global::Marechai.App.Models.ProcessorByMachineDto body, Action<RequestConfiguration<DefaultQueryParameters>> requestConfiguration = default, CancellationToken cancellationToken = default)
+        public async Task<long?> PostAsync(global::Marechai.App.Models.ProcessorByMachineDto body, Action<RequestConfiguration<DefaultQueryParameters>> requestConfiguration = default, CancellationToken cancellationToken = default)
         {
 #endif
             if(ReferenceEquals(body, null)) throw new ArgumentNullException(nameof(body));
@@ -87,7 +87,7 @@ namespace Marechai.App.ProcessorsByMachine
                 { "400", global::Marechai.App.Models.ProblemDetails.CreateFromDiscriminatorValue },
                 { "401", global::Marechai.App.Models.ProblemDetails.CreateFromDiscriminatorValue },
             };
-            return await RequestAdapter.SendAsync<UntypedNode>(requestInfo, UntypedNode.CreateFromDiscriminatorValue, errorMapping, cancellationToken).ConfigureAwait(false);
+            return await RequestAdapter.SendPrimitiveAsync<long?>(requestInfo, errorMapping, cancellationToken).ConfigureAwait(false);
         }
         /// <returns>A <see cref="RequestInformation"/></returns>
         /// <param name="body">The request body</param>
diff --git a/Marechai.App/Services/Client/Resolutions/ResolutionsRequestBuilder.cs b/Marechai.App/Services/Client/Resolutions/ResolutionsRequestBuilder.cs
index 1ba2b168..0032cf7d 100644
--- a/Marechai.App/Services/Client/Resolutions/ResolutionsRequestBuilder.cs
+++ b/Marechai.App/Services/Client/Resolutions/ResolutionsRequestBuilder.cs
@@ -80,7 +80,7 @@ namespace Marechai.App.Resolutions
             var collectionResult = await RequestAdapter.SendCollectionAsync<global::Marechai.App.Models.ResolutionDto>(requestInfo, global::Marechai.App.Models.ResolutionDto.CreateFromDiscriminatorValue, errorMapping, cancellationToken).ConfigureAwait(false);
             return collectionResult?.AsList();
         }
-        /// <returns>A <see cref="UntypedNode"/></returns>
+        /// <returns>A <see cref="long"/></returns>
         /// <param name="body">The request body</param>
         /// <param name="cancellationToken">Cancellation token to use when cancelling requests</param>
         /// <param name="requestConfiguration">Configuration for the request such as headers, query parameters, and middleware options.</param>
@@ -88,11 +88,11 @@ namespace Marechai.App.Resolutions
         /// <exception cref="global::Marechai.App.Models.ProblemDetails">When receiving a 401 status code</exception>
 #if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
 #nullable enable
-        public async Task<UntypedNode?> PostAsync(global::Marechai.App.Models.ResolutionDto body, Action<RequestConfiguration<DefaultQueryParameters>>? requestConfiguration = default, CancellationToken cancellationToken = default)
+        public async Task<long?> PostAsync(global::Marechai.App.Models.ResolutionDto body, Action<RequestConfiguration<DefaultQueryParameters>>? requestConfiguration = default, CancellationToken cancellationToken = default)
         {
 #nullable restore
 #else
-        public async Task<UntypedNode> PostAsync(global::Marechai.App.Models.ResolutionDto body, Action<RequestConfiguration<DefaultQueryParameters>> requestConfiguration = default, CancellationToken cancellationToken = default)
+        public async Task<long?> PostAsync(global::Marechai.App.Models.ResolutionDto body, Action<RequestConfiguration<DefaultQueryParameters>> requestConfiguration = default, CancellationToken cancellationToken = default)
         {
 #endif
             if(ReferenceEquals(body, null)) throw new ArgumentNullException(nameof(body));
@@ -102,7 +102,7 @@ namespace Marechai.App.Resolutions
                 { "400", global::Marechai.App.Models.ProblemDetails.CreateFromDiscriminatorValue },
                 { "401", global::Marechai.App.Models.ProblemDetails.CreateFromDiscriminatorValue },
             };
-            return await RequestAdapter.SendAsync<UntypedNode>(requestInfo, UntypedNode.CreateFromDiscriminatorValue, errorMapping, cancellationToken).ConfigureAwait(false);
+            return await RequestAdapter.SendPrimitiveAsync<long?>(requestInfo, errorMapping, cancellationToken).ConfigureAwait(false);
         }
         /// <returns>A <see cref="RequestInformation"/></returns>
         /// <param name="requestConfiguration">Configuration for the request such as headers, query parameters, and middleware options.</param>
diff --git a/Marechai.App/Services/Client/ResolutionsByGpu/ResolutionsByGpuRequestBuilder.cs b/Marechai.App/Services/Client/ResolutionsByGpu/ResolutionsByGpuRequestBuilder.cs
index 45e6db9d..b775d69b 100644
--- a/Marechai.App/Services/Client/ResolutionsByGpu/ResolutionsByGpuRequestBuilder.cs
+++ b/Marechai.App/Services/Client/ResolutionsByGpu/ResolutionsByGpuRequestBuilder.cs
@@ -65,7 +65,7 @@ namespace Marechai.App.ResolutionsByGpu
         public ResolutionsByGpuRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) : base(requestAdapter, "{+baseurl}/resolutions-by-gpu", rawUrl)
         {
         }
-        /// <returns>A <see cref="UntypedNode"/></returns>
+        /// <returns>A <see cref="long"/></returns>
         /// <param name="body">The request body</param>
         /// <param name="cancellationToken">Cancellation token to use when cancelling requests</param>
         /// <param name="requestConfiguration">Configuration for the request such as headers, query parameters, and middleware options.</param>
@@ -73,11 +73,11 @@ namespace Marechai.App.ResolutionsByGpu
         /// <exception cref="global::Marechai.App.Models.ProblemDetails">When receiving a 401 status code</exception>
 #if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
 #nullable enable
-        public async Task<UntypedNode?> PostAsync(global::Marechai.App.Models.ResolutionByGpuDto body, Action<RequestConfiguration<DefaultQueryParameters>>? requestConfiguration = default, CancellationToken cancellationToken = default)
+        public async Task<long?> PostAsync(global::Marechai.App.Models.ResolutionByGpuDto body, Action<RequestConfiguration<DefaultQueryParameters>>? requestConfiguration = default, CancellationToken cancellationToken = default)
         {
 #nullable restore
 #else
-        public async Task<UntypedNode> PostAsync(global::Marechai.App.Models.ResolutionByGpuDto body, Action<RequestConfiguration<DefaultQueryParameters>> requestConfiguration = default, CancellationToken cancellationToken = default)
+        public async Task<long?> PostAsync(global::Marechai.App.Models.ResolutionByGpuDto body, Action<RequestConfiguration<DefaultQueryParameters>> requestConfiguration = default, CancellationToken cancellationToken = default)
         {
 #endif
             if(ReferenceEquals(body, null)) throw new ArgumentNullException(nameof(body));
@@ -87,7 +87,7 @@ namespace Marechai.App.ResolutionsByGpu
                 { "400", global::Marechai.App.Models.ProblemDetails.CreateFromDiscriminatorValue },
                 { "401", global::Marechai.App.Models.ProblemDetails.CreateFromDiscriminatorValue },
             };
-            return await RequestAdapter.SendAsync<UntypedNode>(requestInfo, UntypedNode.CreateFromDiscriminatorValue, errorMapping, cancellationToken).ConfigureAwait(false);
+            return await RequestAdapter.SendPrimitiveAsync<long?>(requestInfo, errorMapping, cancellationToken).ConfigureAwait(false);
         }
         /// <returns>A <see cref="RequestInformation"/></returns>
         /// <param name="body">The request body</param>
diff --git a/Marechai.App/Services/Client/ResolutionsByScreen/ResolutionsByScreenRequestBuilder.cs b/Marechai.App/Services/Client/ResolutionsByScreen/ResolutionsByScreenRequestBuilder.cs
index 949e3f1d..d9260c76 100644
--- a/Marechai.App/Services/Client/ResolutionsByScreen/ResolutionsByScreenRequestBuilder.cs
+++ b/Marechai.App/Services/Client/ResolutionsByScreen/ResolutionsByScreenRequestBuilder.cs
@@ -59,7 +59,7 @@ namespace Marechai.App.ResolutionsByScreen
         public ResolutionsByScreenRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) : base(requestAdapter, "{+baseurl}/resolutions-by-screen", rawUrl)
         {
         }
-        /// <returns>A <see cref="UntypedNode"/></returns>
+        /// <returns>A <see cref="long"/></returns>
         /// <param name="body">The request body</param>
         /// <param name="cancellationToken">Cancellation token to use when cancelling requests</param>
         /// <param name="requestConfiguration">Configuration for the request such as headers, query parameters, and middleware options.</param>
@@ -67,11 +67,11 @@ namespace Marechai.App.ResolutionsByScreen
         /// <exception cref="global::Marechai.App.Models.ProblemDetails">When receiving a 401 status code</exception>
 #if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
 #nullable enable
-        public async Task<UntypedNode?> PostAsync(global::Marechai.App.Models.ResolutionByScreenDto body, Action<RequestConfiguration<DefaultQueryParameters>>? requestConfiguration = default, CancellationToken cancellationToken = default)
+        public async Task<long?> PostAsync(global::Marechai.App.Models.ResolutionByScreenDto body, Action<RequestConfiguration<DefaultQueryParameters>>? requestConfiguration = default, CancellationToken cancellationToken = default)
         {
 #nullable restore
 #else
-        public async Task<UntypedNode> PostAsync(global::Marechai.App.Models.ResolutionByScreenDto body, Action<RequestConfiguration<DefaultQueryParameters>> requestConfiguration = default, CancellationToken cancellationToken = default)
+        public async Task<long?> PostAsync(global::Marechai.App.Models.ResolutionByScreenDto body, Action<RequestConfiguration<DefaultQueryParameters>> requestConfiguration = default, CancellationToken cancellationToken = default)
         {
 #endif
             if(ReferenceEquals(body, null)) throw new ArgumentNullException(nameof(body));
@@ -81,7 +81,7 @@ namespace Marechai.App.ResolutionsByScreen
                 { "400", global::Marechai.App.Models.ProblemDetails.CreateFromDiscriminatorValue },
                 { "401", global::Marechai.App.Models.ProblemDetails.CreateFromDiscriminatorValue },
             };
-            return await RequestAdapter.SendAsync<UntypedNode>(requestInfo, UntypedNode.CreateFromDiscriminatorValue, errorMapping, cancellationToken).ConfigureAwait(false);
+            return await RequestAdapter.SendPrimitiveAsync<long?>(requestInfo, errorMapping, cancellationToken).ConfigureAwait(false);
         }
         /// <returns>A <see cref="RequestInformation"/></returns>
         /// <param name="body">The request body</param>
diff --git a/Marechai.App/Services/Client/Screens/ScreensRequestBuilder.cs b/Marechai.App/Services/Client/Screens/ScreensRequestBuilder.cs
index 8ddd3bfe..15e64fd0 100644
--- a/Marechai.App/Services/Client/Screens/ScreensRequestBuilder.cs
+++ b/Marechai.App/Services/Client/Screens/ScreensRequestBuilder.cs
@@ -80,7 +80,7 @@ namespace Marechai.App.Screens
             var collectionResult = await RequestAdapter.SendCollectionAsync<global::Marechai.App.Models.ScreenDto>(requestInfo, global::Marechai.App.Models.ScreenDto.CreateFromDiscriminatorValue, errorMapping, cancellationToken).ConfigureAwait(false);
             return collectionResult?.AsList();
         }
-        /// <returns>A <see cref="UntypedNode"/></returns>
+        /// <returns>A <see cref="long"/></returns>
         /// <param name="body">The request body</param>
         /// <param name="cancellationToken">Cancellation token to use when cancelling requests</param>
         /// <param name="requestConfiguration">Configuration for the request such as headers, query parameters, and middleware options.</param>
@@ -88,11 +88,11 @@ namespace Marechai.App.Screens
         /// <exception cref="global::Marechai.App.Models.ProblemDetails">When receiving a 401 status code</exception>
 #if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
 #nullable enable
-        public async Task<UntypedNode?> PostAsync(global::Marechai.App.Models.ScreenDto body, Action<RequestConfiguration<DefaultQueryParameters>>? requestConfiguration = default, CancellationToken cancellationToken = default)
+        public async Task<long?> PostAsync(global::Marechai.App.Models.ScreenDto body, Action<RequestConfiguration<DefaultQueryParameters>>? requestConfiguration = default, CancellationToken cancellationToken = default)
         {
 #nullable restore
 #else
-        public async Task<UntypedNode> PostAsync(global::Marechai.App.Models.ScreenDto body, Action<RequestConfiguration<DefaultQueryParameters>> requestConfiguration = default, CancellationToken cancellationToken = default)
+        public async Task<long?> PostAsync(global::Marechai.App.Models.ScreenDto body, Action<RequestConfiguration<DefaultQueryParameters>> requestConfiguration = default, CancellationToken cancellationToken = default)
         {
 #endif
             if(ReferenceEquals(body, null)) throw new ArgumentNullException(nameof(body));
@@ -102,7 +102,7 @@ namespace Marechai.App.Screens
                 { "400", global::Marechai.App.Models.ProblemDetails.CreateFromDiscriminatorValue },
                 { "401", global::Marechai.App.Models.ProblemDetails.CreateFromDiscriminatorValue },
             };
-            return await RequestAdapter.SendAsync<UntypedNode>(requestInfo, UntypedNode.CreateFromDiscriminatorValue, errorMapping, cancellationToken).ConfigureAwait(false);
+            return await RequestAdapter.SendPrimitiveAsync<long?>(requestInfo, errorMapping, cancellationToken).ConfigureAwait(false);
         }
         /// <returns>A <see cref="RequestInformation"/></returns>
         /// <param name="requestConfiguration">Configuration for the request such as headers, query parameters, and middleware options.</param>
diff --git a/Marechai.App/Services/Client/ScreensByMachine/ScreensByMachineRequestBuilder.cs b/Marechai.App/Services/Client/ScreensByMachine/ScreensByMachineRequestBuilder.cs
index 6dfca886..56b4e137 100644
--- a/Marechai.App/Services/Client/ScreensByMachine/ScreensByMachineRequestBuilder.cs
+++ b/Marechai.App/Services/Client/ScreensByMachine/ScreensByMachineRequestBuilder.cs
@@ -59,7 +59,7 @@ namespace Marechai.App.ScreensByMachine
         public ScreensByMachineRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) : base(requestAdapter, "{+baseurl}/screens-by-machine", rawUrl)
         {
         }
-        /// <returns>A <see cref="UntypedNode"/></returns>
+        /// <returns>A <see cref="long"/></returns>
         /// <param name="body">The request body</param>
         /// <param name="cancellationToken">Cancellation token to use when cancelling requests</param>
         /// <param name="requestConfiguration">Configuration for the request such as headers, query parameters, and middleware options.</param>
@@ -67,11 +67,11 @@ namespace Marechai.App.ScreensByMachine
         /// <exception cref="global::Marechai.App.Models.ProblemDetails">When receiving a 401 status code</exception>
 #if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
 #nullable enable
-        public async Task<UntypedNode?> PostAsync(global::Marechai.App.Models.ScreenByMachineDto body, Action<RequestConfiguration<DefaultQueryParameters>>? requestConfiguration = default, CancellationToken cancellationToken = default)
+        public async Task<long?> PostAsync(global::Marechai.App.Models.ScreenByMachineDto body, Action<RequestConfiguration<DefaultQueryParameters>>? requestConfiguration = default, CancellationToken cancellationToken = default)
         {
 #nullable restore
 #else
-        public async Task<UntypedNode> PostAsync(global::Marechai.App.Models.ScreenByMachineDto body, Action<RequestConfiguration<DefaultQueryParameters>> requestConfiguration = default, CancellationToken cancellationToken = default)
+        public async Task<long?> PostAsync(global::Marechai.App.Models.ScreenByMachineDto body, Action<RequestConfiguration<DefaultQueryParameters>> requestConfiguration = default, CancellationToken cancellationToken = default)
         {
 #endif
             if(ReferenceEquals(body, null)) throw new ArgumentNullException(nameof(body));
@@ -81,7 +81,7 @@ namespace Marechai.App.ScreensByMachine
                 { "400", global::Marechai.App.Models.ProblemDetails.CreateFromDiscriminatorValue },
                 { "401", global::Marechai.App.Models.ProblemDetails.CreateFromDiscriminatorValue },
             };
-            return await RequestAdapter.SendAsync<UntypedNode>(requestInfo, UntypedNode.CreateFromDiscriminatorValue, errorMapping, cancellationToken).ConfigureAwait(false);
+            return await RequestAdapter.SendPrimitiveAsync<long?>(requestInfo, errorMapping, cancellationToken).ConfigureAwait(false);
         }
         /// <returns>A <see cref="RequestInformation"/></returns>
         /// <param name="body">The request body</param>
diff --git a/Marechai.App/Services/Client/Software/Families/Companies/CompaniesRequestBuilder.cs b/Marechai.App/Services/Client/Software/Families/Companies/CompaniesRequestBuilder.cs
index 6f2e8487..9a6f1379 100644
--- a/Marechai.App/Services/Client/Software/Families/Companies/CompaniesRequestBuilder.cs
+++ b/Marechai.App/Services/Client/Software/Families/Companies/CompaniesRequestBuilder.cs
@@ -21,7 +21,7 @@ namespace Marechai.App.Software.Families.Companies
         /// <summary>Gets an item from the Marechai.App.software.families.companies.item collection</summary>
         /// <param name="position">Unique identifier of the item</param>
         /// <returns>A <see cref="global::Marechai.App.Software.Families.Companies.Item.CompaniesItemRequestBuilder"/></returns>
-        public global::Marechai.App.Software.Families.Companies.Item.CompaniesItemRequestBuilder this[string position]
+        public global::Marechai.App.Software.Families.Companies.Item.CompaniesItemRequestBuilder this[int position]
         {
             get
             {
@@ -30,6 +30,19 @@ namespace Marechai.App.Software.Families.Companies
                 return new global::Marechai.App.Software.Families.Companies.Item.CompaniesItemRequestBuilder(urlTplParams, RequestAdapter);
             }
         }
+        /// <summary>Gets an item from the Marechai.App.software.families.companies.item collection</summary>
+        /// <param name="position">Unique identifier of the item</param>
+        /// <returns>A <see cref="global::Marechai.App.Software.Families.Companies.Item.CompaniesItemRequestBuilder"/></returns>
+        [Obsolete("This indexer is deprecated and will be removed in the next major version. Use the one with the typed parameter instead.")]
+        public global::Marechai.App.Software.Families.Companies.Item.CompaniesItemRequestBuilder this[string position]
+        {
+            get
+            {
+                var urlTplParams = new Dictionary<string, object>(PathParameters);
+                if (!string.IsNullOrWhiteSpace(position)) urlTplParams.Add("id", position);
+                return new global::Marechai.App.Software.Families.Companies.Item.CompaniesItemRequestBuilder(urlTplParams, RequestAdapter);
+            }
+        }
         /// <summary>
         /// Instantiates a new <see cref="global::Marechai.App.Software.Families.Companies.CompaniesRequestBuilder"/> and sets the default values.
         /// </summary>
@@ -46,7 +59,7 @@ namespace Marechai.App.Software.Families.Companies
         public CompaniesRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) : base(requestAdapter, "{+baseurl}/software/families/companies", rawUrl)
         {
         }
-        /// <returns>A <see cref="UntypedNode"/></returns>
+        /// <returns>A <see cref="int"/></returns>
         /// <param name="body">The request body</param>
         /// <param name="cancellationToken">Cancellation token to use when cancelling requests</param>
         /// <param name="requestConfiguration">Configuration for the request such as headers, query parameters, and middleware options.</param>
@@ -54,11 +67,11 @@ namespace Marechai.App.Software.Families.Companies
         /// <exception cref="global::Marechai.App.Models.ProblemDetails">When receiving a 401 status code</exception>
 #if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
 #nullable enable
-        public async Task<UntypedNode?> PostAsync(global::Marechai.App.Models.CompanyBySoftwareFamilyDto body, Action<RequestConfiguration<DefaultQueryParameters>>? requestConfiguration = default, CancellationToken cancellationToken = default)
+        public async Task<int?> PostAsync(global::Marechai.App.Models.CompanyBySoftwareFamilyDto body, Action<RequestConfiguration<DefaultQueryParameters>>? requestConfiguration = default, CancellationToken cancellationToken = default)
         {
 #nullable restore
 #else
-        public async Task<UntypedNode> PostAsync(global::Marechai.App.Models.CompanyBySoftwareFamilyDto body, Action<RequestConfiguration<DefaultQueryParameters>> requestConfiguration = default, CancellationToken cancellationToken = default)
+        public async Task<int?> PostAsync(global::Marechai.App.Models.CompanyBySoftwareFamilyDto body, Action<RequestConfiguration<DefaultQueryParameters>> requestConfiguration = default, CancellationToken cancellationToken = default)
         {
 #endif
             if(ReferenceEquals(body, null)) throw new ArgumentNullException(nameof(body));
@@ -68,7 +81,7 @@ namespace Marechai.App.Software.Families.Companies
                 { "400", global::Marechai.App.Models.ProblemDetails.CreateFromDiscriminatorValue },
                 { "401", global::Marechai.App.Models.ProblemDetails.CreateFromDiscriminatorValue },
             };
-            return await RequestAdapter.SendAsync<UntypedNode>(requestInfo, UntypedNode.CreateFromDiscriminatorValue, errorMapping, cancellationToken).ConfigureAwait(false);
+            return await RequestAdapter.SendPrimitiveAsync<int?>(requestInfo, errorMapping, cancellationToken).ConfigureAwait(false);
         }
         /// <returns>A <see cref="RequestInformation"/></returns>
         /// <param name="body">The request body</param>
diff --git a/Marechai.App/Services/Client/Software/Families/FamiliesRequestBuilder.cs b/Marechai.App/Services/Client/Software/Families/FamiliesRequestBuilder.cs
index 28eac738..2c5e18a3 100644
--- a/Marechai.App/Services/Client/Software/Families/FamiliesRequestBuilder.cs
+++ b/Marechai.App/Services/Client/Software/Families/FamiliesRequestBuilder.cs
@@ -27,7 +27,7 @@ namespace Marechai.App.Software.Families
         /// <summary>Gets an item from the Marechai.App.software.families.item collection</summary>
         /// <param name="position">Unique identifier of the item</param>
         /// <returns>A <see cref="global::Marechai.App.Software.Families.Item.ItemRequestBuilder"/></returns>
-        public global::Marechai.App.Software.Families.Item.ItemRequestBuilder this[string position]
+        public global::Marechai.App.Software.Families.Item.ItemRequestBuilder this[int position]
         {
             get
             {
@@ -36,6 +36,19 @@ namespace Marechai.App.Software.Families
                 return new global::Marechai.App.Software.Families.Item.ItemRequestBuilder(urlTplParams, RequestAdapter);
             }
         }
+        /// <summary>Gets an item from the Marechai.App.software.families.item collection</summary>
+        /// <param name="position">Unique identifier of the item</param>
+        /// <returns>A <see cref="global::Marechai.App.Software.Families.Item.ItemRequestBuilder"/></returns>
+        [Obsolete("This indexer is deprecated and will be removed in the next major version. Use the one with the typed parameter instead.")]
+        public global::Marechai.App.Software.Families.Item.ItemRequestBuilder this[string position]
+        {
+            get
+            {
+                var urlTplParams = new Dictionary<string, object>(PathParameters);
+                if (!string.IsNullOrWhiteSpace(position)) urlTplParams.Add("%2Did", position);
+                return new global::Marechai.App.Software.Families.Item.ItemRequestBuilder(urlTplParams, RequestAdapter);
+            }
+        }
         /// <summary>
         /// Instantiates a new <see cref="global::Marechai.App.Software.Families.FamiliesRequestBuilder"/> and sets the default values.
         /// </summary>
@@ -73,7 +86,7 @@ namespace Marechai.App.Software.Families
             var collectionResult = await RequestAdapter.SendCollectionAsync<global::Marechai.App.Models.SoftwareFamilyDto>(requestInfo, global::Marechai.App.Models.SoftwareFamilyDto.CreateFromDiscriminatorValue, errorMapping, cancellationToken).ConfigureAwait(false);
             return collectionResult?.AsList();
         }
-        /// <returns>A <see cref="UntypedNode"/></returns>
+        /// <returns>A <see cref="int"/></returns>
         /// <param name="body">The request body</param>
         /// <param name="cancellationToken">Cancellation token to use when cancelling requests</param>
         /// <param name="requestConfiguration">Configuration for the request such as headers, query parameters, and middleware options.</param>
@@ -81,11 +94,11 @@ namespace Marechai.App.Software.Families
         /// <exception cref="global::Marechai.App.Models.ProblemDetails">When receiving a 401 status code</exception>
 #if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
 #nullable enable
-        public async Task<UntypedNode?> PostAsync(global::Marechai.App.Models.SoftwareFamilyDto body, Action<RequestConfiguration<DefaultQueryParameters>>? requestConfiguration = default, CancellationToken cancellationToken = default)
+        public async Task<int?> PostAsync(global::Marechai.App.Models.SoftwareFamilyDto body, Action<RequestConfiguration<DefaultQueryParameters>>? requestConfiguration = default, CancellationToken cancellationToken = default)
         {
 #nullable restore
 #else
-        public async Task<UntypedNode> PostAsync(global::Marechai.App.Models.SoftwareFamilyDto body, Action<RequestConfiguration<DefaultQueryParameters>> requestConfiguration = default, CancellationToken cancellationToken = default)
+        public async Task<int?> PostAsync(global::Marechai.App.Models.SoftwareFamilyDto body, Action<RequestConfiguration<DefaultQueryParameters>> requestConfiguration = default, CancellationToken cancellationToken = default)
         {
 #endif
             if(ReferenceEquals(body, null)) throw new ArgumentNullException(nameof(body));
@@ -95,7 +108,7 @@ namespace Marechai.App.Software.Families
                 { "400", global::Marechai.App.Models.ProblemDetails.CreateFromDiscriminatorValue },
                 { "401", global::Marechai.App.Models.ProblemDetails.CreateFromDiscriminatorValue },
             };
-            return await RequestAdapter.SendAsync<UntypedNode>(requestInfo, UntypedNode.CreateFromDiscriminatorValue, errorMapping, cancellationToken).ConfigureAwait(false);
+            return await RequestAdapter.SendPrimitiveAsync<int?>(requestInfo, errorMapping, cancellationToken).ConfigureAwait(false);
         }
         /// <returns>A <see cref="RequestInformation"/></returns>
         /// <param name="requestConfiguration">Configuration for the request such as headers, query parameters, and middleware options.</param>
diff --git a/Marechai.App/Services/Client/Software/Variants/Companies/CompaniesRequestBuilder.cs b/Marechai.App/Services/Client/Software/Variants/Companies/CompaniesRequestBuilder.cs
index 43a73838..d9debb7e 100644
--- a/Marechai.App/Services/Client/Software/Variants/Companies/CompaniesRequestBuilder.cs
+++ b/Marechai.App/Services/Client/Software/Variants/Companies/CompaniesRequestBuilder.cs
@@ -21,7 +21,7 @@ namespace Marechai.App.Software.Variants.Companies
         /// <summary>Gets an item from the Marechai.App.software.variants.companies.item collection</summary>
         /// <param name="position">Unique identifier of the item</param>
         /// <returns>A <see cref="global::Marechai.App.Software.Variants.Companies.Item.CompaniesItemRequestBuilder"/></returns>
-        public global::Marechai.App.Software.Variants.Companies.Item.CompaniesItemRequestBuilder this[string position]
+        public global::Marechai.App.Software.Variants.Companies.Item.CompaniesItemRequestBuilder this[int position]
         {
             get
             {
@@ -30,6 +30,19 @@ namespace Marechai.App.Software.Variants.Companies
                 return new global::Marechai.App.Software.Variants.Companies.Item.CompaniesItemRequestBuilder(urlTplParams, RequestAdapter);
             }
         }
+        /// <summary>Gets an item from the Marechai.App.software.variants.companies.item collection</summary>
+        /// <param name="position">Unique identifier of the item</param>
+        /// <returns>A <see cref="global::Marechai.App.Software.Variants.Companies.Item.CompaniesItemRequestBuilder"/></returns>
+        [Obsolete("This indexer is deprecated and will be removed in the next major version. Use the one with the typed parameter instead.")]
+        public global::Marechai.App.Software.Variants.Companies.Item.CompaniesItemRequestBuilder this[string position]
+        {
+            get
+            {
+                var urlTplParams = new Dictionary<string, object>(PathParameters);
+                if (!string.IsNullOrWhiteSpace(position)) urlTplParams.Add("id", position);
+                return new global::Marechai.App.Software.Variants.Companies.Item.CompaniesItemRequestBuilder(urlTplParams, RequestAdapter);
+            }
+        }
         /// <summary>
         /// Instantiates a new <see cref="global::Marechai.App.Software.Variants.Companies.CompaniesRequestBuilder"/> and sets the default values.
         /// </summary>
@@ -46,7 +59,7 @@ namespace Marechai.App.Software.Variants.Companies
         public CompaniesRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) : base(requestAdapter, "{+baseurl}/software/variants/companies", rawUrl)
         {
         }
-        /// <returns>A <see cref="UntypedNode"/></returns>
+        /// <returns>A <see cref="int"/></returns>
         /// <param name="body">The request body</param>
         /// <param name="cancellationToken">Cancellation token to use when cancelling requests</param>
         /// <param name="requestConfiguration">Configuration for the request such as headers, query parameters, and middleware options.</param>
@@ -54,11 +67,11 @@ namespace Marechai.App.Software.Variants.Companies
         /// <exception cref="global::Marechai.App.Models.ProblemDetails">When receiving a 401 status code</exception>
 #if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
 #nullable enable
-        public async Task<UntypedNode?> PostAsync(global::Marechai.App.Models.CompanyBySoftwareVariantDto body, Action<RequestConfiguration<DefaultQueryParameters>>? requestConfiguration = default, CancellationToken cancellationToken = default)
+        public async Task<int?> PostAsync(global::Marechai.App.Models.CompanyBySoftwareVariantDto body, Action<RequestConfiguration<DefaultQueryParameters>>? requestConfiguration = default, CancellationToken cancellationToken = default)
         {
 #nullable restore
 #else
-        public async Task<UntypedNode> PostAsync(global::Marechai.App.Models.CompanyBySoftwareVariantDto body, Action<RequestConfiguration<DefaultQueryParameters>> requestConfiguration = default, CancellationToken cancellationToken = default)
+        public async Task<int?> PostAsync(global::Marechai.App.Models.CompanyBySoftwareVariantDto body, Action<RequestConfiguration<DefaultQueryParameters>> requestConfiguration = default, CancellationToken cancellationToken = default)
         {
 #endif
             if(ReferenceEquals(body, null)) throw new ArgumentNullException(nameof(body));
@@ -68,7 +81,7 @@ namespace Marechai.App.Software.Variants.Companies
                 { "400", global::Marechai.App.Models.ProblemDetails.CreateFromDiscriminatorValue },
                 { "401", global::Marechai.App.Models.ProblemDetails.CreateFromDiscriminatorValue },
             };
-            return await RequestAdapter.SendAsync<UntypedNode>(requestInfo, UntypedNode.CreateFromDiscriminatorValue, errorMapping, cancellationToken).ConfigureAwait(false);
+            return await RequestAdapter.SendPrimitiveAsync<int?>(requestInfo, errorMapping, cancellationToken).ConfigureAwait(false);
         }
         /// <returns>A <see cref="RequestInformation"/></returns>
         /// <param name="body">The request body</param>
diff --git a/Marechai.App/Services/Client/Software/Variants/VariantsRequestBuilder.cs b/Marechai.App/Services/Client/Software/Variants/VariantsRequestBuilder.cs
index 8133dcde..c6824154 100644
--- a/Marechai.App/Services/Client/Software/Variants/VariantsRequestBuilder.cs
+++ b/Marechai.App/Services/Client/Software/Variants/VariantsRequestBuilder.cs
@@ -27,7 +27,7 @@ namespace Marechai.App.Software.Variants
         /// <summary>Gets an item from the Marechai.App.software.variants.item collection</summary>
         /// <param name="position">Unique identifier of the item</param>
         /// <returns>A <see cref="global::Marechai.App.Software.Variants.Item.ItemRequestBuilder"/></returns>
-        public global::Marechai.App.Software.Variants.Item.ItemRequestBuilder this[string position]
+        public global::Marechai.App.Software.Variants.Item.ItemRequestBuilder this[int position]
         {
             get
             {
@@ -36,6 +36,19 @@ namespace Marechai.App.Software.Variants
                 return new global::Marechai.App.Software.Variants.Item.ItemRequestBuilder(urlTplParams, RequestAdapter);
             }
         }
+        /// <summary>Gets an item from the Marechai.App.software.variants.item collection</summary>
+        /// <param name="position">Unique identifier of the item</param>
+        /// <returns>A <see cref="global::Marechai.App.Software.Variants.Item.ItemRequestBuilder"/></returns>
+        [Obsolete("This indexer is deprecated and will be removed in the next major version. Use the one with the typed parameter instead.")]
+        public global::Marechai.App.Software.Variants.Item.ItemRequestBuilder this[string position]
+        {
+            get
+            {
+                var urlTplParams = new Dictionary<string, object>(PathParameters);
+                if (!string.IsNullOrWhiteSpace(position)) urlTplParams.Add("%2Did", position);
+                return new global::Marechai.App.Software.Variants.Item.ItemRequestBuilder(urlTplParams, RequestAdapter);
+            }
+        }
         /// <summary>
         /// Instantiates a new <see cref="global::Marechai.App.Software.Variants.VariantsRequestBuilder"/> and sets the default values.
         /// </summary>
@@ -73,7 +86,7 @@ namespace Marechai.App.Software.Variants
             var collectionResult = await RequestAdapter.SendCollectionAsync<global::Marechai.App.Models.SoftwareVariantDto>(requestInfo, global::Marechai.App.Models.SoftwareVariantDto.CreateFromDiscriminatorValue, errorMapping, cancellationToken).ConfigureAwait(false);
             return collectionResult?.AsList();
         }
-        /// <returns>A <see cref="UntypedNode"/></returns>
+        /// <returns>A <see cref="int"/></returns>
         /// <param name="body">The request body</param>
         /// <param name="cancellationToken">Cancellation token to use when cancelling requests</param>
         /// <param name="requestConfiguration">Configuration for the request such as headers, query parameters, and middleware options.</param>
@@ -81,11 +94,11 @@ namespace Marechai.App.Software.Variants
         /// <exception cref="global::Marechai.App.Models.ProblemDetails">When receiving a 401 status code</exception>
 #if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
 #nullable enable
-        public async Task<UntypedNode?> PostAsync(global::Marechai.App.Models.SoftwareVariantDto body, Action<RequestConfiguration<DefaultQueryParameters>>? requestConfiguration = default, CancellationToken cancellationToken = default)
+        public async Task<int?> PostAsync(global::Marechai.App.Models.SoftwareVariantDto body, Action<RequestConfiguration<DefaultQueryParameters>>? requestConfiguration = default, CancellationToken cancellationToken = default)
         {
 #nullable restore
 #else
-        public async Task<UntypedNode> PostAsync(global::Marechai.App.Models.SoftwareVariantDto body, Action<RequestConfiguration<DefaultQueryParameters>> requestConfiguration = default, CancellationToken cancellationToken = default)
+        public async Task<int?> PostAsync(global::Marechai.App.Models.SoftwareVariantDto body, Action<RequestConfiguration<DefaultQueryParameters>> requestConfiguration = default, CancellationToken cancellationToken = default)
         {
 #endif
             if(ReferenceEquals(body, null)) throw new ArgumentNullException(nameof(body));
@@ -95,7 +108,7 @@ namespace Marechai.App.Software.Variants
                 { "400", global::Marechai.App.Models.ProblemDetails.CreateFromDiscriminatorValue },
                 { "401", global::Marechai.App.Models.ProblemDetails.CreateFromDiscriminatorValue },
             };
-            return await RequestAdapter.SendAsync<UntypedNode>(requestInfo, UntypedNode.CreateFromDiscriminatorValue, errorMapping, cancellationToken).ConfigureAwait(false);
+            return await RequestAdapter.SendPrimitiveAsync<int?>(requestInfo, errorMapping, cancellationToken).ConfigureAwait(false);
         }
         /// <returns>A <see cref="RequestInformation"/></returns>
         /// <param name="requestConfiguration">Configuration for the request such as headers, query parameters, and middleware options.</param>
diff --git a/Marechai.App/Services/Client/Software/Versions/Companies/CompaniesRequestBuilder.cs b/Marechai.App/Services/Client/Software/Versions/Companies/CompaniesRequestBuilder.cs
index b79e5507..b96750c9 100644
--- a/Marechai.App/Services/Client/Software/Versions/Companies/CompaniesRequestBuilder.cs
+++ b/Marechai.App/Services/Client/Software/Versions/Companies/CompaniesRequestBuilder.cs
@@ -21,7 +21,7 @@ namespace Marechai.App.Software.Versions.Companies
         /// <summary>Gets an item from the Marechai.App.software.versions.companies.item collection</summary>
         /// <param name="position">Unique identifier of the item</param>
         /// <returns>A <see cref="global::Marechai.App.Software.Versions.Companies.Item.CompaniesItemRequestBuilder"/></returns>
-        public global::Marechai.App.Software.Versions.Companies.Item.CompaniesItemRequestBuilder this[string position]
+        public global::Marechai.App.Software.Versions.Companies.Item.CompaniesItemRequestBuilder this[int position]
         {
             get
             {
@@ -30,6 +30,19 @@ namespace Marechai.App.Software.Versions.Companies
                 return new global::Marechai.App.Software.Versions.Companies.Item.CompaniesItemRequestBuilder(urlTplParams, RequestAdapter);
             }
         }
+        /// <summary>Gets an item from the Marechai.App.software.versions.companies.item collection</summary>
+        /// <param name="position">Unique identifier of the item</param>
+        /// <returns>A <see cref="global::Marechai.App.Software.Versions.Companies.Item.CompaniesItemRequestBuilder"/></returns>
+        [Obsolete("This indexer is deprecated and will be removed in the next major version. Use the one with the typed parameter instead.")]
+        public global::Marechai.App.Software.Versions.Companies.Item.CompaniesItemRequestBuilder this[string position]
+        {
+            get
+            {
+                var urlTplParams = new Dictionary<string, object>(PathParameters);
+                if (!string.IsNullOrWhiteSpace(position)) urlTplParams.Add("id", position);
+                return new global::Marechai.App.Software.Versions.Companies.Item.CompaniesItemRequestBuilder(urlTplParams, RequestAdapter);
+            }
+        }
         /// <summary>
         /// Instantiates a new <see cref="global::Marechai.App.Software.Versions.Companies.CompaniesRequestBuilder"/> and sets the default values.
         /// </summary>
@@ -46,7 +59,7 @@ namespace Marechai.App.Software.Versions.Companies
         public CompaniesRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) : base(requestAdapter, "{+baseurl}/software/versions/companies", rawUrl)
         {
         }
-        /// <returns>A <see cref="UntypedNode"/></returns>
+        /// <returns>A <see cref="int"/></returns>
         /// <param name="body">The request body</param>
         /// <param name="cancellationToken">Cancellation token to use when cancelling requests</param>
         /// <param name="requestConfiguration">Configuration for the request such as headers, query parameters, and middleware options.</param>
@@ -54,11 +67,11 @@ namespace Marechai.App.Software.Versions.Companies
         /// <exception cref="global::Marechai.App.Models.ProblemDetails">When receiving a 401 status code</exception>
 #if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
 #nullable enable
-        public async Task<UntypedNode?> PostAsync(global::Marechai.App.Models.CompanyBySoftwareVersionDto body, Action<RequestConfiguration<DefaultQueryParameters>>? requestConfiguration = default, CancellationToken cancellationToken = default)
+        public async Task<int?> PostAsync(global::Marechai.App.Models.CompanyBySoftwareVersionDto body, Action<RequestConfiguration<DefaultQueryParameters>>? requestConfiguration = default, CancellationToken cancellationToken = default)
         {
 #nullable restore
 #else
-        public async Task<UntypedNode> PostAsync(global::Marechai.App.Models.CompanyBySoftwareVersionDto body, Action<RequestConfiguration<DefaultQueryParameters>> requestConfiguration = default, CancellationToken cancellationToken = default)
+        public async Task<int?> PostAsync(global::Marechai.App.Models.CompanyBySoftwareVersionDto body, Action<RequestConfiguration<DefaultQueryParameters>> requestConfiguration = default, CancellationToken cancellationToken = default)
         {
 #endif
             if(ReferenceEquals(body, null)) throw new ArgumentNullException(nameof(body));
@@ -68,7 +81,7 @@ namespace Marechai.App.Software.Versions.Companies
                 { "400", global::Marechai.App.Models.ProblemDetails.CreateFromDiscriminatorValue },
                 { "401", global::Marechai.App.Models.ProblemDetails.CreateFromDiscriminatorValue },
             };
-            return await RequestAdapter.SendAsync<UntypedNode>(requestInfo, UntypedNode.CreateFromDiscriminatorValue, errorMapping, cancellationToken).ConfigureAwait(false);
+            return await RequestAdapter.SendPrimitiveAsync<int?>(requestInfo, errorMapping, cancellationToken).ConfigureAwait(false);
         }
         /// <returns>A <see cref="RequestInformation"/></returns>
         /// <param name="body">The request body</param>
diff --git a/Marechai.App/Services/Client/Software/Versions/VersionsRequestBuilder.cs b/Marechai.App/Services/Client/Software/Versions/VersionsRequestBuilder.cs
index 0a643485..42ff12e2 100644
--- a/Marechai.App/Services/Client/Software/Versions/VersionsRequestBuilder.cs
+++ b/Marechai.App/Services/Client/Software/Versions/VersionsRequestBuilder.cs
@@ -27,7 +27,7 @@ namespace Marechai.App.Software.Versions
         /// <summary>Gets an item from the Marechai.App.software.versions.item collection</summary>
         /// <param name="position">Unique identifier of the item</param>
         /// <returns>A <see cref="global::Marechai.App.Software.Versions.Item.ItemRequestBuilder"/></returns>
-        public global::Marechai.App.Software.Versions.Item.ItemRequestBuilder this[string position]
+        public global::Marechai.App.Software.Versions.Item.ItemRequestBuilder this[int position]
         {
             get
             {
@@ -36,6 +36,19 @@ namespace Marechai.App.Software.Versions
                 return new global::Marechai.App.Software.Versions.Item.ItemRequestBuilder(urlTplParams, RequestAdapter);
             }
         }
+        /// <summary>Gets an item from the Marechai.App.software.versions.item collection</summary>
+        /// <param name="position">Unique identifier of the item</param>
+        /// <returns>A <see cref="global::Marechai.App.Software.Versions.Item.ItemRequestBuilder"/></returns>
+        [Obsolete("This indexer is deprecated and will be removed in the next major version. Use the one with the typed parameter instead.")]
+        public global::Marechai.App.Software.Versions.Item.ItemRequestBuilder this[string position]
+        {
+            get
+            {
+                var urlTplParams = new Dictionary<string, object>(PathParameters);
+                if (!string.IsNullOrWhiteSpace(position)) urlTplParams.Add("%2Did", position);
+                return new global::Marechai.App.Software.Versions.Item.ItemRequestBuilder(urlTplParams, RequestAdapter);
+            }
+        }
         /// <summary>
         /// Instantiates a new <see cref="global::Marechai.App.Software.Versions.VersionsRequestBuilder"/> and sets the default values.
         /// </summary>
@@ -73,7 +86,7 @@ namespace Marechai.App.Software.Versions
             var collectionResult = await RequestAdapter.SendCollectionAsync<global::Marechai.App.Models.SoftwareVersionDto>(requestInfo, global::Marechai.App.Models.SoftwareVersionDto.CreateFromDiscriminatorValue, errorMapping, cancellationToken).ConfigureAwait(false);
             return collectionResult?.AsList();
         }
-        /// <returns>A <see cref="UntypedNode"/></returns>
+        /// <returns>A <see cref="int"/></returns>
         /// <param name="body">The request body</param>
         /// <param name="cancellationToken">Cancellation token to use when cancelling requests</param>
         /// <param name="requestConfiguration">Configuration for the request such as headers, query parameters, and middleware options.</param>
@@ -81,11 +94,11 @@ namespace Marechai.App.Software.Versions
         /// <exception cref="global::Marechai.App.Models.ProblemDetails">When receiving a 401 status code</exception>
 #if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
 #nullable enable
-        public async Task<UntypedNode?> PostAsync(global::Marechai.App.Models.SoftwareVersionDto body, Action<RequestConfiguration<DefaultQueryParameters>>? requestConfiguration = default, CancellationToken cancellationToken = default)
+        public async Task<int?> PostAsync(global::Marechai.App.Models.SoftwareVersionDto body, Action<RequestConfiguration<DefaultQueryParameters>>? requestConfiguration = default, CancellationToken cancellationToken = default)
         {
 #nullable restore
 #else
-        public async Task<UntypedNode> PostAsync(global::Marechai.App.Models.SoftwareVersionDto body, Action<RequestConfiguration<DefaultQueryParameters>> requestConfiguration = default, CancellationToken cancellationToken = default)
+        public async Task<int?> PostAsync(global::Marechai.App.Models.SoftwareVersionDto body, Action<RequestConfiguration<DefaultQueryParameters>> requestConfiguration = default, CancellationToken cancellationToken = default)
         {
 #endif
             if(ReferenceEquals(body, null)) throw new ArgumentNullException(nameof(body));
@@ -95,7 +108,7 @@ namespace Marechai.App.Software.Versions
                 { "400", global::Marechai.App.Models.ProblemDetails.CreateFromDiscriminatorValue },
                 { "401", global::Marechai.App.Models.ProblemDetails.CreateFromDiscriminatorValue },
             };
-            return await RequestAdapter.SendAsync<UntypedNode>(requestInfo, UntypedNode.CreateFromDiscriminatorValue, errorMapping, cancellationToken).ConfigureAwait(false);
+            return await RequestAdapter.SendPrimitiveAsync<int?>(requestInfo, errorMapping, cancellationToken).ConfigureAwait(false);
         }
         /// <returns>A <see cref="RequestInformation"/></returns>
         /// <param name="requestConfiguration">Configuration for the request such as headers, query parameters, and middleware options.</param>
diff --git a/Marechai.App/Services/Client/SoundSynths/SoundSynthsRequestBuilder.cs b/Marechai.App/Services/Client/SoundSynths/SoundSynthsRequestBuilder.cs
index b784b179..8cc5026f 100644
--- a/Marechai.App/Services/Client/SoundSynths/SoundSynthsRequestBuilder.cs
+++ b/Marechai.App/Services/Client/SoundSynths/SoundSynthsRequestBuilder.cs
@@ -80,7 +80,7 @@ namespace Marechai.App.SoundSynths
             var collectionResult = await RequestAdapter.SendCollectionAsync<global::Marechai.App.Models.SoundSynthDto>(requestInfo, global::Marechai.App.Models.SoundSynthDto.CreateFromDiscriminatorValue, errorMapping, cancellationToken).ConfigureAwait(false);
             return collectionResult?.AsList();
         }
-        /// <returns>A <see cref="UntypedNode"/></returns>
+        /// <returns>A <see cref="long"/></returns>
         /// <param name="body">The request body</param>
         /// <param name="cancellationToken">Cancellation token to use when cancelling requests</param>
         /// <param name="requestConfiguration">Configuration for the request such as headers, query parameters, and middleware options.</param>
@@ -88,11 +88,11 @@ namespace Marechai.App.SoundSynths
         /// <exception cref="global::Marechai.App.Models.ProblemDetails">When receiving a 401 status code</exception>
 #if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
 #nullable enable
-        public async Task<UntypedNode?> PostAsync(global::Marechai.App.Models.SoundSynthDto body, Action<RequestConfiguration<DefaultQueryParameters>>? requestConfiguration = default, CancellationToken cancellationToken = default)
+        public async Task<long?> PostAsync(global::Marechai.App.Models.SoundSynthDto body, Action<RequestConfiguration<DefaultQueryParameters>>? requestConfiguration = default, CancellationToken cancellationToken = default)
         {
 #nullable restore
 #else
-        public async Task<UntypedNode> PostAsync(global::Marechai.App.Models.SoundSynthDto body, Action<RequestConfiguration<DefaultQueryParameters>> requestConfiguration = default, CancellationToken cancellationToken = default)
+        public async Task<long?> PostAsync(global::Marechai.App.Models.SoundSynthDto body, Action<RequestConfiguration<DefaultQueryParameters>> requestConfiguration = default, CancellationToken cancellationToken = default)
         {
 #endif
             if(ReferenceEquals(body, null)) throw new ArgumentNullException(nameof(body));
@@ -102,7 +102,7 @@ namespace Marechai.App.SoundSynths
                 { "400", global::Marechai.App.Models.ProblemDetails.CreateFromDiscriminatorValue },
                 { "401", global::Marechai.App.Models.ProblemDetails.CreateFromDiscriminatorValue },
             };
-            return await RequestAdapter.SendAsync<UntypedNode>(requestInfo, UntypedNode.CreateFromDiscriminatorValue, errorMapping, cancellationToken).ConfigureAwait(false);
+            return await RequestAdapter.SendPrimitiveAsync<long?>(requestInfo, errorMapping, cancellationToken).ConfigureAwait(false);
         }
         /// <returns>A <see cref="RequestInformation"/></returns>
         /// <param name="requestConfiguration">Configuration for the request such as headers, query parameters, and middleware options.</param>
diff --git a/Marechai.App/Services/Client/SoundSynthsByMachine/SoundSynthsByMachineRequestBuilder.cs b/Marechai.App/Services/Client/SoundSynthsByMachine/SoundSynthsByMachineRequestBuilder.cs
index 80839b5e..cd869b54 100644
--- a/Marechai.App/Services/Client/SoundSynthsByMachine/SoundSynthsByMachineRequestBuilder.cs
+++ b/Marechai.App/Services/Client/SoundSynthsByMachine/SoundSynthsByMachineRequestBuilder.cs
@@ -65,7 +65,7 @@ namespace Marechai.App.SoundSynthsByMachine
         public SoundSynthsByMachineRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) : base(requestAdapter, "{+baseurl}/sound-synths-by-machine", rawUrl)
         {
         }
-        /// <returns>A <see cref="UntypedNode"/></returns>
+        /// <returns>A <see cref="long"/></returns>
         /// <param name="body">The request body</param>
         /// <param name="cancellationToken">Cancellation token to use when cancelling requests</param>
         /// <param name="requestConfiguration">Configuration for the request such as headers, query parameters, and middleware options.</param>
@@ -73,11 +73,11 @@ namespace Marechai.App.SoundSynthsByMachine
         /// <exception cref="global::Marechai.App.Models.ProblemDetails">When receiving a 401 status code</exception>
 #if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
 #nullable enable
-        public async Task<UntypedNode?> PostAsync(global::Marechai.App.Models.SoundSynthByMachineDto body, Action<RequestConfiguration<DefaultQueryParameters>>? requestConfiguration = default, CancellationToken cancellationToken = default)
+        public async Task<long?> PostAsync(global::Marechai.App.Models.SoundSynthByMachineDto body, Action<RequestConfiguration<DefaultQueryParameters>>? requestConfiguration = default, CancellationToken cancellationToken = default)
         {
 #nullable restore
 #else
-        public async Task<UntypedNode> PostAsync(global::Marechai.App.Models.SoundSynthByMachineDto body, Action<RequestConfiguration<DefaultQueryParameters>> requestConfiguration = default, CancellationToken cancellationToken = default)
+        public async Task<long?> PostAsync(global::Marechai.App.Models.SoundSynthByMachineDto body, Action<RequestConfiguration<DefaultQueryParameters>> requestConfiguration = default, CancellationToken cancellationToken = default)
         {
 #endif
             if(ReferenceEquals(body, null)) throw new ArgumentNullException(nameof(body));
@@ -87,7 +87,7 @@ namespace Marechai.App.SoundSynthsByMachine
                 { "400", global::Marechai.App.Models.ProblemDetails.CreateFromDiscriminatorValue },
                 { "401", global::Marechai.App.Models.ProblemDetails.CreateFromDiscriminatorValue },
             };
-            return await RequestAdapter.SendAsync<UntypedNode>(requestInfo, UntypedNode.CreateFromDiscriminatorValue, errorMapping, cancellationToken).ConfigureAwait(false);
+            return await RequestAdapter.SendPrimitiveAsync<long?>(requestInfo, errorMapping, cancellationToken).ConfigureAwait(false);
         }
         /// <returns>A <see cref="RequestInformation"/></returns>
         /// <param name="body">The request body</param>
diff --git a/Marechai.App/Services/Client/StorageByMachine/StorageByMachineRequestBuilder.cs b/Marechai.App/Services/Client/StorageByMachine/StorageByMachineRequestBuilder.cs
index a50e7ac9..bbc70162 100644
--- a/Marechai.App/Services/Client/StorageByMachine/StorageByMachineRequestBuilder.cs
+++ b/Marechai.App/Services/Client/StorageByMachine/StorageByMachineRequestBuilder.cs
@@ -59,7 +59,7 @@ namespace Marechai.App.StorageByMachine
         public StorageByMachineRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) : base(requestAdapter, "{+baseurl}/storage-by-machine", rawUrl)
         {
         }
-        /// <returns>A <see cref="UntypedNode"/></returns>
+        /// <returns>A <see cref="long"/></returns>
         /// <param name="body">The request body</param>
         /// <param name="cancellationToken">Cancellation token to use when cancelling requests</param>
         /// <param name="requestConfiguration">Configuration for the request such as headers, query parameters, and middleware options.</param>
@@ -67,11 +67,11 @@ namespace Marechai.App.StorageByMachine
         /// <exception cref="global::Marechai.App.Models.ProblemDetails">When receiving a 401 status code</exception>
 #if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
 #nullable enable
-        public async Task<UntypedNode?> PostAsync(global::Marechai.App.Models.StorageByMachineDto body, Action<RequestConfiguration<DefaultQueryParameters>>? requestConfiguration = default, CancellationToken cancellationToken = default)
+        public async Task<long?> PostAsync(global::Marechai.App.Models.StorageByMachineDto body, Action<RequestConfiguration<DefaultQueryParameters>>? requestConfiguration = default, CancellationToken cancellationToken = default)
         {
 #nullable restore
 #else
-        public async Task<UntypedNode> PostAsync(global::Marechai.App.Models.StorageByMachineDto body, Action<RequestConfiguration<DefaultQueryParameters>> requestConfiguration = default, CancellationToken cancellationToken = default)
+        public async Task<long?> PostAsync(global::Marechai.App.Models.StorageByMachineDto body, Action<RequestConfiguration<DefaultQueryParameters>> requestConfiguration = default, CancellationToken cancellationToken = default)
         {
 #endif
             if(ReferenceEquals(body, null)) throw new ArgumentNullException(nameof(body));
@@ -81,7 +81,7 @@ namespace Marechai.App.StorageByMachine
                 { "400", global::Marechai.App.Models.ProblemDetails.CreateFromDiscriminatorValue },
                 { "401", global::Marechai.App.Models.ProblemDetails.CreateFromDiscriminatorValue },
             };
-            return await RequestAdapter.SendAsync<UntypedNode>(requestInfo, UntypedNode.CreateFromDiscriminatorValue, errorMapping, cancellationToken).ConfigureAwait(false);
+            return await RequestAdapter.SendPrimitiveAsync<long?>(requestInfo, errorMapping, cancellationToken).ConfigureAwait(false);
         }
         /// <returns>A <see cref="RequestInformation"/></returns>
         /// <param name="body">The request body</param>
diff --git a/Marechai.App/Services/Client/kiota-lock.json b/Marechai.App/Services/Client/kiota-lock.json
index f1f2cdf6..0e94fcfa 100644
--- a/Marechai.App/Services/Client/kiota-lock.json
+++ b/Marechai.App/Services/Client/kiota-lock.json
@@ -1,34 +1,34 @@
 {
-  "descriptionHash":           "D113F1327CF7DE3F19E825040CA90DB79CEEC1636CED7E314A2D47CB82985CF9BC542185433D69366B0B36C3836966BDE3778B69AA15A0D11A063BE5571BCA5D",
-  "descriptionLocation":       "http://localhost:5023/openapi/v1.json",
-  "lockFileVersion":           "1.0.0",
-  "kiotaVersion":              "1.29.0",
-  "clientClassName":           "ApiClient",
-  "typeAccessModifier":        "Public",
-  "clientNamespaceName":       "Marechai.App",
-  "language":                  "CSharp",
-  "usesBackingStore":          false,
+  "descriptionHash": "39D2BFA791223984F51F46A2A8EE34B01E19F393B14843E7AFDBAC674AA8AC7F97802ADCF8FFD9B23B0659CDE3B5B690F22FA1E2FC91DABFF4F240B60E17A574",
+  "descriptionLocation": "http://localhost:5023/openapi/v1.json",
+  "lockFileVersion": "1.0.0",
+  "kiotaVersion": "1.29.0",
+  "clientClassName": "ApiClient",
+  "typeAccessModifier": "Public",
+  "clientNamespaceName": "Marechai.App",
+  "language": "CSharp",
+  "usesBackingStore": false,
   "excludeBackwardCompatible": false,
-  "includeAdditionalData":     true,
-  "disableSSLValidation":      false,
-  "serializers":               [
+  "includeAdditionalData": true,
+  "disableSSLValidation": false,
+  "serializers": [
     "Microsoft.Kiota.Serialization.Json.JsonSerializationWriterFactory",
     "Microsoft.Kiota.Serialization.Text.TextSerializationWriterFactory",
     "Microsoft.Kiota.Serialization.Form.FormSerializationWriterFactory",
     "Microsoft.Kiota.Serialization.Multipart.MultipartSerializationWriterFactory"
   ],
-  "deserializers":             [
+  "deserializers": [
     "Microsoft.Kiota.Serialization.Json.JsonParseNodeFactory",
     "Microsoft.Kiota.Serialization.Text.TextParseNodeFactory",
     "Microsoft.Kiota.Serialization.Form.FormParseNodeFactory"
   ],
-  "structuredMimeTypes":       [
+  "structuredMimeTypes": [
     "application/json",
     "text/plain;q=0.9",
     "application/x-www-form-urlencoded;q=0.2",
     "multipart/form-data;q=0.1"
   ],
-  "includePatterns":           [],
-  "excludePatterns":           [],
-  "disabledValidationRules":   []
+  "includePatterns": [],
+  "excludePatterns": [],
+  "disabledValidationRules": []
 }
\ No newline at end of file