diff --git a/Kontent.Ai.Management.Tests/Data/ElementsData.cs b/Kontent.Ai.Management.Tests/Data/ElementsData.cs
index 04f2072e..4e467264 100644
--- a/Kontent.Ai.Management.Tests/Data/ElementsData.cs
+++ b/Kontent.Ai.Management.Tests/Data/ElementsData.cs
@@ -140,7 +140,7 @@ private static dynamic GetRichTextAsDynamic(Guid? elementId, string value, IEnum
         dynamic element = new ExpandoObject();
         element.element = GetElement(elementId.Value.ToString("d"));
         element.value = value;
-        element.components = compoments.Select(x => GetRichTextComponentAsDynamic(x));
+        element.components = compoments.Select(GetRichTextComponentAsDynamic);
 
         return element;
     }
diff --git a/Kontent.Ai.Management.Tests/ManagementClientTests/AssetTests.cs b/Kontent.Ai.Management.Tests/ManagementClientTests/AssetTests.cs
index 49b536c8..7a0a16b9 100644
--- a/Kontent.Ai.Management.Tests/ManagementClientTests/AssetTests.cs
+++ b/Kontent.Ai.Management.Tests/ManagementClientTests/AssetTests.cs
@@ -33,7 +33,7 @@ public async Task ListAssetsAsync_DynamicallyTyped_WithMorePages_ListsAssets()
             "00000000-0000-0000-0000-000000000000",
             "10000000-0000-0000-0000-000000000000",
             "20000000-0000-0000-0000-000000000000"
-        }.Select(x => GetExpectedDynamicAssetModel(assetId: x));
+        }.Select(GetExpectedDynamicAssetModel);
 
         var response = await client.ListAssetsAsync().GetAllAsync();
 
@@ -49,7 +49,7 @@ public async Task ListAssetsAsync_StronglyTyped_WithMorePages_ListsAssets()
             "00000000-0000-0000-0000-000000000000",
             "10000000-0000-0000-0000-000000000000",
             "20000000-0000-0000-0000-000000000000"
-        }.Select(x => GetExpectedStronglyTypedAssetModel(assetId: x));
+        }.Select(GetExpectedStronglyTypedAssetModel);
 
         var response = await client.ListAssetsAsync<ComplexTestModel>().GetAllAsync();
 
diff --git a/Kontent.Ai.Management.Tests/Modules/Extensions/PropertyInfoExtensionsTests.cs b/Kontent.Ai.Management.Tests/Modules/Extensions/PropertyInfoExtensionsTests.cs
index 5c04d3dd..7d2693f7 100644
--- a/Kontent.Ai.Management.Tests/Modules/Extensions/PropertyInfoExtensionsTests.cs
+++ b/Kontent.Ai.Management.Tests/Modules/Extensions/PropertyInfoExtensionsTests.cs
@@ -40,7 +40,7 @@ public void GetKontentElementCodename_ThrowsIfNoAttribute()
     {
         var property = typeof(PropertyInfoExtensionsTestsSampleClass).GetProperty("Property1");
 
-        Assert.Throws<InvalidOperationException>(() => property.GetKontentElementCodename());
+        Assert.Throws<InvalidOperationException>(property.GetKontentElementCodename);
     }
 
     [Fact]
diff --git a/Kontent.Ai.Management/Extensions/ManagementClientExtensions.cs b/Kontent.Ai.Management/Extensions/ManagementClientExtensions.cs
index f931d6f5..b9f0bacb 100644
--- a/Kontent.Ai.Management/Extensions/ManagementClientExtensions.cs
+++ b/Kontent.Ai.Management/Extensions/ManagementClientExtensions.cs
@@ -21,15 +21,9 @@ public static class ManagementClientExtensions
     /// <returns>The <see cref="ContentItemModel"/> instance that represents updated content item.</returns>
     public async static Task<ContentItemModel> UpsertContentItemAsync(this IManagementClient client, Reference identifier, ContentItemModel contentItem)
     {
-        if (identifier == null)
-        {
-            throw new ArgumentNullException(nameof(identifier));
-        }
+        ArgumentNullException.ThrowIfNull(identifier);
 
-        if (contentItem == null)
-        {
-            throw new ArgumentNullException(nameof(contentItem));
-        }
+        ArgumentNullException.ThrowIfNull(contentItem);
 
         var contentItemUpdateModel = new ContentItemUpsertModel
         {
@@ -52,14 +46,8 @@ public async static Task<ContentItemModel> UpsertContentItemAsync(this IManageme
     /// <param name="assetCreateModel">Updated values for the asset.</param>
     public async static Task<AssetModel> CreateAssetAsync(this IManagementClient client, FileContentSource fileContent, AssetCreateModel assetCreateModel)
     {
-        if (fileContent == null)
-        {
-            throw new ArgumentNullException(nameof(fileContent));
-        }
-        if (assetCreateModel == null)
-        {
-            throw new ArgumentNullException(nameof(assetCreateModel));
-        }
+        ArgumentNullException.ThrowIfNull(fileContent);
+        ArgumentNullException.ThrowIfNull(assetCreateModel);
 
         var fileResult = await client.UploadFileAsync(fileContent);
 
@@ -78,14 +66,8 @@ public async static Task<AssetModel> CreateAssetAsync(this IManagementClient cli
     /// <param name="assetCreateModel">Updated values for the strongly typed asset.</param>
     public async static Task<AssetModel<T>> CreateAssetAsync<T>(this IManagementClient client, FileContentSource fileContent, AssetCreateModel<T> assetCreateModel) where T : new()
     {
-        if (fileContent == null)
-        {
-            throw new ArgumentNullException(nameof(fileContent));
-        }
-        if (assetCreateModel == null)
-        {
-            throw new ArgumentNullException(nameof(assetCreateModel));
-        }
+        ArgumentNullException.ThrowIfNull(fileContent);
+        ArgumentNullException.ThrowIfNull(assetCreateModel);
 
         var fileResult = await client.UploadFileAsync(fileContent);
 
@@ -106,20 +88,11 @@ public async static Task<AssetModel> CreateAssetAsync(this IManagementClient cli
     /// <returns>The <see cref="AssetModel"/> instance that represents created or updated asset.</returns>
     public async static Task<AssetModel> UpsertAssetAsync(this IManagementClient client, Reference identifier, FileContentSource fileContent, AssetUpsertModel upsertModel)
     {
-        if (identifier == null)
-        {
-            throw new ArgumentNullException(nameof(identifier));
-        }
+        ArgumentNullException.ThrowIfNull(identifier);
 
-        if (fileContent == null)
-        {
-            throw new ArgumentNullException(nameof(fileContent));
-        }
+        ArgumentNullException.ThrowIfNull(fileContent);
 
-        if (upsertModel == null)
-        {
-            throw new ArgumentNullException(nameof(upsertModel));
-        }
+        ArgumentNullException.ThrowIfNull(upsertModel);
 
         var fileResult = await client.UploadFileAsync(fileContent);
 
@@ -140,20 +113,11 @@ public async static Task<AssetModel> UpsertAssetAsync(this IManagementClient cli
     /// <returns>The <see cref="AssetModel{T}"/> instance that represents created or updated strongly typed asset.</returns>
     public async static Task<AssetModel<T>> UpsertAssetAsync<T>(this IManagementClient client, Reference identifier, FileContentSource fileContent, AssetUpsertModel<T> upsertModel) where T : new()
     {
-        if (identifier == null)
-        {
-            throw new ArgumentNullException(nameof(identifier));
-        }
+        ArgumentNullException.ThrowIfNull(identifier);
 
-        if (fileContent == null)
-        {
-            throw new ArgumentNullException(nameof(fileContent));
-        }
+        ArgumentNullException.ThrowIfNull(fileContent);
 
-        if (upsertModel == null)
-        {
-            throw new ArgumentNullException(nameof(upsertModel));
-        }
+        ArgumentNullException.ThrowIfNull(upsertModel);
 
         var fileResult = await client.UploadFileAsync(fileContent);
 
diff --git a/Kontent.Ai.Management/ManagementClient.Asset.cs b/Kontent.Ai.Management/ManagementClient.Asset.cs
index 016da50e..bc3ac8e1 100644
--- a/Kontent.Ai.Management/ManagementClient.Asset.cs
+++ b/Kontent.Ai.Management/ManagementClient.Asset.cs
@@ -39,10 +39,7 @@ public async Task<IListingResponseModel<AssetModel>> ListAssetsAsync()
     /// <inheritdoc />
     public async Task<AssetModel> GetAssetAsync(Reference identifier)
     {
-        if (identifier == null)
-        {
-            throw new ArgumentNullException(nameof(identifier));
-        }
+        ArgumentNullException.ThrowIfNull(identifier);
 
         var endpointUrl = _urlBuilder.BuildAssetsUrl(identifier);
         var response = await _actionInvoker.InvokeReadOnlyMethodAsync<AssetModel>(endpointUrl, HttpMethod.Get);
@@ -61,15 +58,9 @@ public async Task<AssetModel> GetAssetAsync(Reference identifier)
     /// <inheritdoc />
     public async Task<AssetModel> UpsertAssetAsync(Reference identifier, AssetUpsertModel asset)
     {
-        if (identifier == null)
-        {
-            throw new ArgumentNullException(nameof(identifier));
-        }
+        ArgumentNullException.ThrowIfNull(identifier);
 
-        if (asset == null)
-        {
-            throw new ArgumentNullException(nameof(asset));
-        }
+        ArgumentNullException.ThrowIfNull(asset);
 
         var endpointUrl = _urlBuilder.BuildAssetsUrl(identifier);
         var response = await _actionInvoker.InvokeMethodAsync<AssetUpsertModel, AssetModel>(endpointUrl, HttpMethod.Put, asset);
@@ -80,10 +71,7 @@ public async Task<AssetModel> UpsertAssetAsync(Reference identifier, AssetUpsert
     /// <inheritdoc />
     public async Task<AssetModel<T>> UpsertAssetAsync<T>(Reference identifier, AssetUpsertModel<T> asset) where T : new()
     {
-        if (asset == null)
-        {
-            throw new ArgumentNullException(nameof(asset));
-        }
+        ArgumentNullException.ThrowIfNull(asset);
 
         var result = await UpsertAssetAsync(identifier, _modelProvider.GetAssetUpsertModel(asset));
 
@@ -93,10 +81,7 @@ public async Task<AssetModel> UpsertAssetAsync(Reference identifier, AssetUpsert
     /// <inheritdoc />
     public async Task<AssetModel> CreateAssetAsync(AssetCreateModel asset)
     {
-        if (asset == null)
-        {
-            throw new ArgumentNullException(nameof(asset));
-        }
+        ArgumentNullException.ThrowIfNull(asset);
 
         var endpointUrl = _urlBuilder.BuildAssetsUrl();
         var response = await _actionInvoker.InvokeMethodAsync<AssetCreateModel, AssetModel>(endpointUrl, HttpMethod.Post, asset);
@@ -107,10 +92,7 @@ public async Task<AssetModel> CreateAssetAsync(AssetCreateModel asset)
     /// <inheritdoc />
     public async Task<AssetModel<T>> CreateAssetAsync<T>(AssetCreateModel<T> asset) where T : new()
     {
-        if (asset == null)
-        {
-            throw new ArgumentNullException(nameof(asset));
-        }
+        ArgumentNullException.ThrowIfNull(asset);
 
         var result = await CreateAssetAsync(_modelProvider.GetAssetCreateModel(asset));
 
@@ -120,10 +102,7 @@ public async Task<AssetModel> CreateAssetAsync(AssetCreateModel asset)
     /// <inheritdoc />
     public async Task DeleteAssetAsync(Reference identifier)
     {
-        if (identifier == null)
-        {
-            throw new ArgumentNullException(nameof(identifier));
-        }
+        ArgumentNullException.ThrowIfNull(identifier);
 
         var endpointUrl = _urlBuilder.BuildAssetsUrl(identifier);
         await _actionInvoker.InvokeMethodAsync(endpointUrl, HttpMethod.Delete);
@@ -132,10 +111,7 @@ public async Task DeleteAssetAsync(Reference identifier)
     /// <inheritdoc />
     public async Task<FileReference> UploadFileAsync(FileContentSource fileContent)
     {
-        if (fileContent == null)
-        {
-            throw new ArgumentNullException(nameof(fileContent));
-        }
+        ArgumentNullException.ThrowIfNull(fileContent);
 
         var stream = fileContent.OpenReadStream();
         try
diff --git a/Kontent.Ai.Management/ManagementClient.AssetFolder.cs b/Kontent.Ai.Management/ManagementClient.AssetFolder.cs
index 40d9b7c8..893eccb9 100644
--- a/Kontent.Ai.Management/ManagementClient.AssetFolder.cs
+++ b/Kontent.Ai.Management/ManagementClient.AssetFolder.cs
@@ -21,10 +21,7 @@ public async Task<AssetFoldersModel> GetAssetFoldersAsync()
     /// <inheritdoc />
     public async Task<AssetFoldersModel> CreateAssetFoldersAsync(AssetFolderCreateModel folder)
     {
-        if (folder == null)
-        {
-            throw new ArgumentNullException(nameof(folder));
-        }
+        ArgumentNullException.ThrowIfNull(folder);
 
         var endpointUrl = _urlBuilder.BuildAssetFoldersUrl();
         var response = await _actionInvoker.InvokeMethodAsync<AssetFolderCreateModel, AssetFoldersModel>(endpointUrl, HttpMethod.Post, folder);
@@ -35,10 +32,7 @@ public async Task<AssetFoldersModel> CreateAssetFoldersAsync(AssetFolderCreateMo
     /// <inheritdoc />
     public async Task<AssetFoldersModel> ModifyAssetFoldersAsync(IEnumerable<AssetFolderOperationBaseModel> changes)
     {
-        if (changes == null)
-        {
-            throw new ArgumentNullException(nameof(changes));
-        }
+        ArgumentNullException.ThrowIfNull(changes);
 
         var endpointUrl = _urlBuilder.BuildAssetFoldersUrl();
         var response = await _actionInvoker.InvokeMethodAsync<IEnumerable<AssetFolderOperationBaseModel>, AssetFoldersModel>(endpointUrl, new HttpMethod("PATCH"), changes);
diff --git a/Kontent.Ai.Management/ManagementClient.AssetRendition.cs b/Kontent.Ai.Management/ManagementClient.AssetRendition.cs
index 932147af..eea493a3 100644
--- a/Kontent.Ai.Management/ManagementClient.AssetRendition.cs
+++ b/Kontent.Ai.Management/ManagementClient.AssetRendition.cs
@@ -11,10 +11,7 @@ public partial class ManagementClient
     /// <inheritdoc />
     public async Task<IListingResponseModel<AssetRenditionModel>> ListAssetRenditionsAsync(Reference assetIdentifier)
     {
-        if (assetIdentifier == null)
-        {
-            throw new ArgumentNullException(nameof(assetIdentifier));
-        }
+        ArgumentNullException.ThrowIfNull(assetIdentifier);
 
         var endpointUrl = _urlBuilder.BuildAssetRenditionsUrl(assetIdentifier);
         var response = await _actionInvoker.InvokeReadOnlyMethodAsync<AssetRenditionsListingResponseServerModel>(endpointUrl, HttpMethod.Get);
@@ -29,10 +26,7 @@ public async Task<IListingResponseModel<AssetRenditionModel>> ListAssetRendition
     /// <inheritdoc />
     public async Task<AssetRenditionModel> GetAssetRenditionAsync(AssetRenditionIdentifier identifier)
     {
-        if (identifier == null)
-        {
-            throw new ArgumentNullException(nameof(identifier));
-        }
+        ArgumentNullException.ThrowIfNull(identifier);
 
         var endpointUrl = _urlBuilder.BuildAssetRenditionsUrl(identifier);
         return await _actionInvoker.InvokeReadOnlyMethodAsync<AssetRenditionModel>(endpointUrl, HttpMethod.Get);
@@ -41,14 +35,8 @@ public async Task<AssetRenditionModel> GetAssetRenditionAsync(AssetRenditionIden
     /// <inheritdoc />
     public async Task<AssetRenditionModel> UpdateAssetRenditionAsync(AssetRenditionIdentifier identifier, AssetRenditionUpdateModel updateModel)
     {
-        if (identifier == null)
-        {
-            throw new ArgumentNullException(nameof(identifier));
-        }
-        if (updateModel == null)
-        {
-            throw new ArgumentNullException(nameof(updateModel));
-        }
+        ArgumentNullException.ThrowIfNull(identifier);
+        ArgumentNullException.ThrowIfNull(updateModel);
 
         var endpointUrl = _urlBuilder.BuildAssetRenditionsUrl(identifier);
         return await _actionInvoker.InvokeMethodAsync<AssetRenditionUpdateModel, AssetRenditionModel>(endpointUrl, HttpMethod.Put, updateModel);
@@ -57,15 +45,9 @@ public async Task<AssetRenditionModel> UpdateAssetRenditionAsync(AssetRenditionI
     /// <inheritdoc />
     public async Task<AssetRenditionModel> CreateAssetRenditionAsync(Reference assetIdentifier, AssetRenditionCreateModel createModel)
     {
-        if (assetIdentifier == null)
-        {
-            throw new ArgumentNullException(nameof(assetIdentifier));
-        }
+        ArgumentNullException.ThrowIfNull(assetIdentifier);
 
-        if (createModel == null)
-        {
-            throw new ArgumentNullException(nameof(createModel));
-        }
+        ArgumentNullException.ThrowIfNull(createModel);
 
         var endpointUrl = _urlBuilder.BuildAssetRenditionsUrl(assetIdentifier);
         return await _actionInvoker.InvokeMethodAsync<AssetRenditionCreateModel, AssetRenditionModel>(endpointUrl, HttpMethod.Post, createModel);
diff --git a/Kontent.Ai.Management/ManagementClient.Collection.cs b/Kontent.Ai.Management/ManagementClient.Collection.cs
index fa93908c..c39a2c87 100644
--- a/Kontent.Ai.Management/ManagementClient.Collection.cs
+++ b/Kontent.Ai.Management/ManagementClient.Collection.cs
@@ -19,10 +19,7 @@ public async Task<CollectionsModel> ListCollectionsAsync()
     /// <inheritdoc />
     public async Task<CollectionsModel> ModifyCollectionAsync(IEnumerable<CollectionOperationBaseModel> changes)
     {
-        if (changes == null)
-        {
-            throw new ArgumentNullException(nameof(changes));
-        }
+        ArgumentNullException.ThrowIfNull(changes);
 
         var endpointUrl = _urlBuilder.BuildCollectionsUrl();
         return await _actionInvoker.InvokeMethodAsync<IEnumerable<CollectionOperationBaseModel>, CollectionsModel>(endpointUrl, new HttpMethod("PATCH"), changes);
diff --git a/Kontent.Ai.Management/ManagementClient.ContentItem.cs b/Kontent.Ai.Management/ManagementClient.ContentItem.cs
index 4866e431..185c1db5 100644
--- a/Kontent.Ai.Management/ManagementClient.ContentItem.cs
+++ b/Kontent.Ai.Management/ManagementClient.ContentItem.cs
@@ -15,7 +15,7 @@ public async Task<IListingResponseModel<ContentItemModel>> ListContentItemsAsync
         var response = await _actionInvoker.InvokeReadOnlyMethodAsync<ContentItemListingResponseServerModel>(endpointUrl, HttpMethod.Get);
 
         return new ListingResponseModel<ContentItemModel>(
-            (token, url) => GetNextListingPageAsync<ContentItemListingResponseServerModel, ContentItemModel>(token, url),
+            GetNextListingPageAsync<ContentItemListingResponseServerModel, ContentItemModel>,
             response.Pagination?.Token,
             endpointUrl,
             response.Items);
@@ -24,10 +24,7 @@ public async Task<IListingResponseModel<ContentItemModel>> ListContentItemsAsync
     /// <inheritdoc />
     public async Task<ContentItemModel> GetContentItemAsync(Reference identifier)
     {
-        if (identifier == null)
-        {
-            throw new ArgumentNullException(nameof(identifier));
-        }
+        ArgumentNullException.ThrowIfNull(identifier);
 
         var endpointUrl = _urlBuilder.BuildItemUrl(identifier);
         var response = await _actionInvoker.InvokeReadOnlyMethodAsync<ContentItemModel>(endpointUrl, HttpMethod.Get);
@@ -38,10 +35,7 @@ public async Task<ContentItemModel> GetContentItemAsync(Reference identifier)
     /// <inheritdoc />
     public async Task<ContentItemModel> CreateContentItemAsync(ContentItemCreateModel contentItem)
     {
-        if (contentItem == null)
-        {
-            throw new ArgumentNullException(nameof(contentItem));
-        }
+        ArgumentNullException.ThrowIfNull(contentItem);
 
         var endpointUrl = _urlBuilder.BuildItemsUrl();
         var response = await _actionInvoker.InvokeMethodAsync<ContentItemCreateModel, ContentItemModel>(endpointUrl, HttpMethod.Post, contentItem);
@@ -52,15 +46,9 @@ public async Task<ContentItemModel> CreateContentItemAsync(ContentItemCreateMode
     /// <inheritdoc />
     public async Task<ContentItemModel> UpsertContentItemAsync(Reference identifier, ContentItemUpsertModel contentItem)
     {
-        if (identifier == null)
-        {
-            throw new ArgumentNullException(nameof(identifier));
-        }
+        ArgumentNullException.ThrowIfNull(identifier);
 
-        if (contentItem == null)
-        {
-            throw new ArgumentNullException(nameof(contentItem));
-        }
+        ArgumentNullException.ThrowIfNull(contentItem);
 
         var endpointUrl = _urlBuilder.BuildItemUrl(identifier);
         var response = await _actionInvoker.InvokeMethodAsync<ContentItemUpsertModel, ContentItemModel>(endpointUrl, HttpMethod.Put, contentItem);
@@ -71,10 +59,7 @@ public async Task<ContentItemModel> UpsertContentItemAsync(Reference identifier,
     /// <inheritdoc />
     public async Task DeleteContentItemAsync(Reference identifier)
     {
-        if (identifier == null)
-        {
-            throw new ArgumentNullException(nameof(identifier));
-        }
+        ArgumentNullException.ThrowIfNull(identifier);
 
         var endpointUrl = _urlBuilder.BuildItemUrl(identifier);
 
diff --git a/Kontent.Ai.Management/ManagementClient.ContentType.cs b/Kontent.Ai.Management/ManagementClient.ContentType.cs
index 8e58ae4d..1ab629f4 100644
--- a/Kontent.Ai.Management/ManagementClient.ContentType.cs
+++ b/Kontent.Ai.Management/ManagementClient.ContentType.cs
@@ -18,7 +18,7 @@ public async Task<IListingResponseModel<ContentTypeModel>> ListContentTypesAsync
         var response = await _actionInvoker.InvokeReadOnlyMethodAsync<ContentTypeListingResponseServerModel>(endpointUrl, HttpMethod.Get);
 
         return new ListingResponseModel<ContentTypeModel>(
-            (token, url) => GetNextListingPageAsync<ContentTypeListingResponseServerModel, ContentTypeModel>(token, url),
+            GetNextListingPageAsync<ContentTypeListingResponseServerModel, ContentTypeModel>,
             response.Pagination?.Token,
             endpointUrl,
             response.Types);
@@ -27,10 +27,7 @@ public async Task<IListingResponseModel<ContentTypeModel>> ListContentTypesAsync
     /// <inheritdoc />
     public async Task<ContentTypeModel> GetContentTypeAsync(Reference identifier)
     {
-        if (identifier == null)
-        {
-            throw new ArgumentNullException(nameof(identifier));
-        }
+        ArgumentNullException.ThrowIfNull(identifier);
 
         var endpointUrl = _urlBuilder.BuildTypeUrl(identifier);
         var response = await _actionInvoker.InvokeReadOnlyMethodAsync<ContentTypeModel>(endpointUrl, HttpMethod.Get);
@@ -41,10 +38,7 @@ public async Task<ContentTypeModel> GetContentTypeAsync(Reference identifier)
     /// <inheritdoc />
     public async Task<ContentTypeModel> CreateContentTypeAsync(ContentTypeCreateModel contentType)
     {
-        if (contentType == null)
-        {
-            throw new ArgumentNullException(nameof(contentType));
-        }
+        ArgumentNullException.ThrowIfNull(contentType);
 
         var endpointUrl = _urlBuilder.BuildTypeUrl();
         var response = await _actionInvoker.InvokeMethodAsync<ContentTypeCreateModel, ContentTypeModel>(endpointUrl, HttpMethod.Post, contentType);
@@ -55,10 +49,7 @@ public async Task<ContentTypeModel> CreateContentTypeAsync(ContentTypeCreateMode
     /// <inheritdoc />
     public async Task DeleteContentTypeAsync(Reference identifier)
     {
-        if (identifier == null)
-        {
-            throw new ArgumentNullException(nameof(identifier));
-        }
+        ArgumentNullException.ThrowIfNull(identifier);
 
         var endpointUrl = _urlBuilder.BuildTypeUrl(identifier);
 
@@ -68,10 +59,7 @@ public async Task DeleteContentTypeAsync(Reference identifier)
     /// <inheritdoc />
     public async Task<ContentTypeModel> ModifyContentTypeAsync(Reference identifier, IEnumerable<ContentTypeOperationBaseModel> changes)
     {
-        if (identifier == null)
-        {
-            throw new ArgumentNullException(nameof(identifier));
-        }
+        ArgumentNullException.ThrowIfNull(identifier);
 
         if (changes == null || !changes.Any())
         {
diff --git a/Kontent.Ai.Management/ManagementClient.ContentTypeSnippet.cs b/Kontent.Ai.Management/ManagementClient.ContentTypeSnippet.cs
index 41e2b9c6..a7d7653e 100644
--- a/Kontent.Ai.Management/ManagementClient.ContentTypeSnippet.cs
+++ b/Kontent.Ai.Management/ManagementClient.ContentTypeSnippet.cs
@@ -18,7 +18,7 @@ public async Task<IListingResponseModel<ContentTypeSnippetModel>> ListContentTyp
         var response = await _actionInvoker.InvokeReadOnlyMethodAsync<SnippetListingResponseServerModel>(endpointUrl, HttpMethod.Get);
 
         return new ListingResponseModel<ContentTypeSnippetModel>(
-            (token, url) => GetNextListingPageAsync<SnippetListingResponseServerModel, ContentTypeSnippetModel>(token, url),
+            GetNextListingPageAsync<SnippetListingResponseServerModel, ContentTypeSnippetModel>,
             response.Pagination?.Token,
             endpointUrl,
             response.Snippets);
@@ -27,10 +27,7 @@ public async Task<IListingResponseModel<ContentTypeSnippetModel>> ListContentTyp
     /// <inheritdoc />
     public async Task<ContentTypeSnippetModel> GetContentTypeSnippetAsync(Reference identifier)
     {
-        if (identifier == null)
-        {
-            throw new ArgumentNullException(nameof(identifier));
-        }
+        ArgumentNullException.ThrowIfNull(identifier);
 
         var endpointUrl = _urlBuilder.BuildSnippetsUrl(identifier);
         var response = await _actionInvoker.InvokeReadOnlyMethodAsync<ContentTypeSnippetModel>(endpointUrl, HttpMethod.Get);
@@ -41,10 +38,7 @@ public async Task<ContentTypeSnippetModel> GetContentTypeSnippetAsync(Reference
     /// <inheritdoc />
     public async Task<ContentTypeSnippetModel> CreateContentTypeSnippetAsync(ContentTypeSnippetCreateModel contentTypeSnippet)
     {
-        if (contentTypeSnippet == null)
-        {
-            throw new ArgumentNullException(nameof(contentTypeSnippet));
-        }
+        ArgumentNullException.ThrowIfNull(contentTypeSnippet);
 
         var endpointUrl = _urlBuilder.BuildSnippetsUrl();
         var response = await _actionInvoker.InvokeMethodAsync<ContentTypeSnippetCreateModel, ContentTypeSnippetModel>(endpointUrl, HttpMethod.Post, contentTypeSnippet);
@@ -55,10 +49,7 @@ public async Task<ContentTypeSnippetModel> CreateContentTypeSnippetAsync(Content
     /// <inheritdoc />
     public async Task DeleteContentTypeSnippetAsync(Reference identifier)
     {
-        if (identifier == null)
-        {
-            throw new ArgumentNullException(nameof(identifier));
-        }
+        ArgumentNullException.ThrowIfNull(identifier);
 
         var endpointUrl = _urlBuilder.BuildSnippetsUrl(identifier);
 
@@ -68,10 +59,7 @@ public async Task DeleteContentTypeSnippetAsync(Reference identifier)
     /// <inheritdoc />
     public async Task<ContentTypeSnippetModel> ModifyContentTypeSnippetAsync(Reference identifier, IEnumerable<ContentTypeSnippetOperationBaseModel> changes)
     {
-        if (identifier == null)
-        {
-            throw new ArgumentNullException(nameof(identifier));
-        }
+        ArgumentNullException.ThrowIfNull(identifier);
 
         if (changes == null || !changes.Any())
         {
diff --git a/Kontent.Ai.Management/ManagementClient.Environment.cs b/Kontent.Ai.Management/ManagementClient.Environment.cs
index d91fcb88..6e75af55 100644
--- a/Kontent.Ai.Management/ManagementClient.Environment.cs
+++ b/Kontent.Ai.Management/ManagementClient.Environment.cs
@@ -12,10 +12,7 @@ public partial class ManagementClient
     /// <inheritdoc />
     public async Task<EnvironmentClonedModel> CloneEnvironmentAsync(EnvironmentCloneModel cloneEnvironmentModel)
     {
-        if (cloneEnvironmentModel == null)
-        {
-            throw new ArgumentNullException(nameof(cloneEnvironmentModel));
-        }
+        ArgumentNullException.ThrowIfNull(cloneEnvironmentModel);
 
         var endpointUrl = _urlBuilder.BuildCloneEnvironmentUrl();
         return await _actionInvoker.InvokeMethodAsync<EnvironmentCloneModel, EnvironmentClonedModel>(endpointUrl, HttpMethod.Post, cloneEnvironmentModel);
@@ -38,10 +35,7 @@ public async Task DeleteEnvironmentAsync()
     /// <inheritdoc />
     public async Task MarkEnvironmentAsProductionAsync(MarkAsProductionModel markAsProductionModel)
     {
-        if (markAsProductionModel == null)
-        {
-            throw new ArgumentNullException(nameof(markAsProductionModel));
-        }
+        ArgumentNullException.ThrowIfNull(markAsProductionModel);
 
         var endpointUrl = _urlBuilder.BuildMarkEnvironmentAsProductionUrl();
         await _actionInvoker.InvokeMethodAsync(endpointUrl, HttpMethod.Put, markAsProductionModel);
@@ -50,10 +44,7 @@ public async Task MarkEnvironmentAsProductionAsync(MarkAsProductionModel markAsP
     /// <inheritdoc />
     public async Task<EnvironmentModel> ModifyEnvironmentAsync(IEnumerable<EnvironmentOperationBaseModel> changes)
     {
-        if (changes == null)
-        {
-            throw new ArgumentNullException(nameof(changes));
-        }
+        ArgumentNullException.ThrowIfNull(changes);
 
         var endpointUrl = _urlBuilder.BuildEnvironmentUrl();
         return await _actionInvoker.InvokeMethodAsync<IEnumerable<EnvironmentOperationBaseModel>, EnvironmentModel>(endpointUrl, new HttpMethod("PATCH"), changes);
diff --git a/Kontent.Ai.Management/ManagementClient.Language.cs b/Kontent.Ai.Management/ManagementClient.Language.cs
index e55b1f6f..573b14be 100644
--- a/Kontent.Ai.Management/ManagementClient.Language.cs
+++ b/Kontent.Ai.Management/ManagementClient.Language.cs
@@ -16,7 +16,7 @@ public async Task<IListingResponseModel<LanguageModel>> ListLanguagesAsync()
         var response = await _actionInvoker.InvokeReadOnlyMethodAsync<LanguagesListingResponseServerModel>(endpointUrl, HttpMethod.Get);
 
         return new ListingResponseModel<LanguageModel>(
-            (token, url) => GetNextListingPageAsync<LanguagesListingResponseServerModel, LanguageModel>(token, url),
+            GetNextListingPageAsync<LanguagesListingResponseServerModel, LanguageModel>,
             response.Pagination?.Token,
             endpointUrl,
             response.Languages);
@@ -25,10 +25,7 @@ public async Task<IListingResponseModel<LanguageModel>> ListLanguagesAsync()
     /// <inheritdoc />
     public async Task<LanguageModel> GetLanguageAsync(Reference identifier)
     {
-        if (identifier == null)
-        {
-            throw new ArgumentNullException(nameof(identifier));
-        }
+        ArgumentNullException.ThrowIfNull(identifier);
 
         var endpointUrl = _urlBuilder.BuildLanguagesUrl(identifier);
         var response = await _actionInvoker.InvokeReadOnlyMethodAsync<LanguageModel>(endpointUrl, HttpMethod.Get);
@@ -39,10 +36,7 @@ public async Task<LanguageModel> GetLanguageAsync(Reference identifier)
     /// <inheritdoc />
     public async Task<LanguageModel> CreateLanguageAsync(LanguageCreateModel language)
     {
-        if (language == null)
-        {
-            throw new ArgumentNullException(nameof(language));
-        }
+        ArgumentNullException.ThrowIfNull(language);
 
         var endpointUrl = _urlBuilder.BuildLanguagesUrl();
         return await _actionInvoker.InvokeMethodAsync<LanguageCreateModel, LanguageModel>(endpointUrl, HttpMethod.Post, language);
@@ -51,10 +45,7 @@ public async Task<LanguageModel> CreateLanguageAsync(LanguageCreateModel languag
     /// <inheritdoc />
     public async Task<LanguageModel> ModifyLanguageAsync(Reference identifier, IEnumerable<LanguagePatchModel> changes)
     {
-        if (identifier == null)
-        {
-            throw new ArgumentNullException(nameof(identifier));
-        }
+        ArgumentNullException.ThrowIfNull(identifier);
 
         var endpointUrl = _urlBuilder.BuildLanguagesUrl(identifier);
         return await _actionInvoker.InvokeMethodAsync<IEnumerable<LanguagePatchModel>, LanguageModel>(endpointUrl, new HttpMethod("PATCH"), changes);
diff --git a/Kontent.Ai.Management/ManagementClient.LanguageVariant.cs b/Kontent.Ai.Management/ManagementClient.LanguageVariant.cs
index fb468839..cfc78e54 100644
--- a/Kontent.Ai.Management/ManagementClient.LanguageVariant.cs
+++ b/Kontent.Ai.Management/ManagementClient.LanguageVariant.cs
@@ -15,10 +15,7 @@ public partial class ManagementClient
     /// <inheritdoc />
     public async Task<IEnumerable<LanguageVariantModel>> ListLanguageVariantsByItemAsync(Reference identifier)
     {
-        if (identifier == null)
-        {
-            throw new ArgumentNullException(nameof(identifier));
-        }
+        ArgumentNullException.ThrowIfNull(identifier);
 
         var endpointUrl = _urlBuilder.BuildListVariantsByItemUrl(identifier);
         var response = await _actionInvoker.InvokeReadOnlyMethodAsync<IEnumerable<LanguageVariantModel>>(endpointUrl, HttpMethod.Get);
@@ -29,16 +26,13 @@ public async Task<IEnumerable<LanguageVariantModel>> ListLanguageVariantsByItemA
     /// <inheritdoc />
     public async Task<IListingResponseModel<LanguageVariantModel>> ListLanguageVariantsByTypeAsync(Reference identifier)
     {
-        if (identifier == null)
-        {
-            throw new ArgumentNullException(nameof(identifier));
-        }
+        ArgumentNullException.ThrowIfNull(identifier);
 
         var endpointUrl = _urlBuilder.BuildListVariantsByTypeUrl(identifier);
         var response = await _actionInvoker.InvokeReadOnlyMethodAsync<LanguageVariantsListingResponseServerModel>(endpointUrl, HttpMethod.Get);
 
         return new ListingResponseModel<LanguageVariantModel>(
-                (token, url) => GetNextListingPageAsync<LanguageVariantsListingResponseServerModel, LanguageVariantModel>(token, url),
+                GetNextListingPageAsync<LanguageVariantsListingResponseServerModel, LanguageVariantModel>,
                 response.Pagination?.Token,
                 endpointUrl,
                 response.Variants);
@@ -47,16 +41,13 @@ public async Task<IListingResponseModel<LanguageVariantModel>> ListLanguageVaria
     /// <inheritdoc />
     public async Task<IListingResponseModel<LanguageVariantModel<T>>> ListLanguageVariantsByTypeAsync<T>(Reference identifier) where T : new()
     {
-        if (identifier == null)
-        {
-            throw new ArgumentNullException(nameof(identifier));
-        }
+        ArgumentNullException.ThrowIfNull(identifier);
 
         var endpointUrl = _urlBuilder.BuildListVariantsByTypeUrl(identifier);
         var response = await _actionInvoker.InvokeReadOnlyMethodAsync<LanguageVariantsListingResponseServerModel>(endpointUrl, HttpMethod.Get);
 
         return new ListingResponseMappedModel<LanguageVariantModel, LanguageVariantModel<T>>(
-                (token, url) => GetNextListingPageAsync<LanguageVariantsListingResponseServerModel, LanguageVariantModel>(token, url),
+                GetNextListingPageAsync<LanguageVariantsListingResponseServerModel, LanguageVariantModel>,
                 response.Pagination?.Token,
                 endpointUrl,
                 response.Variants,
@@ -66,16 +57,13 @@ public async Task<IListingResponseModel<LanguageVariantModel>> ListLanguageVaria
     /// <inheritdoc />
     public async Task<IListingResponseModel<LanguageVariantModel>> ListLanguageVariantsOfContentTypeWithComponentsAsync(Reference identifier)
     {
-        if (identifier == null)
-        {
-            throw new ArgumentNullException(nameof(identifier));
-        }
+        ArgumentNullException.ThrowIfNull(identifier);
 
         var endpointUrl = _urlBuilder.BuildListVariantsByComponentUrl(identifier);
         var response = await _actionInvoker.InvokeReadOnlyMethodAsync<LanguageVariantsListingResponseServerModel>(endpointUrl, HttpMethod.Get);
 
         return new ListingResponseModel<LanguageVariantModel>(
-                (token, url) => GetNextListingPageAsync<LanguageVariantsListingResponseServerModel, LanguageVariantModel>(token, url),
+                GetNextListingPageAsync<LanguageVariantsListingResponseServerModel, LanguageVariantModel>,
                 response.Pagination?.Token,
                 endpointUrl,
                 response.Variants);
@@ -84,16 +72,13 @@ public async Task<IListingResponseModel<LanguageVariantModel>> ListLanguageVaria
     /// <inheritdoc />
     public async Task<IListingResponseModel<LanguageVariantModel>> ListLanguageVariantsByCollectionAsync(Reference identifier)
     {
-        if (identifier == null)
-        {
-            throw new ArgumentNullException(nameof(identifier));
-        }
+        ArgumentNullException.ThrowIfNull(identifier);
 
         var endpointUrl = _urlBuilder.BuildListVariantsByCollectionUrl(identifier);
         var response = await _actionInvoker.InvokeReadOnlyMethodAsync<LanguageVariantsListingResponseServerModel>(endpointUrl, HttpMethod.Get);
 
         return new ListingResponseModel<LanguageVariantModel>(
-                (token, url) => GetNextListingPageAsync<LanguageVariantsListingResponseServerModel, LanguageVariantModel>(token, url),
+                GetNextListingPageAsync<LanguageVariantsListingResponseServerModel, LanguageVariantModel>,
                 response.Pagination?.Token,
                 endpointUrl,
                 response.Variants);
@@ -108,7 +93,7 @@ public async Task<IListingResponseModel<LanguageVariantModel>> ListLanguageVaria
         var response = await _actionInvoker.InvokeReadOnlyMethodAsync<LanguageVariantsListingResponseServerModel>(endpointUrl, HttpMethod.Get);
 
         return new ListingResponseModel<LanguageVariantModel>(
-            (token, url) => GetNextListingPageAsync<LanguageVariantsListingResponseServerModel, LanguageVariantModel>(token, url),
+            GetNextListingPageAsync<LanguageVariantsListingResponseServerModel, LanguageVariantModel>,
             response.Pagination?.Token,
             endpointUrl,
             response.Variants);
@@ -117,24 +102,18 @@ public async Task<IListingResponseModel<LanguageVariantModel>> ListLanguageVaria
     /// <inheritdoc />
     public async Task<List<LanguageVariantModel<T>>> ListLanguageVariantsByItemAsync<T>(Reference identifier) where T : new()
     {
-        if (identifier == null)
-        {
-            throw new ArgumentNullException(nameof(identifier));
-        }
+        ArgumentNullException.ThrowIfNull(identifier);
 
         var endpointUrl = _urlBuilder.BuildListVariantsByItemUrl(identifier);
         var response = await _actionInvoker.InvokeReadOnlyMethodAsync<List<LanguageVariantModel>>(endpointUrl, HttpMethod.Get);
 
-        return response.Select(x => _modelProvider.GetLanguageVariantModel<T>(x)).ToList();
+        return response.Select(_modelProvider.GetLanguageVariantModel<T>).ToList();
     }
 
     /// <inheritdoc />
     public async Task<LanguageVariantModel> GetLanguageVariantAsync(LanguageVariantIdentifier identifier)
     {
-        if (identifier == null)
-        {
-            throw new ArgumentNullException(nameof(identifier));
-        }
+        ArgumentNullException.ThrowIfNull(identifier);
 
         var endpointUrl = _urlBuilder.BuildVariantsUrl(identifier);
         var response = await _actionInvoker.InvokeReadOnlyMethodAsync<LanguageVariantModel>(endpointUrl, HttpMethod.Get);
@@ -145,10 +124,7 @@ public async Task<LanguageVariantModel> GetLanguageVariantAsync(LanguageVariantI
     /// <inheritdoc />
     public async Task<LanguageVariantModel<T>> GetLanguageVariantAsync<T>(LanguageVariantIdentifier identifier) where T : new()
     {
-        if (identifier == null)
-        {
-            throw new ArgumentNullException(nameof(identifier));
-        }
+        ArgumentNullException.ThrowIfNull(identifier);
 
         var endpointUrl = _urlBuilder.BuildVariantsUrl(identifier);
         var response = await _actionInvoker.InvokeReadOnlyMethodAsync<LanguageVariantModel>(endpointUrl, HttpMethod.Get);
@@ -159,10 +135,7 @@ public async Task<LanguageVariantModel> GetLanguageVariantAsync(LanguageVariantI
     /// <inheritdoc />
     public async Task<LanguageVariantModel> GetPublishedLanguageVariantAsync(LanguageVariantIdentifier identifier)
     {
-        if (identifier == null)
-        {
-            throw new ArgumentNullException(nameof(identifier));
-        }
+        ArgumentNullException.ThrowIfNull(identifier);
 
         var endpointUrl = _urlBuilder.BuildPublishedVariantsUrl(identifier);
         var response = await _actionInvoker.InvokeReadOnlyMethodAsync<LanguageVariantModel>(endpointUrl, HttpMethod.Get);
@@ -173,10 +146,7 @@ public async Task<LanguageVariantModel> GetPublishedLanguageVariantAsync(Languag
     /// <inheritdoc />
     public async Task<LanguageVariantModel<T>> GetPublishedLanguageVariantAsync<T>(LanguageVariantIdentifier identifier) where T : new()
     {
-        if (identifier == null)
-        {
-            throw new ArgumentNullException(nameof(identifier));
-        }
+        ArgumentNullException.ThrowIfNull(identifier);
 
         var endpointUrl = _urlBuilder.BuildPublishedVariantsUrl(identifier);
         var response = await _actionInvoker.InvokeReadOnlyMethodAsync<LanguageVariantModel>(endpointUrl, HttpMethod.Get);
@@ -187,15 +157,9 @@ public async Task<LanguageVariantModel> GetPublishedLanguageVariantAsync(Languag
     /// <inheritdoc />
     public async Task<LanguageVariantModel> UpsertLanguageVariantAsync(LanguageVariantIdentifier identifier, LanguageVariantUpsertModel languageVariantUpsertModel)
     {
-        if (identifier == null)
-        {
-            throw new ArgumentNullException(nameof(identifier));
-        }
+        ArgumentNullException.ThrowIfNull(identifier);
 
-        if (languageVariantUpsertModel == null)
-        {
-            throw new ArgumentNullException(nameof(languageVariantUpsertModel));
-        }
+        ArgumentNullException.ThrowIfNull(languageVariantUpsertModel);
 
         var endpointUrl = _urlBuilder.BuildVariantsUrl(identifier);
         var response = await _actionInvoker.InvokeMethodAsync<LanguageVariantUpsertModel, LanguageVariantModel>(endpointUrl, HttpMethod.Put, languageVariantUpsertModel);
@@ -206,15 +170,9 @@ public async Task<LanguageVariantModel> UpsertLanguageVariantAsync(LanguageVaria
     /// <inheritdoc />
     public async Task<LanguageVariantModel> UpsertLanguageVariantAsync(LanguageVariantIdentifier identifier, LanguageVariantModel languageVariant)
     {
-        if (identifier == null)
-        {
-            throw new ArgumentNullException(nameof(identifier));
-        }
+        ArgumentNullException.ThrowIfNull(identifier);
 
-        if (languageVariant == null)
-        {
-            throw new ArgumentNullException(nameof(languageVariant));
-        }
+        ArgumentNullException.ThrowIfNull(languageVariant);
 
         var languageVariantUpsertModel = new LanguageVariantUpsertModel(languageVariant);
 
@@ -224,10 +182,7 @@ public async Task<LanguageVariantModel> UpsertLanguageVariantAsync(LanguageVaria
     /// <inheritdoc />
     public async Task<LanguageVariantModel<T>> UpsertLanguageVariantAsync<T>(LanguageVariantIdentifier identifier, T variantElements, WorkflowStepIdentifier workflow = null) where T : new()
     {
-        if (identifier == null)
-        {
-            throw new ArgumentNullException(nameof(identifier));
-        }
+        ArgumentNullException.ThrowIfNull(identifier);
 
         if (variantElements == null)
         {
@@ -244,10 +199,7 @@ public async Task<LanguageVariantModel> UpsertLanguageVariantAsync(LanguageVaria
     /// <inheritdoc />
     public async Task DeleteLanguageVariantAsync(LanguageVariantIdentifier identifier)
     {
-        if (identifier == null)
-        {
-            throw new ArgumentNullException(nameof(identifier));
-        }
+        ArgumentNullException.ThrowIfNull(identifier);
 
         var endpointUrl = _urlBuilder.BuildVariantsUrl(identifier);
         await _actionInvoker.InvokeMethodAsync(endpointUrl, HttpMethod.Delete);
diff --git a/Kontent.Ai.Management/ManagementClient.LegacyWebhook.cs b/Kontent.Ai.Management/ManagementClient.LegacyWebhook.cs
index 3aba1c4b..5c8c78a4 100644
--- a/Kontent.Ai.Management/ManagementClient.LegacyWebhook.cs
+++ b/Kontent.Ai.Management/ManagementClient.LegacyWebhook.cs
@@ -19,10 +19,7 @@ public async Task<IEnumerable<LegacyWebhookModel>> ListLegacyWebhooksAsync()
     /// <inheritdoc />
     public async Task<LegacyWebhookModel> GetLegacyWebhookAsync(Reference identifier)
     {
-        if (identifier == null)
-        {
-            throw new ArgumentNullException(nameof(identifier));
-        }
+        ArgumentNullException.ThrowIfNull(identifier);
 
         var endpointUrl = _urlBuilder.BuildLegacyWebhooksUrl(identifier);
         var response = await _actionInvoker.InvokeReadOnlyMethodAsync<LegacyWebhookModel>(endpointUrl, HttpMethod.Get);
@@ -33,10 +30,7 @@ public async Task<LegacyWebhookModel> GetLegacyWebhookAsync(Reference identifier
     /// <inheritdoc />
     public async Task<LegacyWebhookModel> CreateLegacyWebhookAsync(LegacyWebhookCreateModel webhook)
     {
-        if (webhook == null)
-        {
-            throw new ArgumentNullException(nameof(webhook));
-        }
+        ArgumentNullException.ThrowIfNull(webhook);
 
         var endpointUrl = _urlBuilder.BuildLegacyWebhooksUrl();
         return await _actionInvoker.InvokeMethodAsync<LegacyWebhookCreateModel, LegacyWebhookModel>(endpointUrl, HttpMethod.Post, webhook);
@@ -45,10 +39,7 @@ public async Task<LegacyWebhookModel> CreateLegacyWebhookAsync(LegacyWebhookCrea
     /// <inheritdoc />
     public async Task DeleteLegacyWebhookAsync(Reference identifier)
     {
-        if (identifier == null)
-        {
-            throw new ArgumentNullException(nameof(identifier));
-        }
+        ArgumentNullException.ThrowIfNull(identifier);
 
         var endpointUrl = _urlBuilder.BuildLegacyWebhooksUrl(identifier);
 
@@ -58,10 +49,7 @@ public async Task DeleteLegacyWebhookAsync(Reference identifier)
     /// <inheritdoc />
     public async Task EnableLegacyWebhookAsync(Reference identifier)
     {
-        if (identifier == null)
-        {
-            throw new ArgumentNullException(nameof(identifier));
-        }
+        ArgumentNullException.ThrowIfNull(identifier);
 
         var endpointUrl = _urlBuilder.BuildLegacyWebhooksEnableUrl(identifier);
 
@@ -71,10 +59,7 @@ public async Task EnableLegacyWebhookAsync(Reference identifier)
     /// <inheritdoc />
     public async Task DisableLegacyWebhookAsync(Reference identifier)
     {
-        if (identifier == null)
-        {
-            throw new ArgumentNullException(nameof(identifier));
-        }
+        ArgumentNullException.ThrowIfNull(identifier);
 
         var endpointUrl = _urlBuilder.BuildLegacyWebhooksDisableUrl(identifier);
 
diff --git a/Kontent.Ai.Management/ManagementClient.ProjectRole.cs b/Kontent.Ai.Management/ManagementClient.ProjectRole.cs
index 358abd2e..34140818 100644
--- a/Kontent.Ai.Management/ManagementClient.ProjectRole.cs
+++ b/Kontent.Ai.Management/ManagementClient.ProjectRole.cs
@@ -18,10 +18,7 @@ public async Task<EnvironmentRolesModel> ListEnvironmentRolesAsync()
     /// <inheritdoc />
     public async Task<EnvironmentRoleModel> GetEnvironmentRoleAsync(Reference identifier)
     {
-        if (identifier == null)
-        {
-            throw new ArgumentNullException(nameof(identifier));
-        }
+        ArgumentNullException.ThrowIfNull(identifier);
 
         var endpointUrl = _urlBuilder.BuildEnvironmentRoleUrl(identifier);
         return await _actionInvoker.InvokeReadOnlyMethodAsync<EnvironmentRoleModel>(endpointUrl, HttpMethod.Get);
diff --git a/Kontent.Ai.Management/ManagementClient.ProjectUser.cs b/Kontent.Ai.Management/ManagementClient.ProjectUser.cs
index 5fe104c0..ff3951ef 100644
--- a/Kontent.Ai.Management/ManagementClient.ProjectUser.cs
+++ b/Kontent.Ai.Management/ManagementClient.ProjectUser.cs
@@ -11,10 +11,7 @@ public partial class ManagementClient
     /// <inheritdoc />
     public async Task<UserModel> InviteUserIntoEnvironmentAsync(UserInviteModel invitation)
     {
-        if (invitation == null)
-        {
-            throw new ArgumentNullException(nameof(invitation));
-        }
+        ArgumentNullException.ThrowIfNull(invitation);
 
         var endpointUrl = _urlBuilder.BuildUsersUrl();
         return await _actionInvoker.InvokeMethodAsync<UserInviteModel, UserModel>(endpointUrl, HttpMethod.Post, invitation);
@@ -23,15 +20,9 @@ public async Task<UserModel> InviteUserIntoEnvironmentAsync(UserInviteModel invi
     /// <inheritdoc />
     public async Task<UserModel> ModifyUsersRolesAsync(UserIdentifier identifier, UserModel user)
     {
-        if (identifier == null)
-        {
-            throw new ArgumentNullException(nameof(identifier));
-        }
+        ArgumentNullException.ThrowIfNull(identifier);
 
-        if (user == null)
-        {
-            throw new ArgumentNullException(nameof(user));
-        }
+        ArgumentNullException.ThrowIfNull(user);
 
         var endpointUrl = _urlBuilder.BuildModifyUsersRoleUrl(identifier);
         return await _actionInvoker.InvokeMethodAsync<UserModel, UserModel>(endpointUrl, HttpMethod.Put, user);
diff --git a/Kontent.Ai.Management/ManagementClient.ProjectValidation.cs b/Kontent.Ai.Management/ManagementClient.ProjectValidation.cs
index 6ec1d087..cfd927a5 100644
--- a/Kontent.Ai.Management/ManagementClient.ProjectValidation.cs
+++ b/Kontent.Ai.Management/ManagementClient.ProjectValidation.cs
@@ -38,7 +38,7 @@ public async Task<IListingResponseModel<AsyncValidationTaskIssueModel>> ListAsyn
         var response = await _actionInvoker.InvokeReadOnlyMethodAsync<AsyncValidationTaskIssuesResponseServerModel>(endpointUrl, HttpMethod.Get);
 
         return new ListingResponseModel<AsyncValidationTaskIssueModel>(
-                (token, url) => GetNextListingPageAsync<AsyncValidationTaskIssuesResponseServerModel, AsyncValidationTaskIssueModel>(token, url),
+                GetNextListingPageAsync<AsyncValidationTaskIssuesResponseServerModel, AsyncValidationTaskIssueModel>,
                 response.Pagination?.Token,
                 endpointUrl,
                 response.Issues);
diff --git a/Kontent.Ai.Management/ManagementClient.Publishing.cs b/Kontent.Ai.Management/ManagementClient.Publishing.cs
index 6f3afe3e..c97590dc 100644
--- a/Kontent.Ai.Management/ManagementClient.Publishing.cs
+++ b/Kontent.Ai.Management/ManagementClient.Publishing.cs
@@ -15,15 +15,9 @@ public sealed partial class ManagementClient
     /// <inheritdoc />
     public async Task ChangeLanguageVariantWorkflowAsync(LanguageVariantIdentifier identifier, WorkflowStepIdentifier workflowStepIdentifier)
     {
-        if (identifier == null)
-        {
-            throw new ArgumentNullException(nameof(identifier));
-        }
+        ArgumentNullException.ThrowIfNull(identifier);
 
-        if (workflowStepIdentifier == null)
-        {
-            throw new ArgumentNullException(nameof(workflowStepIdentifier));
-        }
+        ArgumentNullException.ThrowIfNull(workflowStepIdentifier);
 
         var endpointUrl = _urlBuilder.BuildWorkflowChangeUrl(identifier);
 
@@ -33,10 +27,7 @@ public async Task ChangeLanguageVariantWorkflowAsync(LanguageVariantIdentifier i
     /// <inheritdoc />
     public async Task PublishLanguageVariantAsync(LanguageVariantIdentifier identifier)
     {
-        if (identifier == null)
-        {
-            throw new ArgumentNullException(nameof(identifier));
-        }
+        ArgumentNullException.ThrowIfNull(identifier);
 
         var endpointUrl = _urlBuilder.BuildPublishVariantUrl(identifier);
 
@@ -46,15 +37,9 @@ public async Task PublishLanguageVariantAsync(LanguageVariantIdentifier identifi
     /// <inheritdoc />
     public async Task SchedulePublishingOfLanguageVariantAsync(LanguageVariantIdentifier identifier, ScheduleModel scheduleModel)
     {
-        if (identifier == null)
-        {
-            throw new ArgumentNullException(nameof(identifier));
-        }
+        ArgumentNullException.ThrowIfNull(identifier);
 
-        if (scheduleModel == null)
-        {
-            throw new ArgumentNullException(nameof(scheduleModel));
-        }
+        ArgumentNullException.ThrowIfNull(scheduleModel);
 
         var endpointUrl = _urlBuilder.BuildPublishVariantUrl(identifier);
 
@@ -64,10 +49,7 @@ public async Task SchedulePublishingOfLanguageVariantAsync(LanguageVariantIdenti
     /// <inheritdoc />
     public async Task CancelPublishingOfLanguageVariantAsync(LanguageVariantIdentifier identifier)
     {
-        if (identifier == null)
-        {
-            throw new ArgumentNullException(nameof(identifier));
-        }
+        ArgumentNullException.ThrowIfNull(identifier);
 
         var endpointUrl = _urlBuilder.BuildCancelPublishingVariantUrl(identifier);
 
@@ -77,10 +59,7 @@ public async Task CancelPublishingOfLanguageVariantAsync(LanguageVariantIdentifi
     /// <inheritdoc />
     public async Task UnpublishLanguageVariantAsync(LanguageVariantIdentifier identifier)
     {
-        if (identifier == null)
-        {
-            throw new ArgumentNullException(nameof(identifier));
-        }
+        ArgumentNullException.ThrowIfNull(identifier);
 
         var endpointUrl = _urlBuilder.BuildUnpublishVariantUrl(identifier);
 
@@ -90,10 +69,7 @@ public async Task UnpublishLanguageVariantAsync(LanguageVariantIdentifier identi
     /// <inheritdoc />
     public async Task CancelUnpublishingOfLanguageVariantAsync(LanguageVariantIdentifier identifier)
     {
-        if (identifier == null)
-        {
-            throw new ArgumentNullException(nameof(identifier));
-        }
+        ArgumentNullException.ThrowIfNull(identifier);
 
         var endpointUrl = _urlBuilder.BuildCancelUnpublishingVariantUrl(identifier);
 
@@ -103,15 +79,9 @@ public async Task CancelUnpublishingOfLanguageVariantAsync(LanguageVariantIdenti
     /// <inheritdoc />
     public async Task ScheduleUnpublishingOfLanguageVariantAsync(LanguageVariantIdentifier identifier, ScheduleModel scheduleModel)
     {
-        if (identifier == null)
-        {
-            throw new ArgumentNullException(nameof(identifier));
-        }
+        ArgumentNullException.ThrowIfNull(identifier);
 
-        if (scheduleModel == null)
-        {
-            throw new ArgumentNullException(nameof(scheduleModel));
-        }
+        ArgumentNullException.ThrowIfNull(scheduleModel);
 
         var endpointUrl = _urlBuilder.BuildUnpublishVariantUrl(identifier);
 
@@ -121,10 +91,7 @@ public async Task ScheduleUnpublishingOfLanguageVariantAsync(LanguageVariantIden
     /// <inheritdoc />
     public async Task CreateNewVersionOfLanguageVariantAsync(LanguageVariantIdentifier identifier)
     {
-        if (identifier == null)
-        {
-            throw new ArgumentNullException(nameof(identifier));
-        }
+        ArgumentNullException.ThrowIfNull(identifier);
 
         var endpointUrl = _urlBuilder.BuildNewVersionVariantUrl(identifier);
 
diff --git a/Kontent.Ai.Management/ManagementClient.Subscription.cs b/Kontent.Ai.Management/ManagementClient.Subscription.cs
index e9746a06..0a75a920 100644
--- a/Kontent.Ai.Management/ManagementClient.Subscription.cs
+++ b/Kontent.Ai.Management/ManagementClient.Subscription.cs
@@ -15,7 +15,7 @@ public async Task<IListingResponseModel<SubscriptionProjectModel>> ListSubscript
         var response = await _actionInvoker.InvokeReadOnlyMethodAsync<SubscriptionProjectListingResponseServerModel>(endpointUrl, HttpMethod.Get);
 
         return new ListingResponseModel<SubscriptionProjectModel>(
-            (token, url) => GetNextListingPageAsync<SubscriptionProjectListingResponseServerModel, SubscriptionProjectModel>(token, url),
+            GetNextListingPageAsync<SubscriptionProjectListingResponseServerModel, SubscriptionProjectModel>,
             response.Pagination?.Token,
             endpointUrl,
             response.Projects);
@@ -28,7 +28,7 @@ public async Task<IListingResponseModel<SubscriptionUserModel>> ListSubscription
         var response = await _actionInvoker.InvokeReadOnlyMethodAsync<SubscriptionUserListingResponseServerModel>(endpointUrl, HttpMethod.Get);
 
         return new ListingResponseModel<SubscriptionUserModel>(
-            (token, url) => GetNextListingPageAsync<SubscriptionUserListingResponseServerModel, SubscriptionUserModel>(token, url),
+            GetNextListingPageAsync<SubscriptionUserListingResponseServerModel, SubscriptionUserModel>,
             response.Pagination?.Token,
             endpointUrl,
             response.Users);
@@ -37,10 +37,7 @@ public async Task<IListingResponseModel<SubscriptionUserModel>> ListSubscription
     /// <inheritdoc />
     public async Task<SubscriptionUserModel> GetSubscriptionUserAsync(UserIdentifier identifier)
     {
-        if (identifier == null)
-        {
-            throw new ArgumentNullException(nameof(identifier));
-        }
+        ArgumentNullException.ThrowIfNull(identifier);
 
         var endpointUrl = _urlBuilder.BuildSubscriptionUserUrl(identifier);
 
@@ -50,10 +47,7 @@ public async Task<SubscriptionUserModel> GetSubscriptionUserAsync(UserIdentifier
     /// <inheritdoc />
     public async Task ActivateSubscriptionUserAsync(UserIdentifier identifier)
     {
-        if (identifier == null)
-        {
-            throw new ArgumentNullException(nameof(identifier));
-        }
+        ArgumentNullException.ThrowIfNull(identifier);
 
         var endpointUrl = _urlBuilder.BuildSubscriptionUserActivateUrl(identifier);
 
@@ -63,10 +57,7 @@ public async Task ActivateSubscriptionUserAsync(UserIdentifier identifier)
     /// <inheritdoc />
     public async Task DeactivateSubscriptionUserAsync(UserIdentifier identifier)
     {
-        if (identifier == null)
-        {
-            throw new ArgumentNullException(nameof(identifier));
-        }
+        ArgumentNullException.ThrowIfNull(identifier);
 
         var endpointUrl = _urlBuilder.BuildSubscriptionUserDeactivateDisableUrl(identifier);
 
diff --git a/Kontent.Ai.Management/ManagementClient.TaxonomyGroup.cs b/Kontent.Ai.Management/ManagementClient.TaxonomyGroup.cs
index a3c7530b..6c3f4ba3 100644
--- a/Kontent.Ai.Management/ManagementClient.TaxonomyGroup.cs
+++ b/Kontent.Ai.Management/ManagementClient.TaxonomyGroup.cs
@@ -16,7 +16,7 @@ public async Task<IListingResponseModel<TaxonomyGroupModel>> ListTaxonomyGroupsA
         var response = await _actionInvoker.InvokeReadOnlyMethodAsync<TaxonomyGroupListingResponseServerModel>(endpointUrl, HttpMethod.Get);
 
         return new ListingResponseModel<TaxonomyGroupModel>(
-            (token, url) => GetNextListingPageAsync<TaxonomyGroupListingResponseServerModel, TaxonomyGroupModel>(token, url),
+            GetNextListingPageAsync<TaxonomyGroupListingResponseServerModel, TaxonomyGroupModel>,
             response.Pagination?.Token,
             endpointUrl,
             response.Taxonomies);
@@ -25,10 +25,7 @@ public async Task<IListingResponseModel<TaxonomyGroupModel>> ListTaxonomyGroupsA
     /// <inheritdoc />
     public async Task<TaxonomyGroupModel> GetTaxonomyGroupAsync(Reference identifier)
     {
-        if (identifier == null)
-        {
-            throw new ArgumentNullException(nameof(identifier));
-        }
+        ArgumentNullException.ThrowIfNull(identifier);
 
         var endpointUrl = _urlBuilder.BuildTaxonomyUrl(identifier);
         var response = await _actionInvoker.InvokeReadOnlyMethodAsync<TaxonomyGroupModel>(endpointUrl, HttpMethod.Get);
@@ -39,10 +36,7 @@ public async Task<TaxonomyGroupModel> GetTaxonomyGroupAsync(Reference identifier
     /// <inheritdoc />
     public async Task<TaxonomyGroupModel> CreateTaxonomyGroupAsync(TaxonomyGroupCreateModel taxonomyGroup)
     {
-        if (taxonomyGroup == null)
-        {
-            throw new ArgumentNullException(nameof(taxonomyGroup));
-        }
+        ArgumentNullException.ThrowIfNull(taxonomyGroup);
 
         var endpointUrl = _urlBuilder.BuildTaxonomyUrl();
         return await _actionInvoker.InvokeMethodAsync<TaxonomyGroupCreateModel, TaxonomyGroupModel>(endpointUrl, HttpMethod.Post, taxonomyGroup);
@@ -51,10 +45,7 @@ public async Task<TaxonomyGroupModel> CreateTaxonomyGroupAsync(TaxonomyGroupCrea
     /// <inheritdoc />
     public async Task<TaxonomyGroupModel> ModifyTaxonomyGroupAsync(Reference identifier, IEnumerable<TaxonomyGroupOperationBaseModel> changes)
     {
-        if (identifier == null)
-        {
-            throw new ArgumentNullException(nameof(identifier));
-        }
+        ArgumentNullException.ThrowIfNull(identifier);
 
         var endpointUrl = _urlBuilder.BuildTaxonomyUrl(identifier);
         return await _actionInvoker.InvokeMethodAsync<IEnumerable<TaxonomyGroupOperationBaseModel>, TaxonomyGroupModel>(endpointUrl, new HttpMethod("PATCH"), changes);
@@ -63,10 +54,7 @@ public async Task<TaxonomyGroupModel> ModifyTaxonomyGroupAsync(Reference identif
     /// <inheritdoc />
     public async Task DeleteTaxonomyGroupAsync(Reference identifier)
     {
-        if (identifier == null)
-        {
-            throw new ArgumentNullException(nameof(identifier));
-        }
+        ArgumentNullException.ThrowIfNull(identifier);
 
         var endpointUrl = _urlBuilder.BuildTaxonomyUrl(identifier);
 
diff --git a/Kontent.Ai.Management/ManagementClient.Webhook.cs b/Kontent.Ai.Management/ManagementClient.Webhook.cs
index 1fa25688..18cd1a14 100644
--- a/Kontent.Ai.Management/ManagementClient.Webhook.cs
+++ b/Kontent.Ai.Management/ManagementClient.Webhook.cs
@@ -19,10 +19,7 @@ public async Task<IEnumerable<WebhookModel>> ListWebhooksAsync()
     /// <inheritdoc />
     public async Task<WebhookModel> GetWebhookAsync(Reference identifier)
     {
-        if (identifier == null)
-        {
-            throw new ArgumentNullException(nameof(identifier));
-        }
+        ArgumentNullException.ThrowIfNull(identifier);
 
         var endpointUrl = _urlBuilder.BuildWebhooksUrl(identifier);
         return await _actionInvoker.InvokeReadOnlyMethodAsync<WebhookModel>(endpointUrl, HttpMethod.Get);
@@ -31,10 +28,7 @@ public async Task<WebhookModel> GetWebhookAsync(Reference identifier)
     /// <inheritdoc />
     public async Task<WebhookModel> CreateWebhookAsync(WebhookCreateModel webhook)
     {
-        if (webhook == null)
-        {
-            throw new ArgumentNullException(nameof(webhook));
-        }
+        ArgumentNullException.ThrowIfNull(webhook);
 
         var endpointUrl = _urlBuilder.BuildWebhooksUrl();
         return await _actionInvoker.InvokeMethodAsync<WebhookCreateModel, WebhookModel>(endpointUrl, HttpMethod.Post, webhook);
@@ -43,10 +37,7 @@ public async Task<WebhookModel> CreateWebhookAsync(WebhookCreateModel webhook)
     /// <inheritdoc />
     public async Task DeleteWebhookAsync(Reference identifier)
     {
-        if (identifier == null)
-        {
-            throw new ArgumentNullException(nameof(identifier));
-        }
+        ArgumentNullException.ThrowIfNull(identifier);
 
         var endpointUrl = _urlBuilder.BuildWebhooksUrl(identifier);
         await _actionInvoker.InvokeMethodAsync(endpointUrl, HttpMethod.Delete);
@@ -55,10 +46,7 @@ public async Task DeleteWebhookAsync(Reference identifier)
     /// <inheritdoc />
     public async Task EnableWebhookAsync(Reference identifier)
     {
-        if (identifier == null)
-        {
-            throw new ArgumentNullException(nameof(identifier));
-        }
+        ArgumentNullException.ThrowIfNull(identifier);
 
         var endpointUrl = _urlBuilder.BuildWebhooksEnableUrl(identifier);
         await _actionInvoker.InvokeMethodAsync(endpointUrl, HttpMethod.Put);
@@ -67,10 +55,7 @@ public async Task EnableWebhookAsync(Reference identifier)
     /// <inheritdoc />
     public async Task DisableWebhookAsync(Reference identifier)
     {
-        if (identifier == null)
-        {
-            throw new ArgumentNullException(nameof(identifier));
-        }
+        ArgumentNullException.ThrowIfNull(identifier);
 
         var endpointUrl = _urlBuilder.BuildWebhooksDisableUrl(identifier);
         await _actionInvoker.InvokeMethodAsync(endpointUrl, HttpMethod.Put);
diff --git a/Kontent.Ai.Management/ManagementClient.Workflow.cs b/Kontent.Ai.Management/ManagementClient.Workflow.cs
index 901cb872..852f81c1 100644
--- a/Kontent.Ai.Management/ManagementClient.Workflow.cs
+++ b/Kontent.Ai.Management/ManagementClient.Workflow.cs
@@ -22,10 +22,7 @@ public async Task<IEnumerable<WorkflowModel>> ListWorkflowsAsync()
     /// <inheritdoc />
     public async Task<WorkflowModel> CreateWorkflowAsync(WorkflowUpsertModel workflow)
     {
-        if (workflow == null)
-        {
-            throw new ArgumentNullException(nameof(workflow));
-        }
+        ArgumentNullException.ThrowIfNull(workflow);
 
         var endpointUrl = _urlBuilder.BuildWorkflowsUrl();
         return await _actionInvoker.InvokeMethodAsync<WorkflowUpsertModel, WorkflowModel>(endpointUrl, HttpMethod.Post, workflow);
@@ -34,15 +31,9 @@ public async Task<WorkflowModel> CreateWorkflowAsync(WorkflowUpsertModel workflo
     /// <inheritdoc />
     public async Task<WorkflowModel> UpdateWorkflowAsync(Reference identifier, WorkflowUpsertModel workflow)
     {
-        if (identifier == null)
-        {
-            throw new ArgumentNullException(nameof(identifier));
-        }
+        ArgumentNullException.ThrowIfNull(identifier);
 
-        if (workflow == null)
-        {
-            throw new ArgumentNullException(nameof(workflow));
-        }
+        ArgumentNullException.ThrowIfNull(workflow);
 
         var endpointUrl = _urlBuilder.BuildWorkflowsUrl(identifier);
         return await _actionInvoker.InvokeMethodAsync<WorkflowUpsertModel, WorkflowModel>(endpointUrl, HttpMethod.Put, workflow);
@@ -51,10 +42,7 @@ public async Task<WorkflowModel> UpdateWorkflowAsync(Reference identifier, Workf
     /// <inheritdoc />
     public async Task DeleteWorkflowAsync(Reference identifier)
     {
-        if (identifier == null)
-        {
-            throw new ArgumentNullException(nameof(identifier));
-        }
+        ArgumentNullException.ThrowIfNull(identifier);
 
         var endpointUrl = _urlBuilder.BuildWorkflowsUrl(identifier);
         await _actionInvoker.InvokeMethodAsync(endpointUrl, HttpMethod.Delete);
diff --git a/Kontent.Ai.Management/ManagementClient.cs b/Kontent.Ai.Management/ManagementClient.cs
index b72abd25..a7b1e479 100644
--- a/Kontent.Ai.Management/ManagementClient.cs
+++ b/Kontent.Ai.Management/ManagementClient.cs
@@ -29,10 +29,7 @@ public sealed partial class ManagementClient : IManagementClient
     /// <param name="ManagementOptions">The settings of the Kontent.ai environment.</param>
     public ManagementClient(ManagementOptions ManagementOptions)
     {
-        if (ManagementOptions == null)
-        {
-            throw new ArgumentNullException(nameof(ManagementOptions));
-        }
+        ArgumentNullException.ThrowIfNull(ManagementOptions);
 
         if (string.IsNullOrEmpty(ManagementOptions.EnvironmentId))
         {
diff --git a/Kontent.Ai.Management/Modules/ActionInvoker/ActionInvoker.cs b/Kontent.Ai.Management/Modules/ActionInvoker/ActionInvoker.cs
index d4bdc2c5..787b49bc 100644
--- a/Kontent.Ai.Management/Modules/ActionInvoker/ActionInvoker.cs
+++ b/Kontent.Ai.Management/Modules/ActionInvoker/ActionInvoker.cs
@@ -81,10 +81,7 @@ public async Task InvokeMethodAsync<TPayload>(string endpointUrl, HttpMethod met
 
     public async Task<TResponse> UploadFileAsync<TResponse>(string endpointUrl, Stream stream, string contentType)
     {
-        if (stream == null)
-        {
-            throw new ArgumentNullException(nameof(stream));
-        }
+        ArgumentNullException.ThrowIfNull(stream);
 
         var content = new StreamContent(stream);
 
diff --git a/Kontent.Ai.Management/Modules/ActionInvoker/DynamicObjectJsonConverter.cs b/Kontent.Ai.Management/Modules/ActionInvoker/DynamicObjectJsonConverter.cs
index 727bd992..2ab49738 100644
--- a/Kontent.Ai.Management/Modules/ActionInvoker/DynamicObjectJsonConverter.cs
+++ b/Kontent.Ai.Management/Modules/ActionInvoker/DynamicObjectJsonConverter.cs
@@ -21,7 +21,7 @@ private static dynamic ConvertToDynamicObject(JObject obj)
         {
             if (property.Value is JArray array)
             {
-                resultAsDictionary.Add(property.Name, array.Select(arrayObject => ConvertJComplexObject(arrayObject)));
+                resultAsDictionary.Add(property.Name, array.Select(ConvertJComplexObject));
                 continue;
             }
 
@@ -48,7 +48,7 @@ private static dynamic ConvertToDynamicObject(JObject obj)
     private static object ConvertJComplexObject(object input) => input switch
     {
         JObject obj => ConvertToDynamicObject(obj),
-        JArray array => array.Select(obj => ConvertJComplexObject(obj)),
+        JArray array => array.Select(ConvertJComplexObject),
         _ => throw new ArgumentOutOfRangeException(nameof(input), "JSON deserialization did not return either object nor array."),
     };