diff --git a/src/main/java/com/casper/sdk/model/transaction/InitiatorAccountHash.java b/src/main/java/com/casper/sdk/model/transaction/InitiatorAccountHash.java
index 4bd8e4bf8..3d2fbf33b 100644
--- a/src/main/java/com/casper/sdk/model/transaction/InitiatorAccountHash.java
+++ b/src/main/java/com/casper/sdk/model/transaction/InitiatorAccountHash.java
@@ -30,7 +30,7 @@ public byte getByteTag() {
 
     @Override
     public void serialize(final SerializerBuffer ser, final Target target) throws ValueSerializationException, NoSuchTypeException {
-        new CalltableSerializationEnvelopeBuilder()
+        new CalltableSerializationEnvelopeBuilder(target)
                 .addField(TAG_FIELD_INDEX,  /* U8 */  getByteTag())
                 .addField(ADDR_KEY_FIELD_INDEX, getAddress())
                 .serialize(ser, target);
diff --git a/src/main/java/com/casper/sdk/model/transaction/InitiatorPublicKey.java b/src/main/java/com/casper/sdk/model/transaction/InitiatorPublicKey.java
index b0ebc737f..d130c45f3 100644
--- a/src/main/java/com/casper/sdk/model/transaction/InitiatorPublicKey.java
+++ b/src/main/java/com/casper/sdk/model/transaction/InitiatorPublicKey.java
@@ -1,7 +1,6 @@
 package com.casper.sdk.model.transaction;
 
 import com.casper.sdk.exception.NoSuchTypeException;
-import com.casper.sdk.model.clvalue.CLValuePublicKey;
 import com.casper.sdk.model.clvalue.serde.Target;
 import com.casper.sdk.model.key.PublicKey;
 import com.casper.sdk.model.transaction.field.CalltableSerializationEnvelopeBuilder;
@@ -30,9 +29,9 @@ public byte getByteTag() {
 
     @Override
     public void serialize(final SerializerBuffer ser, final Target target) throws ValueSerializationException, NoSuchTypeException {
-        new CalltableSerializationEnvelopeBuilder()
+        new CalltableSerializationEnvelopeBuilder(target)
                 .addField(TAG_FIELD_INDEX,  /* U8 */  getByteTag())
-                .addField(ADDR_KEY_FIELD_INDEX, new CLValuePublicKey(getAddress()))
+                .addField(ADDR_KEY_FIELD_INDEX, getAddress())
                 .serialize(ser, target);
     }
 }
diff --git a/src/main/java/com/casper/sdk/model/transaction/TransactionV1.java b/src/main/java/com/casper/sdk/model/transaction/TransactionV1.java
index 615810ba3..e88222f9e 100644
--- a/src/main/java/com/casper/sdk/model/transaction/TransactionV1.java
+++ b/src/main/java/com/casper/sdk/model/transaction/TransactionV1.java
@@ -32,7 +32,6 @@ public class TransactionV1 extends AbstractTransaction implements CasperSerializ
     private static final int PAYLOAD_FIELD_INDEX = 1;
     private static final int APPROVALS_FIELD_INDEX = 2;
 
-
     @JsonProperty("payload")
     private TransactionV1Payload payload;
 
@@ -47,7 +46,7 @@ public TransactionV1(final Digest hash,
     @Override
     public void serialize(final SerializerBuffer ser, final Target target) throws ValueSerializationException, NoSuchTypeException {
 
-        new CalltableSerializationEnvelopeBuilder()
+        new CalltableSerializationEnvelopeBuilder(target)
                 .addField(HASH_FIELD_INDEX, getHash())
                 .addField(PAYLOAD_FIELD_INDEX, payload)
                 .addField(APPROVALS_FIELD_INDEX, getApprovals())
diff --git a/src/main/java/com/casper/sdk/model/transaction/entrypoint/CustomEntryPoint.java b/src/main/java/com/casper/sdk/model/transaction/entrypoint/CustomEntryPoint.java
index 4070ba80a..2ee605d16 100644
--- a/src/main/java/com/casper/sdk/model/transaction/entrypoint/CustomEntryPoint.java
+++ b/src/main/java/com/casper/sdk/model/transaction/entrypoint/CustomEntryPoint.java
@@ -7,7 +7,6 @@
 import dev.oak3.sbs4j.exception.ValueSerializationException;
 import lombok.Builder;
 import lombok.Getter;
-import lombok.NoArgsConstructor;
 import lombok.Setter;
 
 /**
@@ -32,9 +31,8 @@ public CustomEntryPoint() {
     }
 
     @Override
-    public void serialize(SerializerBuffer ser, Target target) throws ValueSerializationException, NoSuchTypeException {
-
-        new CalltableSerializationEnvelopeBuilder()
+    public void serialize(final SerializerBuffer ser, final Target target) throws ValueSerializationException, NoSuchTypeException {
+        new CalltableSerializationEnvelopeBuilder(target)
                 .addField(TAG_FIELD_INDEX, getTag())
                 .addField(CUSTOM_CUSTOM_INDEX, this.custom)
                 .serialize(ser, target);
diff --git a/src/main/java/com/casper/sdk/model/transaction/entrypoint/TransactionEntryPoint.java b/src/main/java/com/casper/sdk/model/transaction/entrypoint/TransactionEntryPoint.java
index 93081f53f..1c752241d 100644
--- a/src/main/java/com/casper/sdk/model/transaction/entrypoint/TransactionEntryPoint.java
+++ b/src/main/java/com/casper/sdk/model/transaction/entrypoint/TransactionEntryPoint.java
@@ -55,7 +55,7 @@ public byte getByteTag() {
 
     @Override
     public void serialize(SerializerBuffer ser, Target target) throws ValueSerializationException, NoSuchTypeException {
-        new CalltableSerializationEnvelopeBuilder()
+        new CalltableSerializationEnvelopeBuilder(target)
                 .addField(TAG_FIELD_INDEX, getTag())
                 .serialize(ser, target);
     }
diff --git a/src/main/java/com/casper/sdk/model/transaction/field/CalltableSerializationEnvelopeBuilder.java b/src/main/java/com/casper/sdk/model/transaction/field/CalltableSerializationEnvelopeBuilder.java
index cc6139257..fad3c06bf 100644
--- a/src/main/java/com/casper/sdk/model/transaction/field/CalltableSerializationEnvelopeBuilder.java
+++ b/src/main/java/com/casper/sdk/model/transaction/field/CalltableSerializationEnvelopeBuilder.java
@@ -9,8 +9,6 @@
 import dev.oak3.sbs4j.exception.ValueDeserializationException;
 import dev.oak3.sbs4j.exception.ValueSerializationException;
 import dev.oak3.sbs4j.interfaces.DeserializableObject;
-import lombok.AllArgsConstructor;
-import lombok.NoArgsConstructor;
 import lombok.Setter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -23,8 +21,6 @@
  *
  * @author ian@meywood.com
  */
-@AllArgsConstructor
-@NoArgsConstructor
 @Setter
 public class CalltableSerializationEnvelopeBuilder implements CasperSerializableObject, DeserializableObject {
 
@@ -38,7 +34,7 @@ public class CalltableSerializationEnvelopeBuilder implements CasperSerializable
     private long offset = 0;
     /** The total size of all field values when serialized */
     private long size = 0;
-    private  Target target = Target.BYTE;
+    private Target target;
 
     public CalltableSerializationEnvelopeBuilder(final Target target) {
         this.target = target;
diff --git a/src/main/java/com/casper/sdk/model/transaction/pricing/FixedPricingMode.java b/src/main/java/com/casper/sdk/model/transaction/pricing/FixedPricingMode.java
index 0f310a8ec..a39733667 100644
--- a/src/main/java/com/casper/sdk/model/transaction/pricing/FixedPricingMode.java
+++ b/src/main/java/com/casper/sdk/model/transaction/pricing/FixedPricingMode.java
@@ -45,7 +45,7 @@ public class FixedPricingMode implements PricingMode {
 
     @Override
     public void serialize(final SerializerBuffer ser, final Target target) throws ValueSerializationException, NoSuchTypeException {
-        new CalltableSerializationEnvelopeBuilder()
+        new CalltableSerializationEnvelopeBuilder(target)
                 .addField(TAG_FIELD_INDEX,  /* U8 */ getByteTag())
                 .addField(FIXED_GAS_PRICE_TOLERANCE_INDEX, /* U8 */  (byte) gasPriceTolerance)
                 .addField(FIXED_ADDITIONAL_COMPUTATION_FACTOR_INDEX, /* U8 */ (byte) additionalComputationFactor)
diff --git a/src/main/java/com/casper/sdk/model/transaction/pricing/PaymentLimited.java b/src/main/java/com/casper/sdk/model/transaction/pricing/PaymentLimited.java
index 6890353a3..67b3a8870 100644
--- a/src/main/java/com/casper/sdk/model/transaction/pricing/PaymentLimited.java
+++ b/src/main/java/com/casper/sdk/model/transaction/pricing/PaymentLimited.java
@@ -1,7 +1,6 @@
 package com.casper.sdk.model.transaction.pricing;
 
 import com.casper.sdk.exception.NoSuchTypeException;
-import com.casper.sdk.model.clvalue.CLValueU8;
 import com.casper.sdk.model.clvalue.serde.Target;
 import com.casper.sdk.model.transaction.field.CalltableSerializationEnvelopeBuilder;
 import com.fasterxml.jackson.annotation.JsonIgnore;
@@ -43,8 +42,8 @@ public class PaymentLimited implements PricingMode {
 
     @Override
     public void serialize(final SerializerBuffer ser, final Target target) throws ValueSerializationException, NoSuchTypeException {
-        new CalltableSerializationEnvelopeBuilder()
-                .addField(TAG_FIELD_INDEX,  /* U8 */ new CLValueU8(getByteTag()))
+        new CalltableSerializationEnvelopeBuilder(target)
+                .addField(TAG_FIELD_INDEX,  /* U8 */ getByteTag())
                 .addField(PAYMENT_LIMITED_PAYMENT_AMOUNT_INDEX, /* U64 */ paymentAmount.longValue())
                 .addField(PAYMENT_LIMITED_GAS_PRICE_TOLERANCE_INDEX, /* U8 */(byte) gasPriceTolerance)
                 .addField(PAYMENT_LIMITED_STANDARD_PAYMENT_INDEX, /* bool */ standardPayment)
diff --git a/src/main/java/com/casper/sdk/model/transaction/pricing/PrepaidPricingMode.java b/src/main/java/com/casper/sdk/model/transaction/pricing/PrepaidPricingMode.java
index 359de8520..9220462d5 100644
--- a/src/main/java/com/casper/sdk/model/transaction/pricing/PrepaidPricingMode.java
+++ b/src/main/java/com/casper/sdk/model/transaction/pricing/PrepaidPricingMode.java
@@ -30,7 +30,7 @@ public class PrepaidPricingMode implements PricingMode {
 
     @Override
     public void serialize(SerializerBuffer ser, Target target) throws ValueSerializationException, NoSuchTypeException {
-        new CalltableSerializationEnvelopeBuilder()
+        new CalltableSerializationEnvelopeBuilder(target)
                 .addField(TAG_FIELD_INDEX,  /* U8 */getByteTag())
                 .addField(RESERVED_RECEIPT_INDEX, receipt)
                 .serialize(ser, target);
diff --git a/src/main/java/com/casper/sdk/model/transaction/scheduling/FutureEra.java b/src/main/java/com/casper/sdk/model/transaction/scheduling/FutureEra.java
index 8e9e36048..021d31212 100644
--- a/src/main/java/com/casper/sdk/model/transaction/scheduling/FutureEra.java
+++ b/src/main/java/com/casper/sdk/model/transaction/scheduling/FutureEra.java
@@ -43,7 +43,7 @@ public FutureEra(final BigInteger eraId) {
 
     @Override
     public void serialize(final SerializerBuffer ser, final Target target) throws ValueSerializationException, NoSuchTypeException {
-        new CalltableSerializationEnvelopeBuilder()
+        new CalltableSerializationEnvelopeBuilder(target)
                 .addField(TAG_FIELD_INDEX, getByteTag())
                 .addField(FUTURE_ERA_ID_INDEX, eraId)
                 .serialize(ser, target);
diff --git a/src/main/java/com/casper/sdk/model/transaction/scheduling/FutureTimestamp.java b/src/main/java/com/casper/sdk/model/transaction/scheduling/FutureTimestamp.java
index c3dca62df..51fd9f7b0 100644
--- a/src/main/java/com/casper/sdk/model/transaction/scheduling/FutureTimestamp.java
+++ b/src/main/java/com/casper/sdk/model/transaction/scheduling/FutureTimestamp.java
@@ -41,7 +41,7 @@ public Date asDate() {
 
     @Override
     public void serialize(final SerializerBuffer ser, final Target target) throws ValueSerializationException, NoSuchTypeException {
-        new CalltableSerializationEnvelopeBuilder()
+        new CalltableSerializationEnvelopeBuilder(target)
                 .addField(TAG_FIELD_INDEX, getByteTag())
                 .addField(FUTURE_TIMESTAMP_TIMESTAMP_INDEX, asDate().getTime())
                 .serialize(ser, target);
diff --git a/src/main/java/com/casper/sdk/model/transaction/scheduling/Standard.java b/src/main/java/com/casper/sdk/model/transaction/scheduling/Standard.java
index 7f8a95daa..22e33c505 100644
--- a/src/main/java/com/casper/sdk/model/transaction/scheduling/Standard.java
+++ b/src/main/java/com/casper/sdk/model/transaction/scheduling/Standard.java
@@ -23,7 +23,7 @@ public class Standard implements TransactionScheduling {
 
     @Override
     public void serialize(final SerializerBuffer ser, final Target target) throws ValueSerializationException, NoSuchTypeException {
-        new CalltableSerializationEnvelopeBuilder()
+        new CalltableSerializationEnvelopeBuilder(target)
                 .addField(TAG_FIELD_INDEX, getByteTag())
                 .serialize(ser, target);
     }
diff --git a/src/main/java/com/casper/sdk/model/transaction/target/ByHash.java b/src/main/java/com/casper/sdk/model/transaction/target/ByHash.java
index 47b16c7b4..d6846e4bd 100644
--- a/src/main/java/com/casper/sdk/model/transaction/target/ByHash.java
+++ b/src/main/java/com/casper/sdk/model/transaction/target/ByHash.java
@@ -37,7 +37,7 @@ public ByHash(String hashAddress) {
 
     @Override
     public void serialize(final SerializerBuffer ser, final Target target) throws ValueSerializationException, NoSuchTypeException {
-        new CalltableSerializationEnvelopeBuilder()
+        new CalltableSerializationEnvelopeBuilder(target)
                 .addField(0, getByteTag())
                 .addField(HASH_INDEX, hashAddress)
                 .serialize(ser, target);
diff --git a/src/main/java/com/casper/sdk/model/transaction/target/ByName.java b/src/main/java/com/casper/sdk/model/transaction/target/ByName.java
index 949288886..31b08ceff 100644
--- a/src/main/java/com/casper/sdk/model/transaction/target/ByName.java
+++ b/src/main/java/com/casper/sdk/model/transaction/target/ByName.java
@@ -30,7 +30,7 @@ public class ByName implements TransactionInvocationTarget {
 
     @Override
     public void serialize(final SerializerBuffer ser, final Target target) throws ValueSerializationException, NoSuchTypeException {
-        new CalltableSerializationEnvelopeBuilder()
+        new CalltableSerializationEnvelopeBuilder(target)
                 .addField(TAG_FIELD_INDEX, getByteTag())
                 .addField(NAME_INDEX, name)
                 .serialize(ser, target);
diff --git a/src/main/java/com/casper/sdk/model/transaction/target/ByPackageHash.java b/src/main/java/com/casper/sdk/model/transaction/target/ByPackageHash.java
index 9e535ba6d..041a7c9f3 100644
--- a/src/main/java/com/casper/sdk/model/transaction/target/ByPackageHash.java
+++ b/src/main/java/com/casper/sdk/model/transaction/target/ByPackageHash.java
@@ -40,7 +40,7 @@ public Optional<Long> getVersion() {
 
     @Override
     public void serialize(final SerializerBuffer ser, final Target target) throws ValueSerializationException, NoSuchTypeException {
-        new CalltableSerializationEnvelopeBuilder()
+        new CalltableSerializationEnvelopeBuilder(target)
                 .addField(TAG_FIELD_INDEX, getByteTag())
                 .addField(BY_PACKAGE_NAME_NAME_INDEX, addr)
                 .addOptionField(BY_PACKAGE_NAME_VERSION_INDEX, version)
diff --git a/src/main/java/com/casper/sdk/model/transaction/target/ByPackageName.java b/src/main/java/com/casper/sdk/model/transaction/target/ByPackageName.java
index 9ea79a191..7b4b07d5a 100644
--- a/src/main/java/com/casper/sdk/model/transaction/target/ByPackageName.java
+++ b/src/main/java/com/casper/sdk/model/transaction/target/ByPackageName.java
@@ -40,7 +40,7 @@ public Optional<Long> getVersion() {
 
     @Override
     public void serialize(final SerializerBuffer ser, final Target target) throws ValueSerializationException, NoSuchTypeException {
-        new CalltableSerializationEnvelopeBuilder()
+        new CalltableSerializationEnvelopeBuilder(target)
                 .addField(TAG_FIELD_INDEX, getByteTag())
                 .addField(BY_PACKAGE_NAME_NAME_INDEX, name)
                 .addOptionField(BY_PACKAGE_NAME_VERSION_INDEX, version)
diff --git a/src/main/java/com/casper/sdk/model/transaction/target/Native.java b/src/main/java/com/casper/sdk/model/transaction/target/Native.java
index fb1f19704..2e304ebd5 100644
--- a/src/main/java/com/casper/sdk/model/transaction/target/Native.java
+++ b/src/main/java/com/casper/sdk/model/transaction/target/Native.java
@@ -50,7 +50,7 @@ public int hashCode() {
 
     @Override
     public void serialize(final SerializerBuffer ser, final Target target) throws ValueSerializationException, NoSuchTypeException {
-        new CalltableSerializationEnvelopeBuilder()
+        new CalltableSerializationEnvelopeBuilder(target)
                 .addField(TAG_FIELD_INDEX, getByteTag())
                 .serialize(ser, target);
     }
diff --git a/src/main/java/com/casper/sdk/model/transaction/target/Session.java b/src/main/java/com/casper/sdk/model/transaction/target/Session.java
index 3258b34a2..c7dd0ed9a 100644
--- a/src/main/java/com/casper/sdk/model/transaction/target/Session.java
+++ b/src/main/java/com/casper/sdk/model/transaction/target/Session.java
@@ -57,7 +57,7 @@ public class Session implements TransactionTarget {
     @Override
     public void serialize(final SerializerBuffer ser, final Target target) throws ValueSerializationException, NoSuchTypeException {
 
-        new CalltableSerializationEnvelopeBuilder()
+        new CalltableSerializationEnvelopeBuilder(target)
                 .addField(TAG_FIELD_INDEX, getByteTag())
                 .addField(SESSION_IS_INSTALL_INDEX, isInstallUpgrade())
                 .addField(SESSION_RUNTIME_INDEX, getRuntime())
diff --git a/src/main/java/com/casper/sdk/model/transaction/target/Stored.java b/src/main/java/com/casper/sdk/model/transaction/target/Stored.java
index 24ba0bcd0..964455ccc 100644
--- a/src/main/java/com/casper/sdk/model/transaction/target/Stored.java
+++ b/src/main/java/com/casper/sdk/model/transaction/target/Stored.java
@@ -37,7 +37,7 @@ public class Stored implements TransactionTarget {
 
     @Override
     public void serialize(final SerializerBuffer ser, final Target target) throws ValueSerializationException, NoSuchTypeException {
-        new CalltableSerializationEnvelopeBuilder()
+        new CalltableSerializationEnvelopeBuilder(target)
                 .addField(TAG_FIELD_INDEX, getByteTag())
                 .addField(STORED_ID_INDEX, id)
                 .addField(STORED_RUNTIME_INDEX, runtime)
diff --git a/src/main/java/com/casper/sdk/model/transaction/target/TransactionRuntime.java b/src/main/java/com/casper/sdk/model/transaction/target/TransactionRuntime.java
index 574abd686..ba07ffcf8 100644
--- a/src/main/java/com/casper/sdk/model/transaction/target/TransactionRuntime.java
+++ b/src/main/java/com/casper/sdk/model/transaction/target/TransactionRuntime.java
@@ -57,7 +57,7 @@ public static TransactionRuntime fromJson(final String name) throws NoSuchTypeEx
 
     @Override
     public void serialize(final SerializerBuffer ser, final Target target) throws ValueSerializationException, NoSuchTypeException {
-        new CalltableSerializationEnvelopeBuilder()
+        new CalltableSerializationEnvelopeBuilder(target)
                 .addField(TAG_FIELD_INDEX, getByteTag())
                 .serialize(ser, target);
     }
diff --git a/src/test/java/com/casper/sdk/model/transaction/field/CalltableSerializationEnvelopeBuilderTest.java b/src/test/java/com/casper/sdk/model/transaction/field/CalltableSerializationEnvelopeBuilderTest.java
index e57da4256..9af27a493 100644
--- a/src/test/java/com/casper/sdk/model/transaction/field/CalltableSerializationEnvelopeBuilderTest.java
+++ b/src/test/java/com/casper/sdk/model/transaction/field/CalltableSerializationEnvelopeBuilderTest.java
@@ -1,5 +1,6 @@
 package com.casper.sdk.model.transaction.field;
 
+import com.casper.sdk.model.clvalue.serde.Target;
 import dev.oak3.sbs4j.DeserializerBuffer;
 import dev.oak3.sbs4j.SerializerBuffer;
 import dev.oak3.sbs4j.exception.ValueDeserializationException;
@@ -35,7 +36,7 @@ void serializeBytes() throws ValueSerializationException, ValueDeserializationEx
         ser.writeU16((short) 555);
         final byte[] fieldTwoVal = ser.toByteArray();
 
-        final CalltableSerializationEnvelopeBuilder builder = new CalltableSerializationEnvelopeBuilder();
+        final CalltableSerializationEnvelopeBuilder builder = new CalltableSerializationEnvelopeBuilder(Target.BYTE);
         builder.addFieldBytes(0, fieldZeroVal);
         builder.addFieldBytes(1, fieldOneVal);
         builder.addFieldBytes(2, fieldTwoVal);
@@ -48,7 +49,7 @@ void serializeBytes() throws ValueSerializationException, ValueDeserializationEx
         assertThat(bytes.length, is(33));
         assertThat(bytes, is(expected));
 
-        final CalltableSerializationEnvelopeBuilder deserializedBuilder = new CalltableSerializationEnvelopeBuilder();
+        final CalltableSerializationEnvelopeBuilder deserializedBuilder = new CalltableSerializationEnvelopeBuilder(Target.BYTE);
         deserializedBuilder.deserialize(new DeserializerBuffer(bytes));
 
         assertThat(deserializedBuilder.getFieldBytes(0), is(fieldZeroVal));
@@ -68,7 +69,7 @@ void serializeValues() throws Exception {
         final long fieldOneVal = 4294967295L;
         final short fieldTwoVal = 555;
 
-        final CalltableSerializationEnvelopeBuilder builder = new CalltableSerializationEnvelopeBuilder();
+        final CalltableSerializationEnvelopeBuilder builder = new CalltableSerializationEnvelopeBuilder(Target.BYTE);
         builder.addField(0, fieldZeroVal);
         builder.addField(1, (int) fieldOneVal);
         builder.addField(2, fieldTwoVal);
@@ -81,7 +82,7 @@ void serializeValues() throws Exception {
         assertThat(bytes.length, is(33));
         assertThat(bytes, is(expected));
 
-        final CalltableSerializationEnvelopeBuilder deserializedBuilder = new CalltableSerializationEnvelopeBuilder();
+        final CalltableSerializationEnvelopeBuilder deserializedBuilder = new CalltableSerializationEnvelopeBuilder(Target.BYTE);
         deserializedBuilder.deserialize(new DeserializerBuffer(bytes));
 
         assertThat(deserializedBuilder.getFieldValue(0, Byte.class), is(fieldZeroVal));