diff --git a/src/asynch/transaction/mod.rs b/src/asynch/transaction/mod.rs
index 827c458c..116a4d91 100644
--- a/src/asynch/transaction/mod.rs
+++ b/src/asynch/transaction/mod.rs
@@ -385,7 +385,7 @@ where
     T: Transaction<'a, F> + Serialize + DeserializeOwned + Clone,
 {
     let commond_fields = transaction.get_mut_common_fields();
-    commond_fields.signing_pub_key = Some(wallet.public_key.clone().into());
+    commond_fields.signing_pub_key = wallet.public_key.clone().into();
 
     validate_account_xaddress(transaction, AccountFieldType::Account)?;
     if validate_transaction_has_field(transaction, "Destination").is_ok() {
diff --git a/src/models/transactions/account_delete.rs b/src/models/transactions/account_delete.rs
index afc98177..c25ff76b 100644
--- a/src/models/transactions/account_delete.rs
+++ b/src/models/transactions/account_delete.rs
@@ -86,7 +86,7 @@ impl<'a> AccountDelete<'a> {
                 None,
                 sequence,
                 signers,
-                None,
+                "".into(),
                 source_tag,
                 ticket_sequence,
                 None,
@@ -116,7 +116,7 @@ mod test_serde {
             "rPT1Sjq2YGrBMTttX4GZHjKu9dyfzbpAYe".into(),
             Some(13),
         );
-        let default_json_str = r#"{"Account":"rWYkbWkCeg8dP6rXALnjgZSjjLyih5NXm","TransactionType":"AccountDelete","Fee":"2000000","Flags":0,"Sequence":2470665,"SigningPubKey":"","Destination":"rPT1Sjq2YGrBMTttX4GZHjKu9dyfzbpAYe","DestinationTag":13}"#;
+        let default_json_str = r#"{"Account":"rWYkbWkCeg8dP6rXALnjgZSjjLyih5NXm","TransactionType":"AccountDelete","SigningPubKey":"","Fee":"2000000","Flags":0,"Sequence":2470665,"Destination":"rPT1Sjq2YGrBMTttX4GZHjKu9dyfzbpAYe","DestinationTag":13}"#;
         // Serialize
         let default_json_value = serde_json::to_value(default_json_str).unwrap();
         let serialized_string = serde_json::to_string(&default_txn).unwrap();
diff --git a/src/models/transactions/account_set.rs b/src/models/transactions/account_set.rs
index 1b95b057..4f67d803 100644
--- a/src/models/transactions/account_set.rs
+++ b/src/models/transactions/account_set.rs
@@ -305,7 +305,7 @@ impl<'a> AccountSet<'a> {
                 None,
                 sequence,
                 signers,
-                None,
+                "".into(),
                 source_tag,
                 ticket_sequence,
                 None,
@@ -558,7 +558,7 @@ mod tests {
             None,
             None,
         );
-        let default_json_str = r#"{"Account":"rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn","TransactionType":"AccountSet","Fee":"12","Flags":0,"Sequence":5,"SigningPubKey":"","Domain":"6578616D706C652E636F6D","MessageKey":"03AB40A0490F9B7ED8DF29D246BF2D6269820A0EE7742ACDD457BEA7C7D0931EDB","SetFlag":5}"#;
+        let default_json_str = r#"{"Account":"rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn","TransactionType":"AccountSet","SigningPubKey":"","Fee":"12","Flags":0,"Sequence":5,"Domain":"6578616D706C652E636F6D","MessageKey":"03AB40A0490F9B7ED8DF29D246BF2D6269820A0EE7742ACDD457BEA7C7D0931EDB","SetFlag":5}"#;
         // Serialize
         let default_json_value = serde_json::to_value(default_json_str).unwrap();
         let serialized_string = serde_json::to_string(&default_txn).unwrap();
diff --git a/src/models/transactions/amm_bid.rs b/src/models/transactions/amm_bid.rs
index 520f561f..03e1228c 100644
--- a/src/models/transactions/amm_bid.rs
+++ b/src/models/transactions/amm_bid.rs
@@ -86,7 +86,7 @@ impl<'a> AMMBid<'_> {
                 None,
                 sequence,
                 signers,
-                None,
+                "".into(),
                 source_tag,
                 ticket_sequence,
                 None,
diff --git a/src/models/transactions/amm_create.rs b/src/models/transactions/amm_create.rs
index b0fe8d79..ecc9db1f 100644
--- a/src/models/transactions/amm_create.rs
+++ b/src/models/transactions/amm_create.rs
@@ -94,7 +94,7 @@ impl<'a> AMMCreate<'a> {
                 None,
                 sequence,
                 signers,
-                None,
+                "".into(),
                 source_tag,
                 ticket_sequence,
                 None,
diff --git a/src/models/transactions/amm_delete.rs b/src/models/transactions/amm_delete.rs
index 4afd2fc0..558e78fa 100644
--- a/src/models/transactions/amm_delete.rs
+++ b/src/models/transactions/amm_delete.rs
@@ -72,7 +72,7 @@ impl<'a> AMMDelete<'a> {
                 None,
                 sequence,
                 signers,
-                None,
+                "".into(),
                 source_tag,
                 ticket_sequence,
                 None,
diff --git a/src/models/transactions/amm_deposit.rs b/src/models/transactions/amm_deposit.rs
index 911379c9..0de583b1 100644
--- a/src/models/transactions/amm_deposit.rs
+++ b/src/models/transactions/amm_deposit.rs
@@ -126,7 +126,7 @@ impl<'a> AMMDeposit<'a> {
                 None,
                 sequence,
                 signers,
-                None,
+                "".into(),
                 source_tag,
                 ticket_sequence,
                 None,
diff --git a/src/models/transactions/amm_vote.rs b/src/models/transactions/amm_vote.rs
index f37cb749..f82ce09e 100644
--- a/src/models/transactions/amm_vote.rs
+++ b/src/models/transactions/amm_vote.rs
@@ -89,7 +89,7 @@ impl<'a> AMMVote<'a> {
                 None,
                 sequence,
                 signers,
-                None,
+                "".into(),
                 source_tag,
                 ticket_sequence,
                 None,
diff --git a/src/models/transactions/amm_withdraw.rs b/src/models/transactions/amm_withdraw.rs
index c6deaaa6..a1cfee1e 100644
--- a/src/models/transactions/amm_withdraw.rs
+++ b/src/models/transactions/amm_withdraw.rs
@@ -114,7 +114,7 @@ impl<'a> AMMWithdraw<'a> {
                 None,
                 sequence,
                 signers,
-                None,
+                "".into(),
                 source_tag,
                 ticket_sequence,
                 None,
diff --git a/src/models/transactions/check_cancel.rs b/src/models/transactions/check_cancel.rs
index 3f814261..48b2cb03 100644
--- a/src/models/transactions/check_cancel.rs
+++ b/src/models/transactions/check_cancel.rs
@@ -80,7 +80,7 @@ impl<'a> CheckCancel<'a> {
                 None,
                 sequence,
                 signers,
-                None,
+                "".into(),
                 source_tag,
                 ticket_sequence,
                 None,
@@ -108,7 +108,7 @@ mod tests {
             None,
             "49647F0D748DC3FE26BDACBC57F251AADEFFF391403EC9BF87C97F67E9977FB0".into(),
         );
-        let default_json_str = r#"{"Account":"rUn84CUYbNjRoTQ6mSW7BVJPSVJNLb1QLo","TransactionType":"CheckCancel","Fee":"12","Flags":0,"SigningPubKey":"","CheckID":"49647F0D748DC3FE26BDACBC57F251AADEFFF391403EC9BF87C97F67E9977FB0"}"#;
+        let default_json_str = r#"{"Account":"rUn84CUYbNjRoTQ6mSW7BVJPSVJNLb1QLo","TransactionType":"CheckCancel","SigningPubKey":"","Fee":"12","Flags":0,"CheckID":"49647F0D748DC3FE26BDACBC57F251AADEFFF391403EC9BF87C97F67E9977FB0"}"#;
         // Serialize
         let default_json_value = serde_json::to_value(default_json_str).unwrap();
         let serialized_string = serde_json::to_string(&default_txn).unwrap();
diff --git a/src/models/transactions/check_cash.rs b/src/models/transactions/check_cash.rs
index 9b832261..818d6528 100644
--- a/src/models/transactions/check_cash.rs
+++ b/src/models/transactions/check_cash.rs
@@ -109,7 +109,7 @@ impl<'a> CheckCash<'a> {
                 None,
                 sequence,
                 signers,
-                None,
+                "".into(),
                 source_tag,
                 ticket_sequence,
                 None,
@@ -176,7 +176,7 @@ mod tests {
             Some("100000000".into()),
             None,
         );
-        let default_json_str = r#"{"Account":"rfkE1aSy9G8Upk4JssnwBxhEv5p4mn2KTy","TransactionType":"CheckCash","Fee":"12","Flags":0,"SigningPubKey":"","CheckID":"838766BA2B995C00744175F69A1B11E32C3DBC40E64801A4056FCBD657F57334","Amount":"100000000"}"#;
+        let default_json_str = r#"{"Account":"rfkE1aSy9G8Upk4JssnwBxhEv5p4mn2KTy","TransactionType":"CheckCash","SigningPubKey":"","Fee":"12","Flags":0,"CheckID":"838766BA2B995C00744175F69A1B11E32C3DBC40E64801A4056FCBD657F57334","Amount":"100000000"}"#;
         // Serialize
         let default_json_value = serde_json::to_value(default_json_str).unwrap();
         let serialized_string = serde_json::to_string(&default_txn).unwrap();
diff --git a/src/models/transactions/check_create.rs b/src/models/transactions/check_create.rs
index 61e7484c..f52e1bc4 100644
--- a/src/models/transactions/check_create.rs
+++ b/src/models/transactions/check_create.rs
@@ -95,7 +95,7 @@ impl<'a> CheckCreate<'a> {
                 None,
                 sequence,
                 signers,
-                None,
+                "".into(),
                 source_tag,
                 ticket_sequence,
                 None,
@@ -131,7 +131,7 @@ mod tests {
             Some(570113521),
             Some("6F1DFD1D0FE8A32E40E1F2C05CF1C15545BAB56B617F9C6C2D63A6B704BEF59B".into()),
         );
-        let default_json_str = r#"{"Account":"rUn84CUYbNjRoTQ6mSW7BVJPSVJNLb1QLo","TransactionType":"CheckCreate","Fee":"12","Flags":0,"SigningPubKey":"","Destination":"rfkE1aSy9G8Upk4JssnwBxhEv5p4mn2KTy","SendMax":"100000000","DestinationTag":1,"Expiration":570113521,"InvoiceID":"6F1DFD1D0FE8A32E40E1F2C05CF1C15545BAB56B617F9C6C2D63A6B704BEF59B"}"#;
+        let default_json_str = r#"{"Account":"rUn84CUYbNjRoTQ6mSW7BVJPSVJNLb1QLo","TransactionType":"CheckCreate","SigningPubKey":"","Fee":"12","Flags":0,"Destination":"rfkE1aSy9G8Upk4JssnwBxhEv5p4mn2KTy","SendMax":"100000000","DestinationTag":1,"Expiration":570113521,"InvoiceID":"6F1DFD1D0FE8A32E40E1F2C05CF1C15545BAB56B617F9C6C2D63A6B704BEF59B"}"#;
         // Serialize
         let default_json_value = serde_json::to_value(default_json_str).unwrap();
         let serialized_string = serde_json::to_string(&default_txn).unwrap();
diff --git a/src/models/transactions/deposit_preauth.rs b/src/models/transactions/deposit_preauth.rs
index e8bd5993..da5d42a3 100644
--- a/src/models/transactions/deposit_preauth.rs
+++ b/src/models/transactions/deposit_preauth.rs
@@ -99,7 +99,7 @@ impl<'a> DepositPreauth<'a> {
                 None,
                 sequence,
                 signers,
-                None,
+                "".into(),
                 source_tag,
                 ticket_sequence,
                 None,
@@ -164,7 +164,7 @@ mod tests {
             Some("rEhxGqkqPPSxQ3P25J66ft5TwpzV14k2de".into()),
             None,
         );
-        let default_json_str = r#"{"Account":"rsUiUMpnrgxQp24dJYZDhmV4bE3aBtQyt8","TransactionType":"DepositPreauth","Fee":"10","Flags":0,"Sequence":2,"SigningPubKey":"","Authorize":"rEhxGqkqPPSxQ3P25J66ft5TwpzV14k2de"}"#;
+        let default_json_str = r#"{"Account":"rsUiUMpnrgxQp24dJYZDhmV4bE3aBtQyt8","TransactionType":"DepositPreauth","SigningPubKey":"","Fee":"10","Flags":0,"Sequence":2,"Authorize":"rEhxGqkqPPSxQ3P25J66ft5TwpzV14k2de"}"#;
         // Serialize
         let default_json_value = serde_json::to_value(default_json_str).unwrap();
         let serialized_string = serde_json::to_string(&default_txn).unwrap();
diff --git a/src/models/transactions/escrow_cancel.rs b/src/models/transactions/escrow_cancel.rs
index e307ed58..b57279a8 100644
--- a/src/models/transactions/escrow_cancel.rs
+++ b/src/models/transactions/escrow_cancel.rs
@@ -80,7 +80,7 @@ impl<'a> EscrowCancel<'a> {
                 None,
                 sequence,
                 signers,
-                None,
+                "".into(),
                 source_tag,
                 ticket_sequence,
                 None,
@@ -110,7 +110,7 @@ mod tests {
             "rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn".into(),
             7,
         );
-        let default_json_str = r#"{"Account":"rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn","TransactionType":"EscrowCancel","Flags":0,"SigningPubKey":"","Owner":"rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn","OfferSequence":7}"#;
+        let default_json_str = r#"{"Account":"rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn","TransactionType":"EscrowCancel","SigningPubKey":"","Flags":0,"Owner":"rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn","OfferSequence":7}"#;
         // Serialize
         let default_json_value = serde_json::to_value(default_json_str).unwrap();
         let serialized_string = serde_json::to_string(&default_txn).unwrap();
diff --git a/src/models/transactions/escrow_create.rs b/src/models/transactions/escrow_create.rs
index 8ee31493..33f4b27b 100644
--- a/src/models/transactions/escrow_create.rs
+++ b/src/models/transactions/escrow_create.rs
@@ -125,7 +125,7 @@ impl<'a> EscrowCreate<'a> {
                 None,
                 sequence,
                 signers,
-                None,
+                "".into(),
                 source_tag,
                 ticket_sequence,
                 None,
@@ -207,7 +207,7 @@ mod tests {
             Some(23480),
             Some(533171558),
         );
-        let default_json_str = r#"{"Account":"rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn","TransactionType":"EscrowCreate","Flags":0,"SigningPubKey":"","SourceTag":11747,"Amount":"10000","Destination":"rsA2LpzuawewSBQXkiju3YQTMzW13pAAdW","DestinationTag":23480,"CancelAfter":533257958,"FinishAfter":533171558,"Condition":"A0258020E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855810100"}"#;
+        let default_json_str = r#"{"Account":"rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn","TransactionType":"EscrowCreate","SigningPubKey":"","Flags":0,"SourceTag":11747,"Amount":"10000","Destination":"rsA2LpzuawewSBQXkiju3YQTMzW13pAAdW","DestinationTag":23480,"CancelAfter":533257958,"FinishAfter":533171558,"Condition":"A0258020E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855810100"}"#;
         // Serialize
         let default_json_value = serde_json::to_value(default_json_str).unwrap();
         let serialized_string = serde_json::to_string(&default_txn).unwrap();
diff --git a/src/models/transactions/escrow_finish.rs b/src/models/transactions/escrow_finish.rs
index 1cb74129..40e53513 100644
--- a/src/models/transactions/escrow_finish.rs
+++ b/src/models/transactions/escrow_finish.rs
@@ -109,7 +109,7 @@ impl<'a> EscrowFinish<'a> {
                 None,
                 sequence,
                 signers,
-                None,
+                "".into(),
                 source_tag,
                 ticket_sequence,
                 None,
diff --git a/src/models/transactions/mod.rs b/src/models/transactions/mod.rs
index 22043760..f2edaf93 100644
--- a/src/models/transactions/mod.rs
+++ b/src/models/transactions/mod.rs
@@ -108,27 +108,6 @@ pub enum TransactionType {
     UNLModify,
 }
 
-#[derive(Debug, Serialize, Deserialize, PartialEq, Eq, Clone, new)]
-#[serde(rename_all = "PascalCase")]
-pub struct PreparedTransaction<'a, T> {
-    #[serde(flatten)]
-    pub transaction: T,
-    /// Hex representation of the public key that corresponds to the
-    /// private key used to sign this transaction. If an empty string,
-    /// indicates a multi-signature is present in the Signers field instead.
-    pub signing_pub_key: Cow<'a, str>,
-}
-
-#[derive(Debug, Serialize, Deserialize, PartialEq, Eq, Clone, new)]
-#[serde(rename_all = "PascalCase")]
-pub struct SignedTransaction<'a, T> {
-    #[serde(flatten)]
-    pub prepared_transaction: PreparedTransaction<'a, T>,
-    /// The signature that verifies this transaction as originating
-    /// from the account it says it is from.
-    pub txn_signature: Cow<'a, str>,
-}
-
 /// The base fields for all transaction models.
 ///
 /// See Transaction Common Fields:
@@ -147,6 +126,11 @@ where
     /// See Transaction Types:
     /// `<https://xrpl.org/transaction-types.html>`
     pub transaction_type: TransactionType,
+    /// Hex representation of the public key that corresponds to the
+    /// private key used to sign this transaction. If an empty string,
+    /// indicates a multi-signature is present in the Signers field instead.
+    #[serde(default)]
+    pub signing_pub_key: Cow<'a, str>,
     /// Hash value identifying another transaction. If provided, this
     /// transaction is only valid if the sending account's
     /// previously-sent transaction matches the provided hash.
@@ -182,10 +166,6 @@ where
     /// made. Conventionally, a refund should specify the initial
     /// payment's SourceTag as the refund payment's DestinationTag.
     pub signers: Option<Vec<Signer>>,
-    /// Hex representation of the public key that corresponds to the
-    /// private key used to sign this transaction. If an empty string,
-    /// indicates a multi-signature is present in the Signers field instead.
-    pub signing_pub_key: Option<Cow<'a, str>>,
     /// Arbitrary integer used to identify the reason for this
     /// payment, or a sender on whose behalf this transaction
     /// is made. Conventionally, a refund should specify the initial
@@ -215,7 +195,7 @@ where
         network_id: Option<u32>,
         sequence: Option<u32>,
         signers: Option<Vec<Signer>>,
-        signing_pub_key: Option<Cow<'a, str>>,
+        signing_pub_key: Cow<'a, str>,
         source_tag: Option<u32>,
         ticket_sequence: Option<u32>,
         txn_signature: Option<Cow<'a, str>>,
@@ -231,7 +211,7 @@ where
             network_id,
             sequence,
             signers,
-            signing_pub_key: Some(signing_pub_key.unwrap_or("".into())),
+            signing_pub_key,
             source_tag,
             ticket_sequence,
             txn_signature,
@@ -249,7 +229,7 @@ where
                 .iter()
                 .all(|signer| signer.txn_signature.len() > 0 && signer.signing_pub_key.len() > 0)
         } else {
-            self.txn_signature.is_some() && self.signing_pub_key.is_some()
+            self.txn_signature.is_some() && !self.signing_pub_key.is_empty()
         }
     }
 }
@@ -349,7 +329,7 @@ where
 
     fn is_signed(&self) -> bool {
         self.get_common_fields().txn_signature.is_some()
-            && self.get_common_fields().signing_pub_key.is_some()
+            && !self.get_common_fields().signing_pub_key.is_empty()
     }
 
     /// Hashes the Transaction object as the ledger does. Only valid for signed
diff --git a/src/models/transactions/nftoken_accept_offer.rs b/src/models/transactions/nftoken_accept_offer.rs
index d4c6f991..d291a1f8 100644
--- a/src/models/transactions/nftoken_accept_offer.rs
+++ b/src/models/transactions/nftoken_accept_offer.rs
@@ -132,7 +132,7 @@ impl<'a> NFTokenAcceptOffer<'a> {
                 None,
                 sequence,
                 signers,
-                None,
+                "".into(),
                 source_tag,
                 ticket_sequence,
                 None,
@@ -246,7 +246,7 @@ mod tests {
             None,
             None,
         );
-        let default_json_str = r#"{"Account":"r9spUPhPBfB6kQeF6vPhwmtFwRhBh2JUCG","TransactionType":"NFTokenAcceptOffer","Fee":"12","Flags":0,"LastLedgerSequence":75447550,"Memos":[{"Memo":{"MemoData":"61356534373538372D633134322D346663382D616466362D393666383562356435386437","MemoFormat":null,"MemoType":null}}],"Sequence":68549302,"SigningPubKey":"","NFTokenSellOffer":"68CD1F6F906494EA08C9CB5CAFA64DFA90D4E834B7151899B73231DE5A0C3B77"}"#;
+        let default_json_str = r#"{"Account":"r9spUPhPBfB6kQeF6vPhwmtFwRhBh2JUCG","TransactionType":"NFTokenAcceptOffer","SigningPubKey":"","Fee":"12","Flags":0,"LastLedgerSequence":75447550,"Memos":[{"Memo":{"MemoData":"61356534373538372D633134322D346663382D616466362D393666383562356435386437","MemoFormat":null,"MemoType":null}}],"Sequence":68549302,"NFTokenSellOffer":"68CD1F6F906494EA08C9CB5CAFA64DFA90D4E834B7151899B73231DE5A0C3B77"}"#;
         // Serialize
         let default_json_value = serde_json::to_value(default_json_str).unwrap();
         let serialized_string = serde_json::to_string(&default_txn).unwrap();
diff --git a/src/models/transactions/nftoken_burn.rs b/src/models/transactions/nftoken_burn.rs
index 33e9a546..4b13767a 100644
--- a/src/models/transactions/nftoken_burn.rs
+++ b/src/models/transactions/nftoken_burn.rs
@@ -88,7 +88,7 @@ impl<'a> NFTokenBurn<'a> {
                 None,
                 sequence,
                 signers,
-                None,
+                "".into(),
                 source_tag,
                 ticket_sequence,
                 None,
@@ -118,7 +118,7 @@ mod tests {
             "000B013A95F14B0044F78A264E41713C64B5F89242540EE208C3098E00000D65".into(),
             Some("rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs59B".into()),
         );
-        let default_json_str = r#"{"Account":"rNCFjv8Ek5oDrNiMJ3pw6eLLFtMjZLJnf2","TransactionType":"NFTokenBurn","Fee":"10","Flags":0,"SigningPubKey":"","NFTokenID":"000B013A95F14B0044F78A264E41713C64B5F89242540EE208C3098E00000D65","Owner":"rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs59B"}"#;
+        let default_json_str = r#"{"Account":"rNCFjv8Ek5oDrNiMJ3pw6eLLFtMjZLJnf2","TransactionType":"NFTokenBurn","SigningPubKey":"","Fee":"10","Flags":0,"NFTokenID":"000B013A95F14B0044F78A264E41713C64B5F89242540EE208C3098E00000D65","Owner":"rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs59B"}"#;
         // Serialize
         let default_json_value = serde_json::to_value(default_json_str).unwrap();
         let serialized_string = serde_json::to_string(&default_txn).unwrap();
diff --git a/src/models/transactions/nftoken_cancel_offer.rs b/src/models/transactions/nftoken_cancel_offer.rs
index e48ecd58..4491acae 100644
--- a/src/models/transactions/nftoken_cancel_offer.rs
+++ b/src/models/transactions/nftoken_cancel_offer.rs
@@ -106,7 +106,7 @@ impl<'a> NFTokenCancelOffer<'a> {
                 None,
                 sequence,
                 signers,
-                None,
+                "".into(),
                 source_tag,
                 ticket_sequence,
                 None,
@@ -171,7 +171,7 @@ mod tests {
             None,
             vec!["9C92E061381C1EF37A8CDE0E8FC35188BFC30B1883825042A64309AC09F4C36D".into()],
         );
-        let default_json_str = r#"{"Account":"ra5nK24KXen9AHvsdFTKHSANinZseWnPcX","TransactionType":"NFTokenCancelOffer","Flags":0,"SigningPubKey":"","NFTokenOffers":["9C92E061381C1EF37A8CDE0E8FC35188BFC30B1883825042A64309AC09F4C36D"]}"#;
+        let default_json_str = r#"{"Account":"ra5nK24KXen9AHvsdFTKHSANinZseWnPcX","TransactionType":"NFTokenCancelOffer","SigningPubKey":"","Flags":0,"NFTokenOffers":["9C92E061381C1EF37A8CDE0E8FC35188BFC30B1883825042A64309AC09F4C36D"]}"#;
         // Serialize
         let default_json_value = serde_json::to_value(default_json_str).unwrap();
         let serialized_string = serde_json::to_string(&default_txn).unwrap();
diff --git a/src/models/transactions/nftoken_create_offer.rs b/src/models/transactions/nftoken_create_offer.rs
index 7295b7be..e106b7ad 100644
--- a/src/models/transactions/nftoken_create_offer.rs
+++ b/src/models/transactions/nftoken_create_offer.rs
@@ -189,7 +189,7 @@ impl<'a> NFTokenCreateOffer<'a> {
                 None,
                 sequence,
                 signers,
-                None,
+                "".into(),
                 source_tag,
                 ticket_sequence,
                 None,
@@ -351,7 +351,7 @@ mod tests {
             None,
             None,
         );
-        let default_json_str = r#"{"Account":"rs8jBmmfpwgmrSPgwMsh7CvKRmRt1JTVSX","TransactionType":"NFTokenCreateOffer","Flags":1,"SigningPubKey":"","NFTokenID":"000100001E962F495F07A990F4ED55ACCFEEF365DBAA76B6A048C0A200000007","Amount":"1000000"}"#;
+        let default_json_str = r#"{"Account":"rs8jBmmfpwgmrSPgwMsh7CvKRmRt1JTVSX","TransactionType":"NFTokenCreateOffer","SigningPubKey":"","Flags":1,"NFTokenID":"000100001E962F495F07A990F4ED55ACCFEEF365DBAA76B6A048C0A200000007","Amount":"1000000"}"#;
         // Serialize
         let default_json_value = serde_json::to_value(default_json_str).unwrap();
         let serialized_string = serde_json::to_string(&default_txn).unwrap();
diff --git a/src/models/transactions/nftoken_mint.rs b/src/models/transactions/nftoken_mint.rs
index d76e2bb4..5617047f 100644
--- a/src/models/transactions/nftoken_mint.rs
+++ b/src/models/transactions/nftoken_mint.rs
@@ -193,7 +193,7 @@ impl<'a> NFTokenMint<'a> {
                 None,
                 sequence,
                 signers,
-                None,
+                "".into(),
                 source_tag,
                 ticket_sequence,
                 None,
@@ -321,7 +321,7 @@ mod tests {
             Some(314),
             Some("697066733A2F2F62616679626569676479727A74357366703775646D37687537367568377932366E6634646675796C71616266336F636C67747179353566627A6469".into()),
         );
-        let default_json_str = r#"{"Account":"rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs59B","TransactionType":"NFTokenMint","Fee":"10","Flags":8,"Memos":[{"Memo":{"MemoData":"72656E74","MemoFormat":null,"MemoType":"687474703A2F2F6578616D706C652E636F6D2F6D656D6F2F67656E65726963"}}],"SigningPubKey":"","NFTokenTaxon":0,"TransferFee":314,"URI":"697066733A2F2F62616679626569676479727A74357366703775646D37687537367568377932366E6634646675796C71616266336F636C67747179353566627A6469"}"#;
+        let default_json_str = r#"{"Account":"rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs59B","TransactionType":"NFTokenMint","SigningPubKey":"","Fee":"10","Flags":8,"Memos":[{"Memo":{"MemoData":"72656E74","MemoFormat":null,"MemoType":"687474703A2F2F6578616D706C652E636F6D2F6D656D6F2F67656E65726963"}}],"NFTokenTaxon":0,"TransferFee":314,"URI":"697066733A2F2F62616679626569676479727A74357366703775646D37687537367568377932366E6634646675796C71616266336F636C67747179353566627A6469"}"#;
         // Serialize
         let default_json_value = serde_json::to_value(default_json_str).unwrap();
         let serialized_string = serde_json::to_string(&default_txn).unwrap();
diff --git a/src/models/transactions/offer_cancel.rs b/src/models/transactions/offer_cancel.rs
index 361fc51d..2fae4e1a 100644
--- a/src/models/transactions/offer_cancel.rs
+++ b/src/models/transactions/offer_cancel.rs
@@ -82,7 +82,7 @@ impl<'a> OfferCancel<'a> {
                 None,
                 sequence,
                 signers,
-                None,
+                "".into(),
                 source_tag,
                 ticket_sequence,
                 None,
@@ -110,7 +110,7 @@ mod tests {
             None,
             6,
         );
-        let default_json_str = r#"{"Account":"ra5nK24KXen9AHvsdFTKHSANinZseWnPcX","TransactionType":"OfferCancel","Fee":"12","Flags":0,"LastLedgerSequence":7108629,"Sequence":7,"SigningPubKey":"","OfferSequence":6}"#;
+        let default_json_str = r#"{"Account":"ra5nK24KXen9AHvsdFTKHSANinZseWnPcX","TransactionType":"OfferCancel","SigningPubKey":"","Fee":"12","Flags":0,"LastLedgerSequence":7108629,"Sequence":7,"OfferSequence":6}"#;
         // Serialize
         let default_json_value = serde_json::to_value(default_json_str).unwrap();
         let serialized_string = serde_json::to_string(&default_txn).unwrap();
diff --git a/src/models/transactions/offer_create.rs b/src/models/transactions/offer_create.rs
index ad6e4995..1abcaa67 100644
--- a/src/models/transactions/offer_create.rs
+++ b/src/models/transactions/offer_create.rs
@@ -128,7 +128,7 @@ impl<'a> OfferCreate<'a> {
                 None,
                 sequence,
                 signers,
-                None,
+                "".into(),
                 source_tag,
                 ticket_sequence,
                 None,
@@ -230,7 +230,7 @@ mod tests {
             None,
             None,
         );
-        let default_json_str = r#"{"Account":"ra5nK24KXen9AHvsdFTKHSANinZseWnPcX","TransactionType":"OfferCreate","Fee":"12","Flags":0,"LastLedgerSequence":7108682,"Sequence":8,"SigningPubKey":"","TakerGets":"6000000","TakerPays":{"currency":"GKO","issuer":"ruazs5h1qEsqpke88pcqnaseXdm6od2xc","value":"2"}}"#;
+        let default_json_str = r#"{"Account":"ra5nK24KXen9AHvsdFTKHSANinZseWnPcX","TransactionType":"OfferCreate","SigningPubKey":"","Fee":"12","Flags":0,"LastLedgerSequence":7108682,"Sequence":8,"TakerGets":"6000000","TakerPays":{"currency":"GKO","issuer":"ruazs5h1qEsqpke88pcqnaseXdm6od2xc","value":"2"}}"#;
         // Serialize
         let default_json_value = serde_json::to_value(default_json_str).unwrap();
         let serialized_string = serde_json::to_string(&default_txn).unwrap();
diff --git a/src/models/transactions/payment.rs b/src/models/transactions/payment.rs
index 374880a7..32660126 100644
--- a/src/models/transactions/payment.rs
+++ b/src/models/transactions/payment.rs
@@ -219,7 +219,7 @@ impl<'a> Payment<'a> {
                 None,
                 sequence,
                 signers,
-                None,
+                "".into(),
                 source_tag,
                 ticket_sequence,
                 None,
@@ -406,7 +406,7 @@ mod tests {
             None,
             None,
         );
-        let default_json_str = r#"{"Account":"rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn","TransactionType":"Payment","Fee":"12","Flags":131072,"Sequence":2,"SigningPubKey":"","Amount":{"currency":"USD","issuer":"rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn","value":"1"},"Destination":"ra5nK24KXen9AHvsdFTKHSANinZseWnPcX"}"#;
+        let default_json_str = r#"{"Account":"rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn","TransactionType":"Payment","SigningPubKey":"","Fee":"12","Flags":131072,"Sequence":2,"Amount":{"currency":"USD","issuer":"rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn","value":"1"},"Destination":"ra5nK24KXen9AHvsdFTKHSANinZseWnPcX"}"#;
         // Serialize
         let default_json_value = serde_json::to_value(default_json_str).unwrap();
         let serialized_string = serde_json::to_string(&default_txn).unwrap();
diff --git a/src/models/transactions/payment_channel_claim.rs b/src/models/transactions/payment_channel_claim.rs
index f430c293..6e1668a8 100644
--- a/src/models/transactions/payment_channel_claim.rs
+++ b/src/models/transactions/payment_channel_claim.rs
@@ -138,7 +138,7 @@ impl<'a> PaymentChannelClaim<'a> {
                 None,
                 sequence,
                 signers,
-                None,
+                "".into(),
                 source_tag,
                 ticket_sequence,
                 None,
@@ -175,7 +175,7 @@ mod tests {
             Some("32D2471DB72B27E3310F355BB33E339BF26F8392D5A93D3BC0FC3B566612DA0F0A".into()),
             Some("30440220718D264EF05CAED7C781FF6DE298DCAC68D002562C9BF3A07C1E721B420C0DAB02203A5A4779EF4D2CCC7BC3EF886676D803A9981B928D3B8ACA483B80ECA3CD7B9B".into()),
         );
-        let default_json_str = r#"{"Account":"ra5nK24KXen9AHvsdFTKHSANinZseWnPcX","TransactionType":"PaymentChannelClaim","Flags":0,"SigningPubKey":"","Channel":"C1AE6DDDEEC05CF2978C0BAD6FE302948E9533691DC749DCDD3B9E5992CA6198","Balance":"1000000","Amount":"1000000","Signature":"30440220718D264EF05CAED7C781FF6DE298DCAC68D002562C9BF3A07C1E721B420C0DAB02203A5A4779EF4D2CCC7BC3EF886676D803A9981B928D3B8ACA483B80ECA3CD7B9B","PublicKey":"32D2471DB72B27E3310F355BB33E339BF26F8392D5A93D3BC0FC3B566612DA0F0A"}"#;
+        let default_json_str = r#"{"Account":"ra5nK24KXen9AHvsdFTKHSANinZseWnPcX","TransactionType":"PaymentChannelClaim","SigningPubKey":"","Flags":0,"Channel":"C1AE6DDDEEC05CF2978C0BAD6FE302948E9533691DC749DCDD3B9E5992CA6198","Balance":"1000000","Amount":"1000000","Signature":"30440220718D264EF05CAED7C781FF6DE298DCAC68D002562C9BF3A07C1E721B420C0DAB02203A5A4779EF4D2CCC7BC3EF886676D803A9981B928D3B8ACA483B80ECA3CD7B9B","PublicKey":"32D2471DB72B27E3310F355BB33E339BF26F8392D5A93D3BC0FC3B566612DA0F0A"}"#;
         // Serialize
         let default_json_value = serde_json::to_value(default_json_str).unwrap();
         let serialized_string = serde_json::to_string(&default_txn).unwrap();
diff --git a/src/models/transactions/payment_channel_create.rs b/src/models/transactions/payment_channel_create.rs
index b5079734..4fc8fe2c 100644
--- a/src/models/transactions/payment_channel_create.rs
+++ b/src/models/transactions/payment_channel_create.rs
@@ -104,7 +104,7 @@ impl<'a> PaymentChannelCreate<'a> {
                 None,
                 sequence,
                 signers,
-                None,
+                "".into(),
                 source_tag,
                 ticket_sequence,
                 None,
@@ -142,7 +142,7 @@ mod tests {
             Some(533171558),
             Some(23480),
         );
-        let default_json_str = r#"{"Account":"rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn","TransactionType":"PaymentChannelCreate","Flags":0,"SigningPubKey":"","SourceTag":11747,"Amount":"10000","Destination":"rsA2LpzuawewSBQXkiju3YQTMzW13pAAdW","SettleDelay":86400,"PublicKey":"32D2471DB72B27E3310F355BB33E339BF26F8392D5A93D3BC0FC3B566612DA0F0A","CancelAfter":533171558,"DestinationTag":23480}"#;
+        let default_json_str = r#"{"Account":"rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn","TransactionType":"PaymentChannelCreate","SigningPubKey":"","Flags":0,"SourceTag":11747,"Amount":"10000","Destination":"rsA2LpzuawewSBQXkiju3YQTMzW13pAAdW","SettleDelay":86400,"PublicKey":"32D2471DB72B27E3310F355BB33E339BF26F8392D5A93D3BC0FC3B566612DA0F0A","CancelAfter":533171558,"DestinationTag":23480}"#;
         // Serialize
         let default_json_value = serde_json::to_value(default_json_str).unwrap();
         let serialized_string = serde_json::to_string(&default_txn).unwrap();
diff --git a/src/models/transactions/payment_channel_fund.rs b/src/models/transactions/payment_channel_fund.rs
index ec268787..ec4040ee 100644
--- a/src/models/transactions/payment_channel_fund.rs
+++ b/src/models/transactions/payment_channel_fund.rs
@@ -93,7 +93,7 @@ impl<'a> PaymentChannelFund<'a> {
                 None,
                 sequence,
                 signers,
-                None,
+                "".into(),
                 source_tag,
                 ticket_sequence,
                 None,
@@ -127,7 +127,7 @@ mod tests {
             "C1AE6DDDEEC05CF2978C0BAD6FE302948E9533691DC749DCDD3B9E5992CA6198".into(),
             Some(543171558),
         );
-        let default_json_str = r#"{"Account":"rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn","TransactionType":"PaymentChannelFund","Flags":0,"SigningPubKey":"","Amount":"200000","Channel":"C1AE6DDDEEC05CF2978C0BAD6FE302948E9533691DC749DCDD3B9E5992CA6198","Expiration":543171558}"#;
+        let default_json_str = r#"{"Account":"rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn","TransactionType":"PaymentChannelFund","SigningPubKey":"","Flags":0,"Amount":"200000","Channel":"C1AE6DDDEEC05CF2978C0BAD6FE302948E9533691DC749DCDD3B9E5992CA6198","Expiration":543171558}"#;
         // Serialize
         let default_json_value = serde_json::to_value(default_json_str).unwrap();
         let serialized_string = serde_json::to_string(&default_txn).unwrap();
diff --git a/src/models/transactions/pseudo_transactions/enable_amendment.rs b/src/models/transactions/pseudo_transactions/enable_amendment.rs
index 8f739fda..12a86503 100644
--- a/src/models/transactions/pseudo_transactions/enable_amendment.rs
+++ b/src/models/transactions/pseudo_transactions/enable_amendment.rs
@@ -88,7 +88,7 @@ impl<'a> EnableAmendment<'a> {
         Self {
             common_fields: CommonFields::new(
                 account,
-                 TransactionType::EnableAmendment,
+                TransactionType::EnableAmendment,
                 account_txn_id,
                 fee,
                 Some(flags.unwrap_or_default()),
@@ -97,7 +97,7 @@ impl<'a> EnableAmendment<'a> {
                 None,
                 sequence,
                 signers,
-                None,
+                "".into(),
                 source_tag,
                 ticket_sequence,
                 None,
diff --git a/src/models/transactions/pseudo_transactions/set_fee.rs b/src/models/transactions/pseudo_transactions/set_fee.rs
index 719875ad..b30c747c 100644
--- a/src/models/transactions/pseudo_transactions/set_fee.rs
+++ b/src/models/transactions/pseudo_transactions/set_fee.rs
@@ -75,7 +75,7 @@ impl<'a> SetFee<'a> {
         Self {
             common_fields: CommonFields::new(
                 account,
-                 TransactionType::SetFee,
+                TransactionType::SetFee,
                 account_txn_id,
                 fee,
                 Some(FlagCollection::default()),
@@ -84,7 +84,7 @@ impl<'a> SetFee<'a> {
                 None,
                 sequence,
                 signers,
-                None,
+                "".into(),
                 source_tag,
                 ticket_sequence,
                 None,
diff --git a/src/models/transactions/pseudo_transactions/unl_modify.rs b/src/models/transactions/pseudo_transactions/unl_modify.rs
index 59c5bc67..8c6aeda9 100644
--- a/src/models/transactions/pseudo_transactions/unl_modify.rs
+++ b/src/models/transactions/pseudo_transactions/unl_modify.rs
@@ -91,7 +91,7 @@ impl<'a> UNLModify<'a> {
                 None,
                 sequence,
                 signers,
-                None,
+                "".into(),
                 source_tag,
                 ticket_sequence,
                 None,
diff --git a/src/models/transactions/set_regular_key.rs b/src/models/transactions/set_regular_key.rs
index fc2d6e45..e3e8f46b 100644
--- a/src/models/transactions/set_regular_key.rs
+++ b/src/models/transactions/set_regular_key.rs
@@ -77,7 +77,7 @@ impl<'a> SetRegularKey<'a> {
         Self {
             common_fields: CommonFields::new(
                 account,
-                 TransactionType::SetRegularKey,
+                TransactionType::SetRegularKey,
                 account_txn_id,
                 fee,
                 Some(FlagCollection::default()),
@@ -86,7 +86,7 @@ impl<'a> SetRegularKey<'a> {
                 None,
                 sequence,
                 signers,
-                None,
+                "".into(),
                 source_tag,
                 ticket_sequence,
                 None,
@@ -114,7 +114,7 @@ mod tests {
             None,
             Some("rAR8rR8sUkBoCZFawhkWzY4Y5YoyuznwD".into()),
         );
-        let default_json_str = r#"{"Account":"rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn","TransactionType":"SetRegularKey","Fee":"12","Flags":0,"SigningPubKey":"","RegularKey":"rAR8rR8sUkBoCZFawhkWzY4Y5YoyuznwD"}"#;
+        let default_json_str = r#"{"Account":"rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn","TransactionType":"SetRegularKey","SigningPubKey":"","Fee":"12","Flags":0,"RegularKey":"rAR8rR8sUkBoCZFawhkWzY4Y5YoyuznwD"}"#;
         // Serialize
         let default_json_value = serde_json::to_value(default_json_str).unwrap();
         let serialized_string = serde_json::to_string(&default_txn).unwrap();
diff --git a/src/models/transactions/signer_list_set.rs b/src/models/transactions/signer_list_set.rs
index e2780347..c46ee58f 100644
--- a/src/models/transactions/signer_list_set.rs
+++ b/src/models/transactions/signer_list_set.rs
@@ -198,7 +198,7 @@ impl<'a> SignerListSet<'a> {
                 None,
                 sequence,
                 signers,
-                None,
+                "".into(),
                 source_tag,
                 ticket_sequence,
                 None,
@@ -397,7 +397,7 @@ mod tests {
                 SignerEntry::new("raKEEVSGnKSD9Zyvxu4z6Pqpm4ABH8FS6n".to_string(), 1),
             ]),
         );
-        let default_json_str = r#"{"Account":"rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn","TransactionType":"SignerListSet","Fee":"12","Flags":0,"SigningPubKey":"","SignerQuorum":3,"SignerEntries":[{"SignerEntry":{"Account":"rsA2LpzuawewSBQXkiju3YQTMzW13pAAdW","SignerWeight":2}},{"SignerEntry":{"Account":"rUpy3eEg8rqjqfUoLeBnZkscbKbFsKXC3v","SignerWeight":1}},{"SignerEntry":{"Account":"raKEEVSGnKSD9Zyvxu4z6Pqpm4ABH8FS6n","SignerWeight":1}}]}"#;
+        let default_json_str = r#"{"Account":"rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn","TransactionType":"SignerListSet","SigningPubKey":"","Fee":"12","Flags":0,"SignerQuorum":3,"SignerEntries":[{"SignerEntry":{"Account":"rsA2LpzuawewSBQXkiju3YQTMzW13pAAdW","SignerWeight":2}},{"SignerEntry":{"Account":"rUpy3eEg8rqjqfUoLeBnZkscbKbFsKXC3v","SignerWeight":1}},{"SignerEntry":{"Account":"raKEEVSGnKSD9Zyvxu4z6Pqpm4ABH8FS6n","SignerWeight":1}}]}"#;
         // Serialize
         let default_json_value = serde_json::to_value(default_json_str).unwrap();
         let serialized_string = serde_json::to_string(&default_txn).unwrap();
diff --git a/src/models/transactions/ticket_create.rs b/src/models/transactions/ticket_create.rs
index 1387c0ab..a97f3a61 100644
--- a/src/models/transactions/ticket_create.rs
+++ b/src/models/transactions/ticket_create.rs
@@ -80,7 +80,7 @@ impl<'a> TicketCreate<'a> {
                 None,
                 sequence,
                 signers,
-                None,
+                "".into(),
                 source_tag,
                 ticket_sequence,
                 None,
@@ -108,7 +108,7 @@ mod tests {
             None,
             10,
         );
-        let default_json_str = r#"{"Account":"rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn","TransactionType":"TicketCreate","Fee":"10","Flags":0,"Sequence":381,"SigningPubKey":"","TicketCount":10}"#;
+        let default_json_str = r#"{"Account":"rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn","TransactionType":"TicketCreate","SigningPubKey":"","Fee":"10","Flags":0,"Sequence":381,"TicketCount":10}"#;
         // Serialize
         let default_json_value = serde_json::to_value(default_json_str).unwrap();
         let serialized_string = serde_json::to_string(&default_txn).unwrap();
diff --git a/src/models/transactions/trust_set.rs b/src/models/transactions/trust_set.rs
index 0aeb0ce1..70629133 100644
--- a/src/models/transactions/trust_set.rs
+++ b/src/models/transactions/trust_set.rs
@@ -118,7 +118,7 @@ impl<'a> TrustSet<'a> {
                 None,
                 sequence,
                 signers,
-                None,
+                "".into(),
                 source_tag,
                 ticket_sequence,
                 None,
@@ -156,7 +156,7 @@ mod tests {
             None,
             None,
         );
-        let default_json_str = r#"{"Account":"ra5nK24KXen9AHvsdFTKHSANinZseWnPcX","TransactionType":"TrustSet","Fee":"12","Flags":262144,"LastLedgerSequence":8007750,"Sequence":12,"SigningPubKey":"","LimitAmount":{"currency":"USD","issuer":"rsP3mgGb2tcYUrxiLFiHJiQXhsziegtwBc","value":"100"}}"#;
+        let default_json_str = r#"{"Account":"ra5nK24KXen9AHvsdFTKHSANinZseWnPcX","TransactionType":"TrustSet","SigningPubKey":"","Fee":"12","Flags":262144,"LastLedgerSequence":8007750,"Sequence":12,"LimitAmount":{"currency":"USD","issuer":"rsP3mgGb2tcYUrxiLFiHJiQXhsziegtwBc","value":"100"}}"#;
         // Serialize
         let default_json_value = serde_json::to_value(default_json_str).unwrap();
         let serialized_string = serde_json::to_string(&default_txn).unwrap();
diff --git a/src/models/transactions/xchain_account_create_commit.rs b/src/models/transactions/xchain_account_create_commit.rs
index 9ec934e7..42002031 100644
--- a/src/models/transactions/xchain_account_create_commit.rs
+++ b/src/models/transactions/xchain_account_create_commit.rs
@@ -65,7 +65,7 @@ impl<'a> XChainAccountCreateCommit<'a> {
                 None,
                 sequence,
                 signers,
-                None,
+                "".into(),
                 source_tag,
                 ticket_sequence,
                 None,
diff --git a/src/models/transactions/xchain_add_account_create_attestation.rs b/src/models/transactions/xchain_add_account_create_attestation.rs
index d3f080fe..a9224958 100644
--- a/src/models/transactions/xchain_add_account_create_attestation.rs
+++ b/src/models/transactions/xchain_add_account_create_attestation.rs
@@ -78,7 +78,7 @@ impl<'a> XChainAddAccountCreateAttestation<'a> {
                 None,
                 sequence,
                 signers,
-                None,
+                "".into(),
                 source_tag,
                 ticket_sequence,
                 None,
@@ -104,6 +104,7 @@ mod test_serde {
         "Account": "rDr5okqGKmMpn44Bbhe5WAfDQx8e9XquEv",
         "Flags": 0,
         "TransactionType": "XChainAddAccountCreateAttestation",
+        "SigningPubKey":"",
         "OtherChainSource": "rUzB7yg1LcFa7m3q1hfrjr5w53vcWzNh3U",
         "Destination": "rJMfWNVbyjcCtds8kpoEjEbYQ41J5B6MUd",
         "Amount": "2000000000",
diff --git a/src/models/transactions/xchain_add_claim_attestation.rs b/src/models/transactions/xchain_add_claim_attestation.rs
index 674aa5f9..3e28617b 100644
--- a/src/models/transactions/xchain_add_claim_attestation.rs
+++ b/src/models/transactions/xchain_add_claim_attestation.rs
@@ -76,7 +76,7 @@ impl<'a> XChainAddClaimAttestation<'a> {
                 None,
                 sequence,
                 signers,
-                None,
+                "".into(),
                 source_tag,
                 ticket_sequence,
                 None,
diff --git a/src/models/transactions/xchain_claim.rs b/src/models/transactions/xchain_claim.rs
index 03a54411..f9e016f4 100644
--- a/src/models/transactions/xchain_claim.rs
+++ b/src/models/transactions/xchain_claim.rs
@@ -74,7 +74,7 @@ impl<'a> XChainClaim<'a> {
                 None,
                 sequence,
                 signers,
-                None,
+                "".into(),
                 source_tag,
                 ticket_sequence,
                 None,
diff --git a/src/models/transactions/xchain_commit.rs b/src/models/transactions/xchain_commit.rs
index 507a1c09..e6e1b2ad 100644
--- a/src/models/transactions/xchain_commit.rs
+++ b/src/models/transactions/xchain_commit.rs
@@ -64,7 +64,7 @@ impl<'a> XChainCommit<'a> {
                 None,
                 sequence,
                 signers,
-                None,
+                "".into(),
                 source_tag,
                 ticket_sequence,
                 None,
@@ -87,6 +87,7 @@ mod test_serde {
         "Account": "rMTi57fNy2UkUb4RcdoUeJm7gjxVQvxzUo",
         "Flags": 0,
         "TransactionType": "XChainCommit",
+        "SigningPubKey":"",
         "XChainBridge": {
             "LockingChainDoor": "rMAXACCrp3Y8PpswXcg3bKggHX76V3F8M4",
             "LockingChainIssue": {
diff --git a/src/models/transactions/xchain_create_bridge.rs b/src/models/transactions/xchain_create_bridge.rs
index 03492275..86b93e6d 100644
--- a/src/models/transactions/xchain_create_bridge.rs
+++ b/src/models/transactions/xchain_create_bridge.rs
@@ -71,7 +71,7 @@ impl<'a> XChainCreateBridge<'a> {
                 None,
                 sequence,
                 signers,
-                None,
+                "".into(),
                 source_tag,
                 ticket_sequence,
                 None,
diff --git a/src/models/transactions/xchain_create_claim_id.rs b/src/models/transactions/xchain_create_claim_id.rs
index bd474729..74c80a9f 100644
--- a/src/models/transactions/xchain_create_claim_id.rs
+++ b/src/models/transactions/xchain_create_claim_id.rs
@@ -62,7 +62,7 @@ impl<'a> XChainCreateClaimID<'a> {
         XChainCreateClaimID {
             common_fields: CommonFields::new(
                 account,
-                 TransactionType::XChainCreateClaimID,
+                TransactionType::XChainCreateClaimID,
                 account_txn_id,
                 fee,
                 Some(FlagCollection::default()),
@@ -71,7 +71,7 @@ impl<'a> XChainCreateClaimID<'a> {
                 None,
                 sequence,
                 signers,
-                None,
+                "".into(),
                 source_tag,
                 ticket_sequence,
                 None,
diff --git a/src/models/transactions/xchain_modify_bridge.rs b/src/models/transactions/xchain_modify_bridge.rs
index 33be343b..b35bda1c 100644
--- a/src/models/transactions/xchain_modify_bridge.rs
+++ b/src/models/transactions/xchain_modify_bridge.rs
@@ -83,7 +83,7 @@ impl<'a> XChainModifyBridge<'a> {
                 None,
                 sequence,
                 signers,
-                None,
+                "".into(),
                 source_tag,
                 ticket_sequence,
                 None,
diff --git a/src/transaction/multisign.rs b/src/transaction/multisign.rs
index 9877cf99..791279b3 100644
--- a/src/transaction/multisign.rs
+++ b/src/transaction/multisign.rs
@@ -29,7 +29,7 @@ where
     decoded_tx_signers
         .sort_by_key(|signer| decode_classic_address(signer.account.as_ref()).unwrap());
     transaction.get_mut_common_fields().signers = Some(decoded_tx_signers);
-    transaction.get_mut_common_fields().signing_pub_key = Some("".into());
+    transaction.get_mut_common_fields().signing_pub_key = "".into();
 
     Ok(())
 }