diff --git a/Vonage/Conversations/CreateConversation/CreateConversationRequestBuilder.cs b/Vonage/Conversations/CreateConversation/CreateConversationRequestBuilder.cs
index bb5debe17..59e042cbd 100644
--- a/Vonage/Conversations/CreateConversation/CreateConversationRequestBuilder.cs
+++ b/Vonage/Conversations/CreateConversation/CreateConversationRequestBuilder.cs
@@ -9,7 +9,7 @@
 
 namespace Vonage.Conversations.CreateConversation;
 
-internal class CreateConversationRequestBuilder : IBuilderForOptional
+internal struct CreateConversationRequestBuilder : IBuilderForOptional
 {
     private const int CallbackEventMask = 200;
     private const int DisplayNameMaxLength = 50;
@@ -17,13 +17,17 @@ internal class CreateConversationRequestBuilder : IBuilderForOptional
     private const int PropertiesCustomSortKeyMaxLength = 200;
     private const int PropertiesTypeMaxLength = 200;
 
-    private readonly IEnumerable<HttpMethod> allowedMethods = new[] {HttpMethod.Get, HttpMethod.Post};
+    private static readonly IEnumerable<HttpMethod> AllowedMethods = new[] {HttpMethod.Get, HttpMethod.Post};
     private readonly List<INumber> numbers = new();
-    private Maybe<Callback> callback;
-    private Maybe<Properties> properties;
-    private Maybe<string> name;
-    private Maybe<string> displayName;
-    private Maybe<Uri> uri;
+    private Maybe<Callback> callback = default;
+    private Maybe<Properties> properties = default;
+    private Maybe<string> name = default;
+    private Maybe<string> displayName = default;
+    private Maybe<Uri> uri = default;
+
+    public CreateConversationRequestBuilder()
+    {
+    }
 
     /// <inheritdoc />
     public Result<CreateConversationRequest> Create() => Result<CreateConversationRequest>.FromSuccess(
@@ -42,38 +46,22 @@ public Result<CreateConversationRequest> Create() => Result<CreateConversationRe
             VerifyNameLength,
             VerifyDisplayName,
             VerifyDisplayNameLength,
-            this.VerifyCallbackHttpMethod,
+            VerifyCallbackHttpMethod,
             VerifyPropertiesTypeLength,
             VerifyPropertiesCustomSortKeyLength,
             VerifyCallbackEventMaskLength));
 
     /// <inheritdoc />
-    public IBuilderForOptional WithCallback(Callback value)
-    {
-        this.callback = value;
-        return this;
-    }
+    public IBuilderForOptional WithCallback(Callback value) => this with {callback = value};
 
     /// <inheritdoc />
-    public IBuilderForOptional WithDisplayName(string value)
-    {
-        this.displayName = value;
-        return this;
-    }
+    public IBuilderForOptional WithDisplayName(string value) => this with {displayName = value};
 
     /// <inheritdoc />
-    public IBuilderForOptional WithImageUrl(Uri value)
-    {
-        this.uri = value;
-        return this;
-    }
+    public IBuilderForOptional WithImageUrl(Uri value) => this with {uri = value};
 
     /// <inheritdoc />
-    public IBuilderForOptional WithName(string value)
-    {
-        this.name = value;
-        return this;
-    }
+    public IBuilderForOptional WithName(string value) => this with {name = value};
 
     /// <inheritdoc />
     public IBuilderForOptional WithNumber(INumber value)
@@ -83,11 +71,7 @@ public IBuilderForOptional WithNumber(INumber value)
     }
 
     /// <inheritdoc />
-    public IBuilderForOptional WithProperties(Properties value)
-    {
-        this.properties = value;
-        return this;
-    }
+    public IBuilderForOptional WithProperties(Properties value) => this with {properties = value};
 
     private static Result<CreateConversationRequest> VerifyCallbackEventMaskLength(CreateConversationRequest request) =>
         request.Callback.Match(
@@ -95,9 +79,9 @@ private static Result<CreateConversationRequest> VerifyCallbackEventMaskLength(C
                 $"{nameof(request.Callback)} {nameof(some.EventMask)}"),
             () => request);
 
-    private Result<CreateConversationRequest> VerifyCallbackHttpMethod(CreateConversationRequest request) =>
+    private static Result<CreateConversationRequest> VerifyCallbackHttpMethod(CreateConversationRequest request) =>
         request.Callback.Match(
-            some => this.allowedMethods.Contains(some.Method)
+            some => AllowedMethods.Contains(some.Method)
                 ? Result<CreateConversationRequest>.FromSuccess(request)
                 : ResultFailure.FromErrorMessage("Callback HttpMethod must be GET or POST.")
                     .ToResult<CreateConversationRequest>(),
diff --git a/Vonage/Conversations/GetConversations/GetConversationsRequestBuilder.cs b/Vonage/Conversations/GetConversations/GetConversationsRequestBuilder.cs
index 627c097f2..0de73d5d6 100644
--- a/Vonage/Conversations/GetConversations/GetConversationsRequestBuilder.cs
+++ b/Vonage/Conversations/GetConversations/GetConversationsRequestBuilder.cs
@@ -5,15 +5,15 @@
 
 namespace Vonage.Conversations.GetConversations;
 
-internal class GetConversationsRequestBuilder : IBuilderForOptional
+internal struct GetConversationsRequestBuilder : IBuilderForOptional
 {
     private const int MaximumPageSize = 100;
     private const int MinimumPageSize = 1;
-    private readonly Maybe<string> cursor;
-    private Maybe<DateTimeOffset> endDate;
     private FetchOrder fetchOrder = FetchOrder.Ascending;
     private int pageSize = 10;
+    private Maybe<DateTimeOffset> endDate;
     private Maybe<DateTimeOffset> startDate;
+    private readonly Maybe<string> cursor;
 
     internal GetConversationsRequestBuilder(Maybe<string> cursor) => this.cursor = cursor;
 
@@ -31,44 +31,16 @@ public Result<GetConversationsRequest> Create() => Result<GetConversationsReques
         .Bind(evaluation => evaluation.WithRules(VerifyMinimumPageSize, VerifyMaximumPageSize));
 
     /// <inheritdoc />
-    public IBuilderForOptional WithEndDate(DateTimeOffset value) =>
-        new GetConversationsRequestBuilder(this.cursor)
-        {
-            startDate = this.startDate,
-            pageSize = this.pageSize,
-            endDate = value,
-            fetchOrder = this.fetchOrder,
-        };
+    public IBuilderForOptional WithEndDate(DateTimeOffset value) => this with {endDate = value};
 
     /// <inheritdoc />
-    public IBuilderForOptional WithOrder(FetchOrder value) =>
-        new GetConversationsRequestBuilder(this.cursor)
-        {
-            startDate = this.startDate,
-            pageSize = this.pageSize,
-            endDate = this.endDate,
-            fetchOrder = value,
-        };
+    public IBuilderForOptional WithOrder(FetchOrder value) => this with {fetchOrder = value};
 
     /// <inheritdoc />
-    public IBuilderForOptional WithPageSize(int value) =>
-        new GetConversationsRequestBuilder(this.cursor)
-        {
-            startDate = this.startDate,
-            pageSize = value,
-            endDate = this.endDate,
-            fetchOrder = this.fetchOrder,
-        };
+    public IBuilderForOptional WithPageSize(int value) => this with {pageSize = value};
 
     /// <inheritdoc />
-    public IBuilderForOptional WithStartDate(DateTimeOffset value) =>
-        new GetConversationsRequestBuilder(this.cursor)
-        {
-            startDate = value,
-            pageSize = this.pageSize,
-            endDate = this.endDate,
-            fetchOrder = this.fetchOrder,
-        };
+    public IBuilderForOptional WithStartDate(DateTimeOffset value) => this with {startDate = value};
 
     private static Result<GetConversationsRequest> VerifyMaximumPageSize(GetConversationsRequest request) =>
         InputValidation.VerifyLowerOrEqualThan(request, request.PageSize, MaximumPageSize, nameof(request.PageSize));
diff --git a/Vonage/Conversations/GetMembers/GetMembersRequestBuilder.cs b/Vonage/Conversations/GetMembers/GetMembersRequestBuilder.cs
index 2c02cd7d1..c1728b040 100644
--- a/Vonage/Conversations/GetMembers/GetMembersRequestBuilder.cs
+++ b/Vonage/Conversations/GetMembers/GetMembersRequestBuilder.cs
@@ -4,26 +4,17 @@
 
 namespace Vonage.Conversations.GetMembers;
 
-internal class GetMembersRequestBuilder : IBuilderForConversationId, IBuilderForOptional
+internal struct GetMembersRequestBuilder : IBuilderForConversationId, IBuilderForOptional
 {
     private const int MaximumPageSize = 100;
     private const int MinimumPageSize = 1;
-    private readonly Maybe<string> cursor;
-    private string conversationId;
     private FetchOrder fetchOrder = FetchOrder.Ascending;
     private int pageSize = 10;
-    
+    private readonly Maybe<string> cursor;
+    private string conversationId;
+
     internal GetMembersRequestBuilder(Maybe<string> cursor) => this.cursor = cursor;
-    
-    /// <inheritdoc />
-    public IBuilderForOptional WithConversationId(string value) =>
-        new GetMembersRequestBuilder(this.cursor)
-        {
-            pageSize = this.pageSize,
-            fetchOrder = this.fetchOrder,
-            conversationId = value,
-        };
-    
+
     /// <inheritdoc />
     public Result<GetMembersRequest> Create() => Result<GetMembersRequest>.FromSuccess(new GetMembersRequest
         {
@@ -34,31 +25,22 @@ public Result<GetMembersRequest> Create() => Result<GetMembersRequest>.FromSucce
         })
         .Map(InputEvaluation<GetMembersRequest>.Evaluate)
         .Bind(evaluation => evaluation.WithRules(VerifyConversationId, VerifyMinimumPageSize, VerifyMaximumPageSize));
-    
+
     /// <inheritdoc />
-    public IBuilderForOptional WithOrder(FetchOrder value) =>
-        new GetMembersRequestBuilder(this.cursor)
-        {
-            pageSize = this.pageSize,
-            fetchOrder = value,
-            conversationId = this.conversationId,
-        };
-    
+    public IBuilderForOptional WithConversationId(string value) => this with {conversationId = value};
+
     /// <inheritdoc />
-    public IBuilderForOptional WithPageSize(int value) =>
-        new GetMembersRequestBuilder(this.cursor)
-        {
-            pageSize = value,
-            fetchOrder = this.fetchOrder,
-            conversationId = this.conversationId,
-        };
-    
+    public IBuilderForOptional WithOrder(FetchOrder value) => this with {fetchOrder = value};
+
+    /// <inheritdoc />
+    public IBuilderForOptional WithPageSize(int value) => this with {pageSize = value};
+
     private static Result<GetMembersRequest> VerifyConversationId(GetMembersRequest request) =>
         InputValidation.VerifyNotEmpty(request, request.ConversationId, nameof(request.ConversationId));
-    
+
     private static Result<GetMembersRequest> VerifyMaximumPageSize(GetMembersRequest request) =>
         InputValidation.VerifyLowerOrEqualThan(request, request.PageSize, MaximumPageSize, nameof(request.PageSize));
-    
+
     private static Result<GetMembersRequest> VerifyMinimumPageSize(GetMembersRequest request) =>
         InputValidation.VerifyHigherOrEqualThan(request, request.PageSize, MinimumPageSize, nameof(request.PageSize));
 }
@@ -74,7 +56,7 @@ public interface IBuilderForOptional : IVonageRequestBuilder<GetMembersRequest>
     /// <param name="value">The order.</param>
     /// <returns>The builder.</returns>
     IBuilderForOptional WithOrder(FetchOrder value);
-    
+
     /// <summary>
     ///     Sets the page size on the builder.
     /// </summary>
diff --git a/Vonage/Conversations/GetUserConversations/GetUserConversationsRequestBuilder.cs b/Vonage/Conversations/GetUserConversations/GetUserConversationsRequestBuilder.cs
index 862cf9903..78290bf5d 100644
--- a/Vonage/Conversations/GetUserConversations/GetUserConversationsRequestBuilder.cs
+++ b/Vonage/Conversations/GetUserConversations/GetUserConversationsRequestBuilder.cs
@@ -5,18 +5,18 @@
 
 namespace Vonage.Conversations.GetUserConversations;
 
-internal class GetUserConversationsRequestBuilder : IBuilderForUserId, IBuilderForOptional
+internal struct GetUserConversationsRequestBuilder : IBuilderForUserId, IBuilderForOptional
 {
-    private const string DefaultOrderBy = "created";
     private const int MaximumPageSize = 100;
     private const int MinimumPageSize = 1;
-    private readonly Maybe<string> cursor;
+    private const string DefaultOrderBy = "created";
     private bool includeCustomData;
     private FetchOrder order = FetchOrder.Ascending;
-    private Maybe<string> orderBy;
     private int pageSize = 10;
     private Maybe<DateTimeOffset> startDate;
     private Maybe<State> state;
+    private readonly Maybe<string> cursor;
+    private Maybe<string> orderBy;
     private string userId;
 
     internal GetUserConversationsRequestBuilder(Maybe<string> cursor) => this.cursor = cursor;
@@ -40,104 +40,34 @@ public Result<GetUserConversationsRequest> Create() => Result<GetUserConversatio
             VerifyMaximumPageSize));
 
     /// <inheritdoc />
-    public IBuilderForOptional WithOrder(FetchOrder value) =>
-        new GetUserConversationsRequestBuilder(this.cursor)
-        {
-            includeCustomData = this.includeCustomData,
-            orderBy = this.orderBy,
-            order = value,
-            state = this.state,
-            pageSize = this.pageSize,
-            startDate = this.startDate,
-            userId = this.userId,
-        };
+    public IBuilderForOptional IncludeCustomData() => this with {includeCustomData = true};
 
     /// <inheritdoc />
-    public IBuilderForOptional WithOrderBy(string value) =>
-        new GetUserConversationsRequestBuilder(this.cursor)
-        {
-            includeCustomData = this.includeCustomData,
-            orderBy = value,
-            order = this.order,
-            state = this.state,
-            pageSize = this.pageSize,
-            startDate = this.startDate,
-            userId = this.userId,
-        };
+    public IBuilderForOptional WithOrder(FetchOrder value) => this with {order = value};
 
     /// <inheritdoc />
-    public IBuilderForOptional WithState(State value) =>
-        new GetUserConversationsRequestBuilder(this.cursor)
-        {
-            includeCustomData = this.includeCustomData,
-            orderBy = this.orderBy,
-            order = this.order,
-            state = value,
-            pageSize = this.pageSize,
-            startDate = this.startDate,
-            userId = this.userId,
-        };
+    public IBuilderForOptional WithOrderBy(string value) => this with {orderBy = value};
 
     /// <inheritdoc />
-    public IBuilderForOptional IncludeCustomData() =>
-        new GetUserConversationsRequestBuilder(this.cursor)
-        {
-            includeCustomData = true,
-            orderBy = this.orderBy,
-            order = this.order,
-            state = this.state,
-            pageSize = this.pageSize,
-            startDate = this.startDate,
-            userId = this.userId,
-        };
+    public IBuilderForOptional WithPageSize(int value) => this with {pageSize = value};
 
     /// <inheritdoc />
-    public IBuilderForOptional WithPageSize(int value) =>
-        new GetUserConversationsRequestBuilder(this.cursor)
-        {
-            includeCustomData = this.includeCustomData,
-            orderBy = this.orderBy,
-            order = this.order,
-            state = this.state,
-            pageSize = value,
-            startDate = this.startDate,
-            userId = this.userId,
-        };
+    public IBuilderForOptional WithStartDate(DateTimeOffset value) => this with {startDate = value};
 
     /// <inheritdoc />
-    public IBuilderForOptional WithStartDate(DateTimeOffset value) =>
-        new GetUserConversationsRequestBuilder(this.cursor)
-        {
-            includeCustomData = this.includeCustomData,
-            orderBy = this.orderBy,
-            order = this.order,
-            state = this.state,
-            pageSize = this.pageSize,
-            startDate = value,
-            userId = this.userId,
-        };
+    public IBuilderForOptional WithState(State value) => this with {state = value};
 
     /// <inheritdoc />
-    public IBuilderForOptional WithUserId(string value) =>
-        new GetUserConversationsRequestBuilder(this.cursor)
-        {
-            includeCustomData = this.includeCustomData,
-            orderBy = this.orderBy,
-            order = this.order,
-            state = this.state,
-            pageSize = this.pageSize,
-            startDate = this.startDate,
-            userId = value,
-        };
+    public IBuilderForOptional WithUserId(string value) => this with {userId = value};
 
     private static Result<GetUserConversationsRequest> VerifyMaximumPageSize(GetUserConversationsRequest request) =>
         InputValidation.VerifyLowerOrEqualThan(request, request.PageSize, MaximumPageSize, nameof(request.PageSize));
 
-    private static Result<GetUserConversationsRequest> VerifyUserId(GetUserConversationsRequest request) =>
-        InputValidation.VerifyNotEmpty(request, request.UserId, nameof(request.UserId));
-
     private static Result<GetUserConversationsRequest> VerifyMinimumPageSize(GetUserConversationsRequest request) =>
         InputValidation.VerifyHigherOrEqualThan(request, request.PageSize, MinimumPageSize, nameof(request.PageSize));
+
+    private static Result<GetUserConversationsRequest> VerifyUserId(GetUserConversationsRequest request) =>
+        InputValidation.VerifyNotEmpty(request, request.UserId, nameof(request.UserId));
 }
 
 /// <summary>
@@ -158,6 +88,12 @@ public interface IBuilderForUserId
 /// </summary>
 public interface IBuilderForOptional : IVonageRequestBuilder<GetUserConversationsRequest>
 {
+    /// <summary>
+    ///     Sets the request to include custom data.
+    /// </summary>
+    /// <returns>The builder.</returns>
+    IBuilderForOptional IncludeCustomData();
+
     /// <summary>
     ///     Sets the order on the builder.
     /// </summary>
@@ -172,19 +108,6 @@ public interface IBuilderForOptional : IVonageRequestBuilder<GetUserConversation
     /// <returns>The builder.</returns>
     IBuilderForOptional WithOrderBy(string value);
 
-    /// <summary>
-    ///     Sets the state on the builder.
-    /// </summary>
-    /// <param name="value">The state.</param>
-    /// <returns>The builder.</returns>
-    IBuilderForOptional WithState(State value);
-
-    /// <summary>
-    ///     Sets the request to include custom data.
-    /// </summary>
-    /// <returns>The builder.</returns>
-    IBuilderForOptional IncludeCustomData();
-
     /// <summary>
     ///     Sets the page size on the builder.
     /// </summary>
@@ -198,4 +121,11 @@ public interface IBuilderForOptional : IVonageRequestBuilder<GetUserConversation
     /// <param name="value">The start date.</param>
     /// <returns>The builder.</returns>
     IBuilderForOptional WithStartDate(DateTimeOffset value);
+
+    /// <summary>
+    ///     Sets the state on the builder.
+    /// </summary>
+    /// <param name="value">The state.</param>
+    /// <returns>The builder.</returns>
+    IBuilderForOptional WithState(State value);
 }
\ No newline at end of file
diff --git a/Vonage/Conversations/UpdateConversation/UpdateConversationRequestBuilder.cs b/Vonage/Conversations/UpdateConversation/UpdateConversationRequestBuilder.cs
index 87ba74897..e452693b6 100644
--- a/Vonage/Conversations/UpdateConversation/UpdateConversationRequestBuilder.cs
+++ b/Vonage/Conversations/UpdateConversation/UpdateConversationRequestBuilder.cs
@@ -9,7 +9,7 @@
 
 namespace Vonage.Conversations.UpdateConversation;
 
-internal class UpdateConversationRequestBuilder : IBuilderForConversationId, IBuilderForOptional
+internal struct UpdateConversationRequestBuilder : IBuilderForConversationId, IBuilderForOptional
 {
     private const int CallbackEventMask = 200;
     private const int DisplayNameMaxLength = 50;
@@ -17,14 +17,18 @@ internal class UpdateConversationRequestBuilder : IBuilderForConversationId, IBu
     private const int PropertiesCustomSortKeyMaxLength = 200;
     private const int PropertiesTypeMaxLength = 200;
 
-    private readonly IEnumerable<HttpMethod> allowedMethods = new[] {HttpMethod.Get, HttpMethod.Post};
+    private static readonly IEnumerable<HttpMethod> AllowedMethods = new[] {HttpMethod.Get, HttpMethod.Post};
     private readonly List<INumber> numbers = new();
-    private Maybe<Callback> callback;
-    private Maybe<Properties> properties;
-    private Maybe<string> name;
-    private Maybe<string> displayName;
-    private Maybe<Uri> uri;
-    private string conversationId;
+    private Maybe<Callback> callback = default;
+    private Maybe<Properties> properties = default;
+    private Maybe<string> name = default;
+    private Maybe<string> displayName = default;
+    private Maybe<Uri> uri = default;
+    private string conversationId = default;
+
+    public UpdateConversationRequestBuilder()
+    {
+    }
 
     /// <inheritdoc />
     public Result<UpdateConversationRequest> Create() => Result<UpdateConversationRequest>.FromSuccess(
@@ -45,45 +49,25 @@ public Result<UpdateConversationRequest> Create() => Result<UpdateConversationRe
             VerifyNameLength,
             VerifyDisplayName,
             VerifyDisplayNameLength,
-            this.VerifyCallbackHttpMethod,
+            VerifyCallbackHttpMethod,
             VerifyPropertiesTypeLength,
             VerifyPropertiesCustomSortKeyLength,
             VerifyCallbackEventMaskLength));
 
     /// <inheritdoc />
-    public IBuilderForOptional WithCallback(Callback value)
-    {
-        this.callback = value;
-        return this;
-    }
+    public IBuilderForOptional WithCallback(Callback value) => this with {callback = value};
 
     /// <inheritdoc />
-    public IBuilderForOptional WithConversationId(string value)
-    {
-        this.conversationId = value;
-        return this;
-    }
+    public IBuilderForOptional WithConversationId(string value) => this with {conversationId = value};
 
     /// <inheritdoc />
-    public IBuilderForOptional WithDisplayName(string value)
-    {
-        this.displayName = value;
-        return this;
-    }
+    public IBuilderForOptional WithDisplayName(string value) => this with {displayName = value};
 
     /// <inheritdoc />
-    public IBuilderForOptional WithImageUrl(Uri value)
-    {
-        this.uri = value;
-        return this;
-    }
+    public IBuilderForOptional WithImageUrl(Uri value) => this with {uri = value};
 
     /// <inheritdoc />
-    public IBuilderForOptional WithName(string value)
-    {
-        this.name = value;
-        return this;
-    }
+    public IBuilderForOptional WithName(string value) => this with {name = value};
 
     /// <inheritdoc />
     public IBuilderForOptional WithNumber(INumber value)
@@ -93,11 +77,7 @@ public IBuilderForOptional WithNumber(INumber value)
     }
 
     /// <inheritdoc />
-    public IBuilderForOptional WithProperties(Properties value)
-    {
-        this.properties = value;
-        return this;
-    }
+    public IBuilderForOptional WithProperties(Properties value) => this with {properties = value};
 
     private static Result<UpdateConversationRequest> VerifyCallbackEventMaskLength(UpdateConversationRequest request) =>
         request.Callback.Match(
@@ -105,9 +85,9 @@ private static Result<UpdateConversationRequest> VerifyCallbackEventMaskLength(U
                 $"{nameof(request.Callback)} {nameof(some.EventMask)}"),
             () => request);
 
-    private Result<UpdateConversationRequest> VerifyCallbackHttpMethod(UpdateConversationRequest request) =>
+    private static Result<UpdateConversationRequest> VerifyCallbackHttpMethod(UpdateConversationRequest request) =>
         request.Callback.Match(
-            some => this.allowedMethods.Contains(some.Method)
+            some => AllowedMethods.Contains(some.Method)
                 ? Result<UpdateConversationRequest>.FromSuccess(request)
                 : ResultFailure.FromErrorMessage("Callback HttpMethod must be GET or POST.")
                     .ToResult<UpdateConversationRequest>(),
diff --git a/Vonage/NumberInsightV2/FraudCheck/FraudCheckRequestBuilder.cs b/Vonage/NumberInsightV2/FraudCheck/FraudCheckRequestBuilder.cs
index 387b12c65..0d00e4334 100644
--- a/Vonage/NumberInsightV2/FraudCheck/FraudCheckRequestBuilder.cs
+++ b/Vonage/NumberInsightV2/FraudCheck/FraudCheckRequestBuilder.cs
@@ -7,10 +7,14 @@
 
 namespace Vonage.NumberInsightV2.FraudCheck;
 
-internal class FraudCheckRequestBuilder : IBuilderForPhone, IBuilderForOptional
+internal struct FraudCheckRequestBuilder : IBuilderForPhone, IBuilderForOptional
 {
-    private readonly HashSet<string> insights = new();
-    private Result<PhoneNumber> phone;
+    private readonly HashSet<string> insights = new HashSet<string>();
+    private Result<PhoneNumber> phone = default;
+
+    public FraudCheckRequestBuilder()
+    {
+    }
 
     /// <inheritdoc />
     public Result<FraudCheckRequest> Create() =>
@@ -26,11 +30,7 @@ public IBuilderForOptional WithFraudScore()
     }
 
     /// <inheritdoc />
-    public IBuilderForOptional WithPhone(string value)
-    {
-        this.phone = PhoneNumber.Parse(value);
-        return this;
-    }
+    public IBuilderForOptional WithPhone(string value) => this with {phone = PhoneNumber.Parse(value)};
 
     /// <inheritdoc />
     public IBuilderForOptional WithSimSwap()
@@ -42,10 +42,11 @@ public IBuilderForOptional WithSimSwap()
     private static IResultFailure ToParsingFailure(IResultFailure failure) =>
         ParsingFailure.FromFailures(ResultFailure.FromErrorMessage(failure.GetFailureMessage()));
 
-    private FraudCheckRequest ToRequest(PhoneNumber number) => new()
-    {
-        Phone = number, Insights = this.insights,
-    };
+    private FraudCheckRequest ToRequest(PhoneNumber number) =>
+        new FraudCheckRequest
+        {
+            Phone = number, Insights = this.insights,
+        };
 
     private static Result<FraudCheckRequest> VerifyInsights(FraudCheckRequest request) =>
         InputValidation.VerifyNotEmpty(request, request.Insights, nameof(request.Insights));
diff --git a/Vonage/SimSwap/Check/CheckRequestBuilder.cs b/Vonage/SimSwap/Check/CheckRequestBuilder.cs
index ecbe23fe1..dfaf4802f 100644
--- a/Vonage/SimSwap/Check/CheckRequestBuilder.cs
+++ b/Vonage/SimSwap/Check/CheckRequestBuilder.cs
@@ -5,42 +5,36 @@
 
 namespace Vonage.SimSwap.Check;
 
-internal class CheckRequestBuilder : IBuilderForPhoneNumber, IBuilderForOptional
+internal struct CheckRequestBuilder : IBuilderForPhoneNumber, IBuilderForOptional
 {
+    private const int DefaultPeriod = 240;
     private const int MaximumPeriod = 2400;
     private const int MinimumPeriod = 1;
-    private const int DefaultPeriod = 240;
-    private string number;
     private int period = DefaultPeriod;
-    
+    private string number = default;
+
+    public CheckRequestBuilder()
+    {
+    }
+
     /// <inheritdoc />
     public Result<CheckRequest> Create() =>
-        PhoneNumber.Parse(this.number)
-            .Map(phoneNumber => new CheckRequest
+        Result<CheckRequest>.FromSuccess(new CheckRequest
             {
-                PhoneNumber = phoneNumber,
                 Period = this.period,
-            })
+            }).Merge(PhoneNumber.Parse(this.number), (request, validNumber) => request with {PhoneNumber = validNumber})
             .Map(InputEvaluation<CheckRequest>.Evaluate)
             .Bind(evaluation => evaluation.WithRules(VerifyAgeMinimumPeriod, VerifyMaximumPeriod));
-    
+
     /// <inheritdoc />
-    public IVonageRequestBuilder<CheckRequest> WithPeriod(int value) => new CheckRequestBuilder
-    {
-        number = this.number,
-        period = value,
-    };
-    
+    public IVonageRequestBuilder<CheckRequest> WithPeriod(int value) => this with {period = value};
+
     /// <inheritdoc />
-    public IBuilderForOptional WithPhoneNumber(string value) => new CheckRequestBuilder
-    {
-        number = value,
-        period = this.period,
-    };
-    
+    public IBuilderForOptional WithPhoneNumber(string value) => this with {number = value};
+
     private static Result<CheckRequest> VerifyAgeMinimumPeriod(CheckRequest request) =>
         InputValidation.VerifyHigherOrEqualThan(request, request.Period, MinimumPeriod, nameof(request.Period));
-    
+
     private static Result<CheckRequest> VerifyMaximumPeriod(CheckRequest request) =>
         InputValidation.VerifyLowerOrEqualThan(request, request.Period, MaximumPeriod, nameof(request.Period));
 }