diff --git a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/Monta/VerifyClient/WCEM/src/Monta.ApiClient.Generated/Contracts/ChargeAuthTokens/PatchChargeAuthToken.verified.cs b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/Monta/VerifyClient/WCEM/src/Monta.ApiClient.Generated/Contracts/ChargeAuthTokens/PatchChargeAuthToken.verified.cs
index 5f0b9f42..7a08a127 100644
--- a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/Monta/VerifyClient/WCEM/src/Monta.ApiClient.Generated/Contracts/ChargeAuthTokens/PatchChargeAuthToken.verified.cs
+++ b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/Monta/VerifyClient/WCEM/src/Monta.ApiClient.Generated/Contracts/ChargeAuthTokens/PatchChargeAuthToken.verified.cs
@@ -15,13 +15,13 @@ public class PatchChargeAuthToken
     /// <summary>
     /// Id of the team the charge auth token belongs to.
     /// </summary>
-    [Range(0, 2147483647)]
+    [Range(0, int.MaxValue)]
     public long? TeamId { get; set; }
 
     /// <summary>
     /// Id of the user the charge auth token should be associated to.
     /// </summary>
-    [Range(0, 2147483647)]
+    [Range(0, int.MaxValue)]
     public long? UserId { get; set; }
 
     /// <summary>
diff --git a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/Monta/VerifyClient/WCEM/src/Monta.ApiClient.Generated/Contracts/ChargePointIntegrations/CreateOrUpdateChargePointIntegration.verified.cs b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/Monta/VerifyClient/WCEM/src/Monta.ApiClient.Generated/Contracts/ChargePointIntegrations/CreateOrUpdateChargePointIntegration.verified.cs
index b2634d70..02ffd281 100644
--- a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/Monta/VerifyClient/WCEM/src/Monta.ApiClient.Generated/Contracts/ChargePointIntegrations/CreateOrUpdateChargePointIntegration.verified.cs
+++ b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/Monta/VerifyClient/WCEM/src/Monta.ApiClient.Generated/Contracts/ChargePointIntegrations/CreateOrUpdateChargePointIntegration.verified.cs
@@ -16,14 +16,14 @@ public class CreateOrUpdateChargePointIntegration
     /// Id of the charge point to setup the integration.
     /// </summary>
     [Required]
-    [Range(0, 2147483647)]
+    [Range(0, int.MaxValue)]
     public long ChargePointId { get; set; }
 
     /// <summary>
     /// Id of the charge point model to be integrated.
     /// </summary>
     [Required]
-    [Range(0, 2147483647)]
+    [Range(0, int.MaxValue)]
     public long ChargePointModelId { get; set; }
 
     /// <summary>
@@ -36,7 +36,7 @@ public class CreateOrUpdateChargePointIntegration
     /// <summary>
     /// Connector id for the charge point integration. when `null` the `connectorId` will default to `1`.
     /// </summary>
-    [Range(0, 2147483647)]
+    [Range(0, int.MaxValue)]
     public int? ConnectorId { get; set; }
 
     /// <summary>
diff --git a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/Monta/VerifyClient/WCEM/src/Monta.ApiClient.Generated/Contracts/ChargePoints/CreateChargePoint.verified.cs b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/Monta/VerifyClient/WCEM/src/Monta.ApiClient.Generated/Contracts/ChargePoints/CreateChargePoint.verified.cs
index 66dc8884..c93eeb9c 100644
--- a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/Monta/VerifyClient/WCEM/src/Monta.ApiClient.Generated/Contracts/ChargePoints/CreateChargePoint.verified.cs
+++ b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/Monta/VerifyClient/WCEM/src/Monta.ApiClient.Generated/Contracts/ChargePoints/CreateChargePoint.verified.cs
@@ -16,21 +16,21 @@ public class CreateChargePoint
     /// Id of the team that the charge point belongs to.
     /// </summary>
     [Required]
-    [Range(0, 2147483647)]
+    [Range(0, int.MaxValue)]
     public long TeamId { get; set; }
 
     /// <summary>
     /// Id of the site the charge point belongs to.
     /// </summary>
     [Required]
-    [Range(0, 2147483647)]
+    [Range(0, int.MaxValue)]
     public long SiteId { get; set; }
 
     /// <summary>
     /// Id of the charge point model.
     /// </summary>
     [Required]
-    [Range(0, 2147483647)]
+    [Range(0, int.MaxValue)]
     public long ChargePointModelId { get; set; }
 
     /// <summary>
diff --git a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/Monta/VerifyClient/WCEM/src/Monta.ApiClient.Generated/Contracts/ChargePoints/PatchChargePoint.verified.cs b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/Monta/VerifyClient/WCEM/src/Monta.ApiClient.Generated/Contracts/ChargePoints/PatchChargePoint.verified.cs
index eacddb1c..aff50a69 100644
--- a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/Monta/VerifyClient/WCEM/src/Monta.ApiClient.Generated/Contracts/ChargePoints/PatchChargePoint.verified.cs
+++ b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/Monta/VerifyClient/WCEM/src/Monta.ApiClient.Generated/Contracts/ChargePoints/PatchChargePoint.verified.cs
@@ -16,7 +16,7 @@ public class PatchChargePoint
     /// Id of the site the charge point belongs to.
     /// </summary>
     [Required]
-    [Range(0, 2147483647)]
+    [Range(0, int.MaxValue)]
     public long? SiteId { get; set; }
 
     /// <summary>
diff --git a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/Monta/VerifyClient/WCEM/src/Monta.ApiClient.Generated/Contracts/Charges/StartChargeRequest.verified.cs b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/Monta/VerifyClient/WCEM/src/Monta.ApiClient.Generated/Contracts/Charges/StartChargeRequest.verified.cs
index 4aace180..40b32104 100644
--- a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/Monta/VerifyClient/WCEM/src/Monta.ApiClient.Generated/Contracts/Charges/StartChargeRequest.verified.cs
+++ b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/Monta/VerifyClient/WCEM/src/Monta.ApiClient.Generated/Contracts/Charges/StartChargeRequest.verified.cs
@@ -43,7 +43,7 @@ public class StartChargeRequest
     /// <summary>
     /// Allows you to enforce a specific price group for this charge. &lt;br /&gt;*Note*: The price group must be of type `team` or `charge-point`.
     /// </summary>
-    [Range(0, 2147483647)]
+    [Range(0, int.MaxValue)]
     public long? PriceGroupId { get; set; }
 
     public GenericPaymentSession? GenericPaymentSession { get; set; }
diff --git a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/Monta/VerifyClient/WCEM/src/Monta.ApiClient.Generated/Contracts/Currencies/CurrencyDto3.verified.cs b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/Monta/VerifyClient/WCEM/src/Monta.ApiClient.Generated/Contracts/Currencies/CurrencyDto3.verified.cs
index 5cedee68..f0572d35 100644
--- a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/Monta/VerifyClient/WCEM/src/Monta.ApiClient.Generated/Contracts/Currencies/CurrencyDto3.verified.cs
+++ b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/Monta/VerifyClient/WCEM/src/Monta.ApiClient.Generated/Contracts/Currencies/CurrencyDto3.verified.cs
@@ -15,7 +15,7 @@ public class CurrencyDto3
     /// <summary>
     /// id of the currency.
     /// </summary>
-    [Range(0, 2147483647)]
+    [Range(0, int.MaxValue)]
     public long? Id { get; set; }
 
     /// <summary>
diff --git a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/Monta/VerifyClient/WCEM/src/Monta.ApiClient.Generated/Contracts/Currencies/CurrencyDto4.verified.cs b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/Monta/VerifyClient/WCEM/src/Monta.ApiClient.Generated/Contracts/Currencies/CurrencyDto4.verified.cs
index abd492ae..5662ff61 100644
--- a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/Monta/VerifyClient/WCEM/src/Monta.ApiClient.Generated/Contracts/Currencies/CurrencyDto4.verified.cs
+++ b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/Monta/VerifyClient/WCEM/src/Monta.ApiClient.Generated/Contracts/Currencies/CurrencyDto4.verified.cs
@@ -15,7 +15,7 @@ public class CurrencyDto4
     /// <summary>
     /// id of the currency.
     /// </summary>
-    [Range(0, 2147483647)]
+    [Range(0, int.MaxValue)]
     public long? Id { get; set; }
 
     /// <summary>
diff --git a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/Monta/VerifyClient/WCEM/src/Monta.ApiClient.Generated/Contracts/PriceGroups/CreateOrUpdatePriceGroupDto.verified.cs b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/Monta/VerifyClient/WCEM/src/Monta.ApiClient.Generated/Contracts/PriceGroups/CreateOrUpdatePriceGroupDto.verified.cs
index 36a26a01..f045adab 100644
--- a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/Monta/VerifyClient/WCEM/src/Monta.ApiClient.Generated/Contracts/PriceGroups/CreateOrUpdatePriceGroupDto.verified.cs
+++ b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/Monta/VerifyClient/WCEM/src/Monta.ApiClient.Generated/Contracts/PriceGroups/CreateOrUpdatePriceGroupDto.verified.cs
@@ -16,7 +16,7 @@ public class CreateOrUpdatePriceGroupDto
     /// Team ID.
     /// </summary>
     [Required]
-    [Range(0, 2147483647)]
+    [Range(0, int.MaxValue)]
     public long TeamId { get; set; }
 
     /// <summary>
diff --git a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/Monta/VerifyClient/WCEM/src/Monta.ApiClient.Generated/Contracts/PriceGroups/CreateOrUpdatePricingDto.verified.cs b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/Monta/VerifyClient/WCEM/src/Monta.ApiClient.Generated/Contracts/PriceGroups/CreateOrUpdatePricingDto.verified.cs
index b671b7b1..4af26f7d 100644
--- a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/Monta/VerifyClient/WCEM/src/Monta.ApiClient.Generated/Contracts/PriceGroups/CreateOrUpdatePricingDto.verified.cs
+++ b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/Monta/VerifyClient/WCEM/src/Monta.ApiClient.Generated/Contracts/PriceGroups/CreateOrUpdatePricingDto.verified.cs
@@ -40,13 +40,13 @@ public class CreateOrUpdatePricingDto
     /// <summary>
     /// The id of the selected Tariff.
     /// </summary>
-    [Range(0, 2147483647)]
+    [Range(0, int.MaxValue)]
     public long? TariffId { get; set; }
 
     /// <summary>
     /// The id of the selected charge pricing tag.
     /// </summary>
-    [Range(0, 2147483647)]
+    [Range(0, int.MaxValue)]
     public long? TagId { get; set; }
 
     /// <summary>
diff --git a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/Monta/VerifyClient/WCEM/src/Monta.ApiClient.Generated/Contracts/PriceGroups/MontaAppResponse.verified.cs b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/Monta/VerifyClient/WCEM/src/Monta.ApiClient.Generated/Contracts/PriceGroups/MontaAppResponse.verified.cs
index f97c482c..332ba965 100644
--- a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/Monta/VerifyClient/WCEM/src/Monta.ApiClient.Generated/Contracts/PriceGroups/MontaAppResponse.verified.cs
+++ b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/Monta/VerifyClient/WCEM/src/Monta.ApiClient.Generated/Contracts/PriceGroups/MontaAppResponse.verified.cs
@@ -27,7 +27,7 @@ public class MontaAppResponse
 
     public string? ErrorCode { get; set; }
 
-    public Object? Context { get; set; }
+    public object? Context { get; set; }
 
     public List<MontaAppResponseErrorDetail>? Errors { get; set; } = new List<MontaAppResponseErrorDetail>();
 
diff --git a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/Monta/VerifyClient/WCEM/src/Monta.ApiClient.Generated/Contracts/SponsoredChargePoints/CreateSponsoredChargePointDto.verified.cs b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/Monta/VerifyClient/WCEM/src/Monta.ApiClient.Generated/Contracts/SponsoredChargePoints/CreateSponsoredChargePointDto.verified.cs
index 9901ea58..de51b957 100644
--- a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/Monta/VerifyClient/WCEM/src/Monta.ApiClient.Generated/Contracts/SponsoredChargePoints/CreateSponsoredChargePointDto.verified.cs
+++ b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/Monta/VerifyClient/WCEM/src/Monta.ApiClient.Generated/Contracts/SponsoredChargePoints/CreateSponsoredChargePointDto.verified.cs
@@ -15,25 +15,25 @@ public class CreateSponsoredChargePointDto
     /// <summary>
     /// Id of the team that is sponsoring this charge point.
     /// </summary>
-    [Range(0, 2147483647)]
+    [Range(0, int.MaxValue)]
     public long SponsoringTeamId { get; set; }
 
     /// <summary>
     /// Id of the charge point to be sponsored.
     /// </summary>
-    [Range(0, 2147483647)]
+    [Range(0, int.MaxValue)]
     public long ChargePointId { get; set; }
 
     /// <summary>
     /// Id of the user to have a charge point sponsored.
     /// </summary>
-    [Range(0, 2147483647)]
+    [Range(0, int.MaxValue)]
     public long UserId { get; set; }
 
     /// <summary>
     /// The price group for this sponsorship, Only price groups of type `reimbursement` or `sponsored` are allowed&lt;br /&gt;&lt;br /&gt;*Note:* if the `priceGroupId` is null the charge point cost price group will be used instead, if the charge point has no cost price group set the request will fail, please ensure that charge point has a valid cost group assigned when not providing a `priceGroupId`.
     /// </summary>
-    [Range(0, 2147483647)]
+    [Range(0, int.MaxValue)]
     public long? PriceGroupId { get; set; }
 
     [Required]
diff --git a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/Monta/VerifyClient/WCEM/src/Monta.ApiClient.Generated/Contracts/Subscriptions/CreateSubscription.verified.cs b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/Monta/VerifyClient/WCEM/src/Monta.ApiClient.Generated/Contracts/Subscriptions/CreateSubscription.verified.cs
index 01dc9593..e8b43930 100644
--- a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/Monta/VerifyClient/WCEM/src/Monta.ApiClient.Generated/Contracts/Subscriptions/CreateSubscription.verified.cs
+++ b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/Monta/VerifyClient/WCEM/src/Monta.ApiClient.Generated/Contracts/Subscriptions/CreateSubscription.verified.cs
@@ -15,7 +15,7 @@ public class CreateSubscription
     /// <summary>
     /// Id of the plan to subscribe to.
     /// </summary>
-    [Range(0, 2147483647)]
+    [Range(0, int.MaxValue)]
     public long PlanId { get; set; }
 
     [Required]
@@ -24,7 +24,7 @@ public class CreateSubscription
     /// <summary>
     /// Id of the customer the subscription is created for, e.g. a chargePointId.
     /// </summary>
-    [Range(0, 2147483647)]
+    [Range(0, int.MaxValue)]
     public long CustomerId { get; set; }
 
     /// <summary>
diff --git a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/Monta/VerifyClient/WCEM/src/Monta.ApiClient.Generated/Contracts/TeamMembers/CreateTeamMember.verified.cs b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/Monta/VerifyClient/WCEM/src/Monta.ApiClient.Generated/Contracts/TeamMembers/CreateTeamMember.verified.cs
index 6e081e8c..e1e24e4d 100644
--- a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/Monta/VerifyClient/WCEM/src/Monta.ApiClient.Generated/Contracts/TeamMembers/CreateTeamMember.verified.cs
+++ b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/Monta/VerifyClient/WCEM/src/Monta.ApiClient.Generated/Contracts/TeamMembers/CreateTeamMember.verified.cs
@@ -15,13 +15,13 @@ public class CreateTeamMember
     /// <summary>
     /// Id of the team that the user will be invited.
     /// </summary>
-    [Range(0, 2147483647)]
+    [Range(0, int.MaxValue)]
     public long TeamId { get; set; }
 
     /// <summary>
     /// Id of the user to be invited&lt;br /&gt;*Note*: When inviting by `userId` the fields `email` or `phone` must not be provided.
     /// </summary>
-    [Range(0, 2147483647)]
+    [Range(0, int.MaxValue)]
     public long? UserId { get; set; }
 
     /// <summary>
diff --git a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/Monta/VerifyClient/WCEM/src/Monta.ApiClient.Generated/Contracts/_Shared/CreatedOrUpdateAddress.verified.cs b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/Monta/VerifyClient/WCEM/src/Monta.ApiClient.Generated/Contracts/_Shared/CreatedOrUpdateAddress.verified.cs
index e1deadc9..b335234f 100644
--- a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/Monta/VerifyClient/WCEM/src/Monta.ApiClient.Generated/Contracts/_Shared/CreatedOrUpdateAddress.verified.cs
+++ b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/Monta/VerifyClient/WCEM/src/Monta.ApiClient.Generated/Contracts/_Shared/CreatedOrUpdateAddress.verified.cs
@@ -49,7 +49,7 @@ public class CreatedOrUpdateAddress
     /// The country id, Note.
     /// </summary>
     [Required]
-    [Range(0, 2147483647)]
+    [Range(0, int.MaxValue)]
     public long CountryId { get; set; }
 
     /// <inheritdoc />
diff --git a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/Monta/VerifyClient/WCEM/src/Monta.ApiClient.Generated/Contracts/_Shared/PriceGroup.verified.cs b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/Monta/VerifyClient/WCEM/src/Monta.ApiClient.Generated/Contracts/_Shared/PriceGroup.verified.cs
index 7c90e75d..c2b3ad36 100644
--- a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/Monta/VerifyClient/WCEM/src/Monta.ApiClient.Generated/Contracts/_Shared/PriceGroup.verified.cs
+++ b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/Monta/VerifyClient/WCEM/src/Monta.ApiClient.Generated/Contracts/_Shared/PriceGroup.verified.cs
@@ -16,7 +16,7 @@ public class PriceGroup
     /// Id of the price group.
     /// </summary>
     [Required]
-    [Range(0, 2147483647)]
+    [Range(0, int.MaxValue)]
     public long Id { get; set; }
 
     /// <summary>
diff --git a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/Monta/VerifyClient/WCEM/src/Monta.ApiClient.Generated/Contracts/_Shared/Pricing.verified.cs b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/Monta/VerifyClient/WCEM/src/Monta.ApiClient.Generated/Contracts/_Shared/Pricing.verified.cs
index 77fc7a2d..191b4b25 100644
--- a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/Monta/VerifyClient/WCEM/src/Monta.ApiClient.Generated/Contracts/_Shared/Pricing.verified.cs
+++ b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/Monta/VerifyClient/WCEM/src/Monta.ApiClient.Generated/Contracts/_Shared/Pricing.verified.cs
@@ -16,7 +16,7 @@ public class Pricing
     /// Id of the pricing.
     /// </summary>
     [Required]
-    [Range(0, 2147483647)]
+    [Range(0, int.MaxValue)]
     public long Id { get; set; }
 
     /// <summary>