diff --git a/contracts/Cargo.toml b/contracts/Cargo.toml
index 5221af2..457c67f 100644
--- a/contracts/Cargo.toml
+++ b/contracts/Cargo.toml
@@ -12,20 +12,11 @@ soroban-sdk = "21.0.0"
 [dev-dependencies]
 soroban-sdk = { version = "21.0.0", features = ["testutils"] }
 proptest = "1.4.0"
+criterion = { version = "0.5", features = ["html_reports"] }
+
+[[bench]]
+name = "remittance_bench"
+harness = false
 
 [features]
 prop = []
-
-[profile.release]
-opt-level = "z"
-overflow-checks = true
-debug = 0
-strip = "symbols"
-debug-assertions = false
-panic = "abort"
-codegen-units = 1
-lto = true
-
-[profile.release-with-logs]
-inherits = "release"
-debug-assertions = true
diff --git a/contracts/benches/remittance_bench.rs b/contracts/benches/remittance_bench.rs
new file mode 100644
index 0000000..1fc1598
--- /dev/null
+++ b/contracts/benches/remittance_bench.rs
@@ -0,0 +1,152 @@
+use criterion::{black_box, criterion_group, criterion_main, Criterion, BatchSize};
+use soroban_sdk::{testutils::{Address as _, Ledger}, Address, Env, String, Symbol, Vec, symbol_short};
+use gpay_remit_contracts::remittance_hub::{RemittanceHubContract, RemittanceHubContractClient, Asset, EscrowRequest};
+
+fn setup_env_with_token() -> (Env, RemittanceHubContractClient<'static>, Address, Address, Address) {
+    let env = Env::default();
+    env.mock_all_auths();
+    
+    // Register the contract
+    let contract_id = env.register_contract(None, RemittanceHubContract);
+    let client = RemittanceHubContractClient::new(&env, &contract_id);
+    
+    // Reset budget to unlimited for benchmarking
+    env.budget().reset_unlimited();
+    
+    let admin = Address::generate(&env);
+    let oracle = Address::generate(&env);
+    
+    // Initialize the hub
+    client.init_hub(&admin, &oracle, &oracle, &3600);
+    
+    // Register a token
+    let token_admin = Address::generate(&env);
+    let token_id = env.register_stellar_asset_contract(token_admin.clone());
+    
+    (env, client, admin, oracle, token_id)
+}
+
+fn bench_send_remittance(c: &mut Criterion) {
+    c.bench_function("send_remittance", |b| {
+        b.iter_batched(|| {
+            let (env, client, _admin, _oracle, _token) = setup_env_with_token();
+            let from = Address::generate(&env);
+            let to = Address::generate(&env);
+            (from, to, client)
+        }, |(from, to, client)| {
+            client.send_remittance(&from, &to, black_box(&100), black_box(&symbol_short!("USD")));
+        }, BatchSize::SmallInput)
+    });
+}
+
+fn bench_batch_create_escrows(c: &mut Criterion) {
+    for size in [1, 5, 10].iter() {
+        c.bench_function(&format!("batch_create_escrows_size_{}", size), |b| {
+            b.iter_batched(|| {
+                let (env, client, _admin, _oracle, _token) = setup_env_with_token();
+                let sender = Address::generate(&env);
+                let recipient = Address::generate(&env);
+                let issuer = Address::generate(&env);
+                
+                let asset = Asset {
+                    code: String::from_str(&env, "USDC"),
+                    issuer: issuer.clone(),
+                };
+                
+                let mut requests = Vec::new(&env);
+                for _ in 0..*size {
+                    requests.push_back(EscrowRequest {
+                        recipient: recipient.clone(),
+                        amount: 100,
+                        asset: asset.clone(),
+                        expiration_timestamp: 10000,
+                    });
+                }
+                env.ledger().with_mut(|li| li.timestamp = 5000);
+                (sender, requests, client)
+            }, |(sender, requests, client)| {
+                client.batch_create_escrows(&sender, black_box(&requests));
+            }, BatchSize::SmallInput)
+        });
+    }
+}
+
+fn bench_batch_deposit(c: &mut Criterion) {
+    for size in [1, 5, 10].iter() {
+        c.bench_function(&format!("batch_deposit_size_{}", size), |b| {
+            b.iter_batched(|| {
+                let (env, client, _admin, _oracle, token_id) = setup_env_with_token();
+                let sender = Address::generate(&env);
+                let recipient = Address::generate(&env);
+                let issuer = Address::generate(&env);
+                
+                let asset = Asset {
+                    code: String::from_str(&env, "USDC"),
+                    issuer: issuer.clone(),
+                };
+                
+                let mut requests = Vec::new(&env);
+                for _ in 0..*size {
+                    requests.push_back(EscrowRequest {
+                        recipient: recipient.clone(),
+                        amount: 100,
+                        asset: asset.clone(),
+                        expiration_timestamp: 10000,
+                    });
+                }
+                env.ledger().with_mut(|li| li.timestamp = 5000);
+                
+                // Mint tokens to sender
+                let token_client = soroban_sdk::token::StellarAssetClient::new(&env, &token_id);
+                token_client.mint(&sender, &1000000);
+                
+                let ids = client.batch_create_escrows(&sender, &requests);
+                (sender, ids, token_id, client)
+            }, |(sender, escrow_ids, token_id, client)| {
+                client.batch_deposit(&sender, black_box(&escrow_ids), black_box(&token_id));
+            }, BatchSize::SmallInput)
+        });
+    }
+}
+
+fn bench_batch_release(c: &mut Criterion) {
+    for size in [1, 5, 10].iter() {
+        c.bench_function(&format!("batch_release_size_{}", size), |b| {
+            b.iter_batched(|| {
+                let (env, client, _admin, _oracle, token_id) = setup_env_with_token();
+                let sender = Address::generate(&env);
+                let recipient = Address::generate(&env);
+                let issuer = Address::generate(&env);
+                
+                let asset = Asset {
+                    code: String::from_str(&env, "USDC"),
+                    issuer: issuer.clone(),
+                };
+                
+                let mut requests = Vec::new(&env);
+                for _ in 0..*size {
+                    requests.push_back(EscrowRequest {
+                        recipient: recipient.clone(),
+                        amount: 100,
+                        asset: asset.clone(),
+                        expiration_timestamp: 10000,
+                    });
+                }
+                env.ledger().with_mut(|li| li.timestamp = 5000);
+                
+                // Mint tokens to sender
+                let token_client = soroban_sdk::token::StellarAssetClient::new(&env, &token_id);
+                token_client.mint(&sender, &1000000);
+                
+                let ids = client.batch_create_escrows(&sender, &requests);
+                client.batch_deposit(&sender, &ids, &token_id);
+                (recipient, ids, token_id, client)
+            }, |(recipient, escrow_ids, token_id, client)| {
+                client.batch_release(&recipient, black_box(&escrow_ids), black_box(&token_id));
+            }, BatchSize::SmallInput)
+        });
+    }
+}
+
+criterion_group!(benches, bench_send_remittance, bench_batch_create_escrows, bench_batch_deposit, bench_batch_release);
+criterion_main!(benches);
diff --git a/contracts/src/lib.rs b/contracts/src/lib.rs
index 3c05a9a..568b476 100644
--- a/contracts/src/lib.rs
+++ b/contracts/src/lib.rs
@@ -1,11 +1,11 @@
 #![no_std]
 
-mod aml;
-mod kyc;
-mod oracle;
+pub mod aml;
+pub mod kyc;
+pub mod oracle;
 pub mod payment_escrow;
 pub mod rate_limit;
-mod remittance_hub;
+pub mod remittance_hub;
 pub mod upgradeable;
 
 pub use aml::MockAmlOracleContract;
diff --git a/contracts/src/remittance_hub.rs b/contracts/src/remittance_hub.rs
index 00ac972..21228e5 100644
--- a/contracts/src/remittance_hub.rs
+++ b/contracts/src/remittance_hub.rs
@@ -1,13 +1,11 @@
 use crate::aml::{self, AmlConfig, AmlScreeningResult, AmlStatus};
-
 use crate::oracle::{self as oracle_mod, CachedRate, OracleConfig};
-use crate::rate_limit::{self as rate_limit_mod, FunctionType};
+use crate::rate_limit::{self, FunctionType};
 use crate::upgradeable;
 use soroban_sdk::{
     contract, contracterror, contractimpl, contracttype, symbol_short, Address, BytesN, Env, String, Symbol,
 };
 
-
 #[contracterror]
 #[derive(Copy, Clone, Debug, Eq, PartialEq, PartialOrd, Ord)]
 #[repr(u32)]
@@ -1029,7 +1027,7 @@ impl RemittanceHubContract {
             Some(a) => a,
             None => return Ok(()), // No admin set yet, skip rate limiting
         };
-        let allowed = rate_limit_mod::check_rate_limit(env, caller, function_type, &admin);
+        let allowed = rate_limit::check_rate_limit(env, caller, function_type, &admin);
         if allowed {
             Ok(())
         } else {
@@ -1095,6 +1093,8 @@ impl RemittanceHubContract {
         upgradeable::migrate(&env, &admin)
     }
 
+
+
     // ── Analytics ──────────────────────────────────────────────────
 
     pub fn get_metric(env: Env, metric_type: MetricType, timestamp: u64, is_weekly: bool) -> i128 {
@@ -1126,6 +1126,7 @@ impl RemittanceHubContract {
             .persistent()
             .get(&DataKey::Admin)
             .ok_or(RemittanceError::Unauthorized)?;
+
         if caller != stored_admin {
             return Err(RemittanceError::Unauthorized);
         }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.1.json b/contracts/test_snapshots/fuzz_calculate_fees.1.json
index 5965e4c..3d5fe8d 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.1.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.1.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 794876926236461
+                "lo": 314970889163398
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.10.json b/contracts/test_snapshots/fuzz_calculate_fees.10.json
index ca0ff1e..8a6a885 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.10.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.10.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 94061507327297
+                "lo": 7167175642279
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.100.json b/contracts/test_snapshots/fuzz_calculate_fees.100.json
index f9f19a8..94e4d0e 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.100.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.100.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 927336209107696
+                "lo": 111852279558089
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.101.json b/contracts/test_snapshots/fuzz_calculate_fees.101.json
index 3bfc931..e838421 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.101.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.101.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 715157565648685
+                "lo": 100369389564203
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.102.json b/contracts/test_snapshots/fuzz_calculate_fees.102.json
index 8fc6602..3ace296 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.102.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.102.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 161440231597829
+                "lo": 491056683234059
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.103.json b/contracts/test_snapshots/fuzz_calculate_fees.103.json
index a628f57..a4e0dd0 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.103.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.103.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 797715941244230
+                "lo": 560400642780196
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.104.json b/contracts/test_snapshots/fuzz_calculate_fees.104.json
index ec56465..6922b07 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.104.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.104.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 778232436353525
+                "lo": 877493170744173
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.105.json b/contracts/test_snapshots/fuzz_calculate_fees.105.json
index de00c7d..ec7bcb7 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.105.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.105.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 65984093604124
+                "lo": 338327635228447
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.106.json b/contracts/test_snapshots/fuzz_calculate_fees.106.json
index fa14adb..861c009 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.106.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.106.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 646146842544408
+                "lo": 656245671034412
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.107.json b/contracts/test_snapshots/fuzz_calculate_fees.107.json
index 6222dbc..1cd7e56 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.107.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.107.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 658207015249401
+                "lo": 162943068328952
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.108.json b/contracts/test_snapshots/fuzz_calculate_fees.108.json
index c7436e3..f0ba08c 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.108.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.108.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 66075818541745
+                "lo": 177986654722703
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.109.json b/contracts/test_snapshots/fuzz_calculate_fees.109.json
index 33875b8..b1444a6 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.109.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.109.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 66196674812287
+                "lo": 480974821921668
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.11.json b/contracts/test_snapshots/fuzz_calculate_fees.11.json
index 77080e3..d3155ad 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.11.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.11.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 292604871925748
+                "lo": 900194438157482
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.110.json b/contracts/test_snapshots/fuzz_calculate_fees.110.json
index 0e65e53..49e29c7 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.110.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.110.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 678122791933968
+                "lo": 158246690306612
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.111.json b/contracts/test_snapshots/fuzz_calculate_fees.111.json
index 9884397..652d558 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.111.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.111.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 112701100182948
+                "lo": 769630099644590
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.112.json b/contracts/test_snapshots/fuzz_calculate_fees.112.json
index 958dea9..b3f9e0d 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.112.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.112.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 219732332700518
+                "lo": 476738456193033
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.113.json b/contracts/test_snapshots/fuzz_calculate_fees.113.json
index 28d8249..c4ced17 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.113.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.113.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 592093981213
+                "lo": 190518558996875
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.114.json b/contracts/test_snapshots/fuzz_calculate_fees.114.json
index 9e4dc71..095cb69 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.114.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.114.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 191041894640951
+                "lo": 425060057078700
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.115.json b/contracts/test_snapshots/fuzz_calculate_fees.115.json
index e0d9b63..230d930 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.115.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.115.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 953508238816919
+                "lo": 974404351687637
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.116.json b/contracts/test_snapshots/fuzz_calculate_fees.116.json
index 0122dca..088db19 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.116.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.116.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 89081606699816
+                "lo": 934244619776077
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.117.json b/contracts/test_snapshots/fuzz_calculate_fees.117.json
index b5f09f9..19ce298 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.117.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.117.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 162835501900974
+                "lo": 654890089590785
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.118.json b/contracts/test_snapshots/fuzz_calculate_fees.118.json
index 215d7a1..3e157c8 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.118.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.118.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 171584373648531
+                "lo": 831248988838592
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.119.json b/contracts/test_snapshots/fuzz_calculate_fees.119.json
index 9330e54..3bd9d8b 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.119.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.119.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 103595185711758
+                "lo": 426367442557537
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.12.json b/contracts/test_snapshots/fuzz_calculate_fees.12.json
index 24df41b..9e0d2eb 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.12.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.12.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 996809870024108
+                "lo": 565794608941024
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.120.json b/contracts/test_snapshots/fuzz_calculate_fees.120.json
index dd5978f..47f1d62 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.120.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.120.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 97630666312073
+                "lo": 562840223934772
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.121.json b/contracts/test_snapshots/fuzz_calculate_fees.121.json
index 9ae360d..77b5486 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.121.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.121.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 478697681410427
+                "lo": 221811533232656
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.122.json b/contracts/test_snapshots/fuzz_calculate_fees.122.json
index 3b2d221..5b2f5d0 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.122.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.122.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 741269336774358
+                "lo": 657624779443468
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.123.json b/contracts/test_snapshots/fuzz_calculate_fees.123.json
index af3e046..230d710 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.123.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.123.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 912977438492515
+                "lo": 719775060626126
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.124.json b/contracts/test_snapshots/fuzz_calculate_fees.124.json
index cab805b..8031bc9 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.124.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.124.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 579891478910308
+                "lo": 146162378882439
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.125.json b/contracts/test_snapshots/fuzz_calculate_fees.125.json
index 2577f08..13e9cc4 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.125.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.125.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 203760902177869
+                "lo": 272204411170270
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.126.json b/contracts/test_snapshots/fuzz_calculate_fees.126.json
index 368991b..d78df1a 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.126.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.126.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 973184982542100
+                "lo": 11422395119285
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.127.json b/contracts/test_snapshots/fuzz_calculate_fees.127.json
index cbb4676..d50495c 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.127.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.127.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 71521660037900
+                "lo": 579301557152366
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.128.json b/contracts/test_snapshots/fuzz_calculate_fees.128.json
index 4a65896..c860d32 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.128.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.128.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 705821734598358
+                "lo": 182489339536922
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.129.json b/contracts/test_snapshots/fuzz_calculate_fees.129.json
index 39508cc..edf1047 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.129.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.129.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 312631007386888
+                "lo": 197863418276630
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.13.json b/contracts/test_snapshots/fuzz_calculate_fees.13.json
index a41c372..0bf9234 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.13.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.13.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 320594250065565
+                "lo": 986669088702716
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.130.json b/contracts/test_snapshots/fuzz_calculate_fees.130.json
index 553fc8e..b4dbbea 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.130.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.130.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 607160840848396
+                "lo": 800635695971477
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.131.json b/contracts/test_snapshots/fuzz_calculate_fees.131.json
index c108d20..432a8a9 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.131.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.131.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 918901168920165
+                "lo": 482199668396371
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.132.json b/contracts/test_snapshots/fuzz_calculate_fees.132.json
index 8aafab9..557f2e2 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.132.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.132.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 853915207772911
+                "lo": 16029221979101
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.133.json b/contracts/test_snapshots/fuzz_calculate_fees.133.json
index 731337e..058dcdd 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.133.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.133.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 893520052764464
+                "lo": 9296441089573
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.134.json b/contracts/test_snapshots/fuzz_calculate_fees.134.json
index 59c5cce..f9dddfc 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.134.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.134.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 319094480940517
+                "lo": 250975878330281
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.135.json b/contracts/test_snapshots/fuzz_calculate_fees.135.json
index 72c920e..875ed8b 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.135.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.135.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 85490758822248
+                "lo": 999048491831177
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.136.json b/contracts/test_snapshots/fuzz_calculate_fees.136.json
index b23af2f..448ae00 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.136.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.136.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 818667117174036
+                "lo": 269522065798272
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.137.json b/contracts/test_snapshots/fuzz_calculate_fees.137.json
index 97b2fd3..dfc721d 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.137.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.137.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 470142238629410
+                "lo": 495831731858470
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.138.json b/contracts/test_snapshots/fuzz_calculate_fees.138.json
index e73190d..3cf09a3 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.138.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.138.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 799142625983387
+                "lo": 9678391751048
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.139.json b/contracts/test_snapshots/fuzz_calculate_fees.139.json
index 023457b..c594fcd 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.139.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.139.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 284704762403307
+                "lo": 453229035341501
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.14.json b/contracts/test_snapshots/fuzz_calculate_fees.14.json
index 25636d2..bca6214 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.14.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.14.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 440779307525793
+                "lo": 166241012513352
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.140.json b/contracts/test_snapshots/fuzz_calculate_fees.140.json
index 1ca5a5b..a92e407 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.140.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.140.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 684519575184134
+                "lo": 541673727320686
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.141.json b/contracts/test_snapshots/fuzz_calculate_fees.141.json
index 5750628..eec4e51 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.141.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.141.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 597668144317638
+                "lo": 64212587974594
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.142.json b/contracts/test_snapshots/fuzz_calculate_fees.142.json
index 6d3347f..da02e2d 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.142.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.142.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 863739786257686
+                "lo": 602887946935093
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.143.json b/contracts/test_snapshots/fuzz_calculate_fees.143.json
index cd36046..cf7daaa 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.143.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.143.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 815787435269232
+                "lo": 620452669392309
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.144.json b/contracts/test_snapshots/fuzz_calculate_fees.144.json
index 0f36e0c..3bd2623 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.144.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.144.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 451273471376957
+                "lo": 600404850460417
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.145.json b/contracts/test_snapshots/fuzz_calculate_fees.145.json
index 5885f42..4ff5d86 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.145.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.145.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 400601401879793
+                "lo": 868088368714077
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.146.json b/contracts/test_snapshots/fuzz_calculate_fees.146.json
index 82e88c5..999adb5 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.146.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.146.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 977089169579425
+                "lo": 522052113722579
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.147.json b/contracts/test_snapshots/fuzz_calculate_fees.147.json
index f605be2..1a52494 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.147.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.147.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 559450499630674
+                "lo": 925047010960219
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.148.json b/contracts/test_snapshots/fuzz_calculate_fees.148.json
index f7bdd8b..d434009 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.148.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.148.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 409941148544931
+                "lo": 451011295106468
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.149.json b/contracts/test_snapshots/fuzz_calculate_fees.149.json
index 9245c46..6d0218c 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.149.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.149.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 896320554844605
+                "lo": 453158074854501
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.15.json b/contracts/test_snapshots/fuzz_calculate_fees.15.json
index 0b4f226..d3f2c7d 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.15.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.15.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 120052882240638
+                "lo": 318344998484042
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.150.json b/contracts/test_snapshots/fuzz_calculate_fees.150.json
index ad47097..613be6e 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.150.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.150.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 947336946405926
+                "lo": 715209949594847
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.151.json b/contracts/test_snapshots/fuzz_calculate_fees.151.json
index 2b67a71..7e654c9 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.151.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.151.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 988248407194549
+                "lo": 27195128291564
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.152.json b/contracts/test_snapshots/fuzz_calculate_fees.152.json
index 2174944..a3ccb97 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.152.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.152.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 72210988797082
+                "lo": 702372941718359
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.153.json b/contracts/test_snapshots/fuzz_calculate_fees.153.json
index 42ff432..35bd731 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.153.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.153.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 973476303244179
+                "lo": 700083415133661
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.154.json b/contracts/test_snapshots/fuzz_calculate_fees.154.json
index 12be645..8ee08f1 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.154.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.154.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 382828097095595
+                "lo": 812666008289225
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.155.json b/contracts/test_snapshots/fuzz_calculate_fees.155.json
index 7a07b2a..5af6516 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.155.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.155.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 304083779365442
+                "lo": 359601261591789
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.156.json b/contracts/test_snapshots/fuzz_calculate_fees.156.json
index 468f684..a06d348 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.156.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.156.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 313409817257920
+                "lo": 853634156666172
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.157.json b/contracts/test_snapshots/fuzz_calculate_fees.157.json
index 99ee372..337c3da 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.157.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.157.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 449175246918466
+                "lo": 703794741110310
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.158.json b/contracts/test_snapshots/fuzz_calculate_fees.158.json
index 9bbdce4..c53796a 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.158.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.158.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 240823183811702
+                "lo": 318219997446661
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.159.json b/contracts/test_snapshots/fuzz_calculate_fees.159.json
index 6b16b55..5b32d74 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.159.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.159.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 16267277655902
+                "lo": 664000993342138
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.16.json b/contracts/test_snapshots/fuzz_calculate_fees.16.json
index 6c0f216..e1aca08 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.16.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.16.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 51663159167906
+                "lo": 386769230731911
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.160.json b/contracts/test_snapshots/fuzz_calculate_fees.160.json
index fa3d7c1..ab4a68a 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.160.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.160.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 219444679613558
+                "lo": 726393610467233
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.161.json b/contracts/test_snapshots/fuzz_calculate_fees.161.json
index da8dd93..fc49b2c 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.161.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.161.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 31054231073975
+                "lo": 501094668255995
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.162.json b/contracts/test_snapshots/fuzz_calculate_fees.162.json
index e8c1c17..7beef2e 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.162.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.162.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 863147757762650
+                "lo": 796002565498149
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.163.json b/contracts/test_snapshots/fuzz_calculate_fees.163.json
index fe4421d..f23c0aa 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.163.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.163.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 473862480589798
+                "lo": 442207181062414
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.164.json b/contracts/test_snapshots/fuzz_calculate_fees.164.json
index a788863..c738a80 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.164.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.164.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 115083950809418
+                "lo": 896446885755571
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.165.json b/contracts/test_snapshots/fuzz_calculate_fees.165.json
index cd781be..82af9e9 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.165.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.165.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 38051669549245
+                "lo": 807294322381994
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.166.json b/contracts/test_snapshots/fuzz_calculate_fees.166.json
index 0347626..b3c14a7 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.166.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.166.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 196882495360752
+                "lo": 740208338243291
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.167.json b/contracts/test_snapshots/fuzz_calculate_fees.167.json
index 757b83f..3987f50 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.167.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.167.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 942993062809014
+                "lo": 888420716266278
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.168.json b/contracts/test_snapshots/fuzz_calculate_fees.168.json
index 85f7a4f..07d81a4 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.168.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.168.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 512473692697742
+                "lo": 344245356794215
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.169.json b/contracts/test_snapshots/fuzz_calculate_fees.169.json
index 22a923b..45ec518 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.169.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.169.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 737169357367484
+                "lo": 51143700104955
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.17.json b/contracts/test_snapshots/fuzz_calculate_fees.17.json
index 18e0697..2a99980 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.17.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.17.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 918822344027810
+                "lo": 400837426501452
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.170.json b/contracts/test_snapshots/fuzz_calculate_fees.170.json
index 9ea0cac..0ed937e 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.170.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.170.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 488696381584999
+                "lo": 408534877966526
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.171.json b/contracts/test_snapshots/fuzz_calculate_fees.171.json
index e8db8b3..66007cc 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.171.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.171.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 276778404333857
+                "lo": 845218755811746
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.172.json b/contracts/test_snapshots/fuzz_calculate_fees.172.json
index 01e740f..74c3db8 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.172.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.172.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 961041825735324
+                "lo": 595914417513518
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.173.json b/contracts/test_snapshots/fuzz_calculate_fees.173.json
index 413a9b0..04c10bf 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.173.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.173.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 18707273007895
+                "lo": 99816336623652
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.174.json b/contracts/test_snapshots/fuzz_calculate_fees.174.json
index 14bced0..fc5d7f4 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.174.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.174.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 909630970821792
+                "lo": 857637212015355
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.175.json b/contracts/test_snapshots/fuzz_calculate_fees.175.json
index fe035f6..dfdf5c0 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.175.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.175.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 496532311122813
+                "lo": 507010023911429
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.176.json b/contracts/test_snapshots/fuzz_calculate_fees.176.json
index 3318816..f18b486 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.176.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.176.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 341825344356499
+                "lo": 987928283665254
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.177.json b/contracts/test_snapshots/fuzz_calculate_fees.177.json
index 1116c37..ff4892e 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.177.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.177.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 926645483244654
+                "lo": 285114797908164
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.178.json b/contracts/test_snapshots/fuzz_calculate_fees.178.json
index 36fe264..31e5f6e 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.178.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.178.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 301915385375862
+                "lo": 415522195244897
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.179.json b/contracts/test_snapshots/fuzz_calculate_fees.179.json
index 00967d0..7df3a9a 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.179.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.179.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 483555611946902
+                "lo": 740584002591478
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.18.json b/contracts/test_snapshots/fuzz_calculate_fees.18.json
index dba0613..06da300 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.18.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.18.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 26227876601531
+                "lo": 569885820858995
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.180.json b/contracts/test_snapshots/fuzz_calculate_fees.180.json
index f2bd068..e92be7c 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.180.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.180.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 498829098038515
+                "lo": 689576740646550
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.181.json b/contracts/test_snapshots/fuzz_calculate_fees.181.json
index ba0e9ed..946c734 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.181.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.181.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 111754413738505
+                "lo": 858484298040380
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.182.json b/contracts/test_snapshots/fuzz_calculate_fees.182.json
index 40e7a50..0ed70cf 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.182.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.182.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 695869426557738
+                "lo": 271445573078837
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.183.json b/contracts/test_snapshots/fuzz_calculate_fees.183.json
index 09db082..97c960c 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.183.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.183.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 784304135393118
+                "lo": 894492097766421
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.184.json b/contracts/test_snapshots/fuzz_calculate_fees.184.json
index 2b6287c..fb57f91 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.184.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.184.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 901222155037361
+                "lo": 61750769345226
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.185.json b/contracts/test_snapshots/fuzz_calculate_fees.185.json
index 1548558..c94d31b 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.185.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.185.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 845837725790564
+                "lo": 915266037859708
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.186.json b/contracts/test_snapshots/fuzz_calculate_fees.186.json
index 39ea0a1..220c6d2 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.186.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.186.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 50924384551309
+                "lo": 701307775031691
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.187.json b/contracts/test_snapshots/fuzz_calculate_fees.187.json
index 6072ae1..b5ea219 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.187.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.187.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 672676288730417
+                "lo": 776429181578236
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.188.json b/contracts/test_snapshots/fuzz_calculate_fees.188.json
index 28a240a..ed1ebcd 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.188.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.188.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 396871646490295
+                "lo": 113451927521593
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.189.json b/contracts/test_snapshots/fuzz_calculate_fees.189.json
index ea9c010..9ca74e1 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.189.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.189.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 585798006944095
+                "lo": 242517811176515
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.19.json b/contracts/test_snapshots/fuzz_calculate_fees.19.json
index eb9a15f..4eb7c8b 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.19.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.19.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 350141448147246
+                "lo": 390042713439833
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.190.json b/contracts/test_snapshots/fuzz_calculate_fees.190.json
index 217eb4b..3b435a6 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.190.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.190.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 421786090371619
+                "lo": 495131907463803
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.191.json b/contracts/test_snapshots/fuzz_calculate_fees.191.json
index 3d97f93..a67b1ea 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.191.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.191.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 358065923352928
+                "lo": 845605998644941
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.192.json b/contracts/test_snapshots/fuzz_calculate_fees.192.json
index 3a8d4b8..01a7582 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.192.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.192.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 463575766110773
+                "lo": 914042592398668
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.193.json b/contracts/test_snapshots/fuzz_calculate_fees.193.json
index f3f2dda..6c21079 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.193.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.193.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 739962066620337
+                "lo": 834969159892860
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.194.json b/contracts/test_snapshots/fuzz_calculate_fees.194.json
index f986974..a00a6b2 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.194.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.194.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 108075455998195
+                "lo": 30341425841663
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.195.json b/contracts/test_snapshots/fuzz_calculate_fees.195.json
index cf7bc08..e4cd715 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.195.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.195.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 959228515518538
+                "lo": 529990038681624
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.196.json b/contracts/test_snapshots/fuzz_calculate_fees.196.json
index 89e06de..388aab8 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.196.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.196.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 908187616789930
+                "lo": 408911060875188
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.197.json b/contracts/test_snapshots/fuzz_calculate_fees.197.json
index bc94146..07a86b1 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.197.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.197.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 558532999875702
+                "lo": 581675612547550
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.198.json b/contracts/test_snapshots/fuzz_calculate_fees.198.json
index 94f663a..e02ef91 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.198.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.198.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 681661671902252
+                "lo": 704610215817812
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.199.json b/contracts/test_snapshots/fuzz_calculate_fees.199.json
index 90dda0e..08f795a 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.199.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.199.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 786774859923563
+                "lo": 430233972127814
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.2.json b/contracts/test_snapshots/fuzz_calculate_fees.2.json
index 4c6bf47..e7c3cfd 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.2.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.2.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 416917935165351
+                "lo": 187120644149706
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.20.json b/contracts/test_snapshots/fuzz_calculate_fees.20.json
index 5749a46..c16c091 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.20.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.20.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 916099375942716
+                "lo": 894097210690805
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.200.json b/contracts/test_snapshots/fuzz_calculate_fees.200.json
index 5a93f21..7a6f034 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.200.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.200.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 331116492488768
+                "lo": 931449979818602
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.201.json b/contracts/test_snapshots/fuzz_calculate_fees.201.json
index 4f49f47..047e56b 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.201.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.201.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 317426122401622
+                "lo": 296411667296064
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.202.json b/contracts/test_snapshots/fuzz_calculate_fees.202.json
index 12bc424..d3c89ce 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.202.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.202.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 214714589203386
+                "lo": 814069383228703
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.203.json b/contracts/test_snapshots/fuzz_calculate_fees.203.json
index e6ebb59..1786f26 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.203.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.203.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 824117200730099
+                "lo": 900960469727028
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.204.json b/contracts/test_snapshots/fuzz_calculate_fees.204.json
index d03ffdf..2f11531 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.204.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.204.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 991524084553711
+                "lo": 673353208311289
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.205.json b/contracts/test_snapshots/fuzz_calculate_fees.205.json
index 402c4af..b5f8a44 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.205.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.205.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 804700859164199
+                "lo": 97664846481030
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.206.json b/contracts/test_snapshots/fuzz_calculate_fees.206.json
index 5a5050f..62dbfba 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.206.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.206.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 328003814345466
+                "lo": 133963024486122
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.207.json b/contracts/test_snapshots/fuzz_calculate_fees.207.json
index 89216e8..d920a50 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.207.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.207.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 515574036687179
+                "lo": 295528986580795
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.208.json b/contracts/test_snapshots/fuzz_calculate_fees.208.json
index a0a8502..c38f5d3 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.208.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.208.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 568398349545251
+                "lo": 526286159803572
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.209.json b/contracts/test_snapshots/fuzz_calculate_fees.209.json
index 2af47b1..a3b2b1b 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.209.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.209.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 64141186791317
+                "lo": 682557452276964
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.21.json b/contracts/test_snapshots/fuzz_calculate_fees.21.json
index d2af021..c928f70 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.21.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.21.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 626971889142753
+                "lo": 32360936239281
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.210.json b/contracts/test_snapshots/fuzz_calculate_fees.210.json
index 8f11718..1ada747 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.210.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.210.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 388424168007923
+                "lo": 172122895022806
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.211.json b/contracts/test_snapshots/fuzz_calculate_fees.211.json
index be8aa90..c87d5a9 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.211.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.211.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 515915734092049
+                "lo": 33647441458372
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.212.json b/contracts/test_snapshots/fuzz_calculate_fees.212.json
index 6359949..65e792f 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.212.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.212.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 657369357373379
+                "lo": 770048390557006
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.213.json b/contracts/test_snapshots/fuzz_calculate_fees.213.json
index 7c984e5..d7b1b02 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.213.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.213.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 584200202898203
+                "lo": 562439189581266
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.214.json b/contracts/test_snapshots/fuzz_calculate_fees.214.json
index 5bae66a..58a3bb5 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.214.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.214.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 41446391319866
+                "lo": 294681619102950
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.215.json b/contracts/test_snapshots/fuzz_calculate_fees.215.json
index 68b3c6c..c3d202b 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.215.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.215.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 204280381387527
+                "lo": 252794487483808
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.216.json b/contracts/test_snapshots/fuzz_calculate_fees.216.json
index bdb4803..b6b738f 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.216.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.216.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 917787335931276
+                "lo": 494612955586986
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.217.json b/contracts/test_snapshots/fuzz_calculate_fees.217.json
index 93718ef..3b4eac3 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.217.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.217.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 466584872377185
+                "lo": 151246836832916
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.218.json b/contracts/test_snapshots/fuzz_calculate_fees.218.json
index a851860..1cc1a98 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.218.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.218.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 167355128121728
+                "lo": 27736889259198
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.219.json b/contracts/test_snapshots/fuzz_calculate_fees.219.json
index c4a512a..554a0dd 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.219.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.219.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 868020412096665
+                "lo": 754237312942208
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.22.json b/contracts/test_snapshots/fuzz_calculate_fees.22.json
index e89be68..0c0c582 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.22.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.22.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 972764160938854
+                "lo": 559633877383561
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.220.json b/contracts/test_snapshots/fuzz_calculate_fees.220.json
index a155c5a..76cdcac 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.220.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.220.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 187198626060241
+                "lo": 335521057207615
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.221.json b/contracts/test_snapshots/fuzz_calculate_fees.221.json
index f3f52d4..851c773 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.221.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.221.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 379386772778563
+                "lo": 337225332706386
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.222.json b/contracts/test_snapshots/fuzz_calculate_fees.222.json
index c25c253..21d30fa 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.222.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.222.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 7991491579855
+                "lo": 457175547284913
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.223.json b/contracts/test_snapshots/fuzz_calculate_fees.223.json
index fbfc244..e3561a6 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.223.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.223.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 573363851732822
+                "lo": 918803733626625
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.224.json b/contracts/test_snapshots/fuzz_calculate_fees.224.json
index 9b626a6..4df1efd 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.224.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.224.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 591475638292212
+                "lo": 230370196407489
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.225.json b/contracts/test_snapshots/fuzz_calculate_fees.225.json
index 7e271ad..3e3d9e5 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.225.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.225.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 366165824093348
+                "lo": 433977665813197
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.226.json b/contracts/test_snapshots/fuzz_calculate_fees.226.json
index cb02c7e..1be4de8 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.226.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.226.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 671841032229038
+                "lo": 453618295856968
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.227.json b/contracts/test_snapshots/fuzz_calculate_fees.227.json
index 0d53ee6..c11a586 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.227.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.227.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 219923718718370
+                "lo": 295651441735429
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.228.json b/contracts/test_snapshots/fuzz_calculate_fees.228.json
index d608a0a..d12ca9b 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.228.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.228.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 389115025778855
+                "lo": 791123456643803
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.229.json b/contracts/test_snapshots/fuzz_calculate_fees.229.json
index 6cb511a..cd854d5 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.229.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.229.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 471615736501579
+                "lo": 558752069085725
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.23.json b/contracts/test_snapshots/fuzz_calculate_fees.23.json
index 7392a99..bffb69b 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.23.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.23.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 989677845305146
+                "lo": 915267498361076
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.230.json b/contracts/test_snapshots/fuzz_calculate_fees.230.json
index 337f273..260a4c3 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.230.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.230.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 875410767187904
+                "lo": 436071425596356
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.231.json b/contracts/test_snapshots/fuzz_calculate_fees.231.json
index 0704688..9eaff52 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.231.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.231.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 182215457221713
+                "lo": 739757868254732
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.232.json b/contracts/test_snapshots/fuzz_calculate_fees.232.json
index a21c4c1..b41b341 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.232.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.232.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 867790224516074
+                "lo": 287665000651691
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.233.json b/contracts/test_snapshots/fuzz_calculate_fees.233.json
index cb8f9ba..92c362b 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.233.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.233.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 215608383131851
+                "lo": 887429144105111
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.234.json b/contracts/test_snapshots/fuzz_calculate_fees.234.json
index 08d0e7f..0d75ea4 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.234.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.234.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 500653717782582
+                "lo": 65871322208819
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.235.json b/contracts/test_snapshots/fuzz_calculate_fees.235.json
index 799b7bf..c41ce8b 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.235.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.235.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 500715926734776
+                "lo": 608084067851282
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.236.json b/contracts/test_snapshots/fuzz_calculate_fees.236.json
index 9986bdb..0d33af6 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.236.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.236.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 508262137244876
+                "lo": 652510181134617
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.237.json b/contracts/test_snapshots/fuzz_calculate_fees.237.json
index da836bf..0c9e433 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.237.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.237.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 20331071287580
+                "lo": 413699201559572
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.238.json b/contracts/test_snapshots/fuzz_calculate_fees.238.json
index 16c6df5..470dd40 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.238.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.238.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 855147088704265
+                "lo": 50077754964317
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.239.json b/contracts/test_snapshots/fuzz_calculate_fees.239.json
index a7f3bae..248098c 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.239.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.239.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 697068241028219
+                "lo": 61154244559297
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.24.json b/contracts/test_snapshots/fuzz_calculate_fees.24.json
index f643a1f..d235693 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.24.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.24.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 634674855302635
+                "lo": 923771019554009
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.240.json b/contracts/test_snapshots/fuzz_calculate_fees.240.json
index 147ced4..02a9023 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.240.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.240.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 718283998416445
+                "lo": 62426550041363
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.241.json b/contracts/test_snapshots/fuzz_calculate_fees.241.json
index de5c413..e3e972c 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.241.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.241.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 157200344493140
+                "lo": 165046844797624
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.242.json b/contracts/test_snapshots/fuzz_calculate_fees.242.json
index 892396b..070d38a 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.242.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.242.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 846339405601118
+                "lo": 701533740075625
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.243.json b/contracts/test_snapshots/fuzz_calculate_fees.243.json
index 23d8557..8f57208 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.243.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.243.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 402853976634413
+                "lo": 317599670436593
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.244.json b/contracts/test_snapshots/fuzz_calculate_fees.244.json
index a7a2167..86a92af 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.244.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.244.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 556081788827807
+                "lo": 212340142097458
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.245.json b/contracts/test_snapshots/fuzz_calculate_fees.245.json
index 11e0ae2..9ec004b 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.245.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.245.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 128188764529138
+                "lo": 391729177550343
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.246.json b/contracts/test_snapshots/fuzz_calculate_fees.246.json
index 03a4c54..37d4864 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.246.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.246.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 845319170473954
+                "lo": 307913351913482
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.247.json b/contracts/test_snapshots/fuzz_calculate_fees.247.json
index 8c572c5..26f2b2c 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.247.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.247.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 998441102081811
+                "lo": 990725277150475
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.248.json b/contracts/test_snapshots/fuzz_calculate_fees.248.json
index 14146d4..03e5e5b 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.248.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.248.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 394748085823582
+                "lo": 950299509228976
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.249.json b/contracts/test_snapshots/fuzz_calculate_fees.249.json
index d841fd2..0b3e0f4 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.249.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.249.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 831184974559560
+                "lo": 517095102485623
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.25.json b/contracts/test_snapshots/fuzz_calculate_fees.25.json
index 86f6238..0a08182 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.25.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.25.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 567081489045261
+                "lo": 430626984746870
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.250.json b/contracts/test_snapshots/fuzz_calculate_fees.250.json
index d01b51a..97c1862 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.250.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.250.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 149814380705019
+                "lo": 334321829698499
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.251.json b/contracts/test_snapshots/fuzz_calculate_fees.251.json
index bd3cbd5..c2c20ba 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.251.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.251.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 274558452390243
+                "lo": 571254712733401
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.252.json b/contracts/test_snapshots/fuzz_calculate_fees.252.json
index 9848a97..a90eccb 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.252.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.252.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 777545933829768
+                "lo": 346317328531563
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.253.json b/contracts/test_snapshots/fuzz_calculate_fees.253.json
index fa7b5df..161e163 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.253.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.253.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 217736580724287
+                "lo": 42944360403459
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.254.json b/contracts/test_snapshots/fuzz_calculate_fees.254.json
index 39e9cae..6c08514 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.254.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.254.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 360019284131829
+                "lo": 548132407502229
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.255.json b/contracts/test_snapshots/fuzz_calculate_fees.255.json
index 756a0e1..b6a731a 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.255.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.255.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 999134162795180
+                "lo": 882877407587550
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.256.json b/contracts/test_snapshots/fuzz_calculate_fees.256.json
index 0d0dc48..069118d 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.256.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.256.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 700844857708817
+                "lo": 370117245310627
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.26.json b/contracts/test_snapshots/fuzz_calculate_fees.26.json
index ca75a1b..e9227d4 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.26.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.26.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 814843342592000
+                "lo": 854438605928156
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.27.json b/contracts/test_snapshots/fuzz_calculate_fees.27.json
index 459df38..577b437 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.27.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.27.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 823334694826674
+                "lo": 280495259138855
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.28.json b/contracts/test_snapshots/fuzz_calculate_fees.28.json
index 93efc32..c43083c 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.28.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.28.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 888026301118414
+                "lo": 827856870537053
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.29.json b/contracts/test_snapshots/fuzz_calculate_fees.29.json
index 1eb2a16..0e3e2c7 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.29.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.29.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 168664023858947
+                "lo": 124332224552150
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.3.json b/contracts/test_snapshots/fuzz_calculate_fees.3.json
index 0bd7b87..4db1488 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.3.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.3.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 559280196542057
+                "lo": 169241193269807
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.30.json b/contracts/test_snapshots/fuzz_calculate_fees.30.json
index 3da9b5d..4dcbf0d 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.30.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.30.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 898307559854151
+                "lo": 149446446422718
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.31.json b/contracts/test_snapshots/fuzz_calculate_fees.31.json
index b0e3c2a..dea52d5 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.31.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.31.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 246655660151533
+                "lo": 156434679431383
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.32.json b/contracts/test_snapshots/fuzz_calculate_fees.32.json
index 1aa2248..d7050e2 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.32.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.32.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 306290922318529
+                "lo": 307239971511983
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.33.json b/contracts/test_snapshots/fuzz_calculate_fees.33.json
index 608cde1..3dabd6f 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.33.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.33.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 75492474023766
+                "lo": 962820742363914
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.34.json b/contracts/test_snapshots/fuzz_calculate_fees.34.json
index ebbec07..4fbe150 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.34.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.34.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 646353743849179
+                "lo": 928948202336218
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.35.json b/contracts/test_snapshots/fuzz_calculate_fees.35.json
index a6aa49f..dbfcfc5 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.35.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.35.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 988358253862530
+                "lo": 138811948163325
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.36.json b/contracts/test_snapshots/fuzz_calculate_fees.36.json
index 8da49bd..23067bd 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.36.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.36.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 496488280013324
+                "lo": 904598752176974
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.37.json b/contracts/test_snapshots/fuzz_calculate_fees.37.json
index 217d525..46466dc 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.37.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.37.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 463525409054673
+                "lo": 638672171256724
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.38.json b/contracts/test_snapshots/fuzz_calculate_fees.38.json
index 2f30977..fded72c 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.38.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.38.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 610010730998123
+                "lo": 675285645801019
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.39.json b/contracts/test_snapshots/fuzz_calculate_fees.39.json
index 5be54ec..11849ea 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.39.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.39.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 599140428618273
+                "lo": 296362420267539
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.4.json b/contracts/test_snapshots/fuzz_calculate_fees.4.json
index e8f111f..253cddb 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.4.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.4.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 916103973012453
+                "lo": 711743825644193
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.40.json b/contracts/test_snapshots/fuzz_calculate_fees.40.json
index b3134de..5f52850 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.40.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.40.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 20614432991818
+                "lo": 109435071203569
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.41.json b/contracts/test_snapshots/fuzz_calculate_fees.41.json
index be2e0d7..361cb00 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.41.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.41.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 219362104773173
+                "lo": 612583413823632
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.42.json b/contracts/test_snapshots/fuzz_calculate_fees.42.json
index db8e6ca..728e2e4 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.42.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.42.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 294376085675362
+                "lo": 476418386472576
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.43.json b/contracts/test_snapshots/fuzz_calculate_fees.43.json
index 952ff1a..81753fe 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.43.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.43.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 140991316651401
+                "lo": 446037853766747
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.44.json b/contracts/test_snapshots/fuzz_calculate_fees.44.json
index df78477..99c2cb8 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.44.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.44.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 811351393555950
+                "lo": 648872332161803
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.45.json b/contracts/test_snapshots/fuzz_calculate_fees.45.json
index 6a8bfda..75366a8 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.45.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.45.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 708654936813047
+                "lo": 908172934675192
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.46.json b/contracts/test_snapshots/fuzz_calculate_fees.46.json
index 1246a29..2112489 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.46.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.46.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 811525108602326
+                "lo": 998465964280198
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.47.json b/contracts/test_snapshots/fuzz_calculate_fees.47.json
index 353d41f..6f0402b 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.47.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.47.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 788732523539604
+                "lo": 25706234202390
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.48.json b/contracts/test_snapshots/fuzz_calculate_fees.48.json
index d691600..3d99c1a 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.48.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.48.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 368473740820857
+                "lo": 577832639553162
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.49.json b/contracts/test_snapshots/fuzz_calculate_fees.49.json
index 03e15ba..d1ab76e 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.49.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.49.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 460079835546202
+                "lo": 993417755446071
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.5.json b/contracts/test_snapshots/fuzz_calculate_fees.5.json
index ae47ff7..560035c 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.5.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.5.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 183595564314475
+                "lo": 469372949723929
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.50.json b/contracts/test_snapshots/fuzz_calculate_fees.50.json
index 796e1d9..45ad3b0 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.50.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.50.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 924589783129462
+                "lo": 364624510510985
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.51.json b/contracts/test_snapshots/fuzz_calculate_fees.51.json
index 7aac8e7..ee1ec9d 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.51.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.51.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 740929557180759
+                "lo": 221130856254631
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.52.json b/contracts/test_snapshots/fuzz_calculate_fees.52.json
index 84fb5af..2593e88 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.52.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.52.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 563510403697925
+                "lo": 484934391028422
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.53.json b/contracts/test_snapshots/fuzz_calculate_fees.53.json
index cc7cbc7..7ecbb0b 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.53.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.53.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 101795509314729
+                "lo": 231685463815140
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.54.json b/contracts/test_snapshots/fuzz_calculate_fees.54.json
index 0377a24..cda132e 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.54.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.54.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 143453557075321
+                "lo": 427249426007590
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.55.json b/contracts/test_snapshots/fuzz_calculate_fees.55.json
index 2d40d49..3d727a9 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.55.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.55.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 283611852888147
+                "lo": 733574168321730
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.56.json b/contracts/test_snapshots/fuzz_calculate_fees.56.json
index ceac739..d75ab27 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.56.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.56.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 563939470511921
+                "lo": 298004322198468
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.57.json b/contracts/test_snapshots/fuzz_calculate_fees.57.json
index e043932..b596f52 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.57.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.57.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 22173902637987
+                "lo": 891451976235722
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.58.json b/contracts/test_snapshots/fuzz_calculate_fees.58.json
index 10eae82..15061a0 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.58.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.58.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 171031036103416
+                "lo": 10391187291261
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.59.json b/contracts/test_snapshots/fuzz_calculate_fees.59.json
index 60c8689..e5cea3e 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.59.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.59.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 163859958241939
+                "lo": 375052858558225
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.6.json b/contracts/test_snapshots/fuzz_calculate_fees.6.json
index b30b6af..9c86fbe 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.6.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.6.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 418675880858193
+                "lo": 259275570823547
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.60.json b/contracts/test_snapshots/fuzz_calculate_fees.60.json
index d11ff0c..4cc71d0 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.60.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.60.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 891207929944411
+                "lo": 883730875271770
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.61.json b/contracts/test_snapshots/fuzz_calculate_fees.61.json
index bfa499d..23748ea 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.61.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.61.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 236614773455096
+                "lo": 658337874936581
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.62.json b/contracts/test_snapshots/fuzz_calculate_fees.62.json
index 70e5770..307ec7e 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.62.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.62.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 489968650523579
+                "lo": 999146568088530
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.63.json b/contracts/test_snapshots/fuzz_calculate_fees.63.json
index 0166d5e..693f3c2 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.63.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.63.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 705118578735063
+                "lo": 23938068520763
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.64.json b/contracts/test_snapshots/fuzz_calculate_fees.64.json
index 9abb757..b0d997f 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.64.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.64.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 87204685345644
+                "lo": 116019064924565
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.65.json b/contracts/test_snapshots/fuzz_calculate_fees.65.json
index cf53f2a..fac87a2 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.65.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.65.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 132174676428798
+                "lo": 782368679955721
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.66.json b/contracts/test_snapshots/fuzz_calculate_fees.66.json
index e710b4b..fb96e66 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.66.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.66.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 520391592462196
+                "lo": 62002543743239
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.67.json b/contracts/test_snapshots/fuzz_calculate_fees.67.json
index 30225a0..ea1d59a 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.67.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.67.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 454530677900464
+                "lo": 641885084963856
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.68.json b/contracts/test_snapshots/fuzz_calculate_fees.68.json
index d1c493f..9e18e63 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.68.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.68.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 120986493568896
+                "lo": 26616328020420
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.69.json b/contracts/test_snapshots/fuzz_calculate_fees.69.json
index 931b6da..36889c2 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.69.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.69.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 287857025071663
+                "lo": 435449627119741
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.7.json b/contracts/test_snapshots/fuzz_calculate_fees.7.json
index d680791..22f07af 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.7.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.7.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 169109134757935
+                "lo": 274864068899549
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.70.json b/contracts/test_snapshots/fuzz_calculate_fees.70.json
index 0ddf893..fd26196 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.70.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.70.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 580091734112287
+                "lo": 105710499966602
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.71.json b/contracts/test_snapshots/fuzz_calculate_fees.71.json
index 9befa2d..d4482ce 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.71.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.71.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 57638842470699
+                "lo": 65329345489428
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.72.json b/contracts/test_snapshots/fuzz_calculate_fees.72.json
index b312b47..175b754 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.72.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.72.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 910253945469493
+                "lo": 422665640008395
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.73.json b/contracts/test_snapshots/fuzz_calculate_fees.73.json
index 5e365ba..5266c68 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.73.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.73.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 895743901500302
+                "lo": 873711674887861
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.74.json b/contracts/test_snapshots/fuzz_calculate_fees.74.json
index 7ae6ca5..5d28358 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.74.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.74.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 762266316848640
+                "lo": 534913259029037
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.75.json b/contracts/test_snapshots/fuzz_calculate_fees.75.json
index 8b7fca2..79d4728 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.75.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.75.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 261141988531300
+                "lo": 123732872242953
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.76.json b/contracts/test_snapshots/fuzz_calculate_fees.76.json
index 9d6142a..a22deed 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.76.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.76.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 181250325540310
+                "lo": 71767912865721
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.77.json b/contracts/test_snapshots/fuzz_calculate_fees.77.json
index f16af7b..a7fd24b 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.77.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.77.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 794936015798225
+                "lo": 12853077283149
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.78.json b/contracts/test_snapshots/fuzz_calculate_fees.78.json
index e6f725a..3250154 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.78.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.78.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 172507958491500
+                "lo": 210106745635249
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.79.json b/contracts/test_snapshots/fuzz_calculate_fees.79.json
index 0c7e0a9..30c68dd 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.79.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.79.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 511922028439765
+                "lo": 783421981643801
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.8.json b/contracts/test_snapshots/fuzz_calculate_fees.8.json
index aeb76b5..3f8714b 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.8.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.8.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 911774215847945
+                "lo": 377414198033404
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.80.json b/contracts/test_snapshots/fuzz_calculate_fees.80.json
index c78b53e..e44a5ab 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.80.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.80.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 498315013299552
+                "lo": 560044485243924
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.81.json b/contracts/test_snapshots/fuzz_calculate_fees.81.json
index a663600..b45e76b 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.81.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.81.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 942723935126100
+                "lo": 498294641436382
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.82.json b/contracts/test_snapshots/fuzz_calculate_fees.82.json
index 6822e20..a648816 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.82.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.82.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 678546612776820
+                "lo": 251454769939737
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.83.json b/contracts/test_snapshots/fuzz_calculate_fees.83.json
index 5c50367..09f6292 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.83.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.83.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 4991213927698
+                "lo": 505105255485471
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.84.json b/contracts/test_snapshots/fuzz_calculate_fees.84.json
index 5810b67..b2bd00a 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.84.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.84.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 290800769678315
+                "lo": 846339564651433
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.85.json b/contracts/test_snapshots/fuzz_calculate_fees.85.json
index 14c5428..857faf0 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.85.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.85.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 514138755703089
+                "lo": 576329128225518
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.86.json b/contracts/test_snapshots/fuzz_calculate_fees.86.json
index 59cbe0e..e13929c 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.86.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.86.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 148699286544774
+                "lo": 67864143356948
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.87.json b/contracts/test_snapshots/fuzz_calculate_fees.87.json
index 73eb8bf..03c6835 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.87.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.87.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 744387054376967
+                "lo": 996305189031830
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.88.json b/contracts/test_snapshots/fuzz_calculate_fees.88.json
index 75d9296..1d12656 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.88.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.88.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 82309009740273
+                "lo": 931175212743696
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.89.json b/contracts/test_snapshots/fuzz_calculate_fees.89.json
index 581dc48..a8fa432 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.89.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.89.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 364160907280157
+                "lo": 311241573515468
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.9.json b/contracts/test_snapshots/fuzz_calculate_fees.9.json
index eeacd13..ec85d52 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.9.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.9.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 628528456738377
+                "lo": 257482019084855
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.90.json b/contracts/test_snapshots/fuzz_calculate_fees.90.json
index c502314..9c60fdd 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.90.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.90.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 778684791609243
+                "lo": 448022957924497
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.91.json b/contracts/test_snapshots/fuzz_calculate_fees.91.json
index 91ce9d5..e6ec497 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.91.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.91.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 677078091248574
+                "lo": 559233060559093
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.92.json b/contracts/test_snapshots/fuzz_calculate_fees.92.json
index 7d02401..aee7def 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.92.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.92.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 838597228160819
+                "lo": 797607492367698
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.93.json b/contracts/test_snapshots/fuzz_calculate_fees.93.json
index 58076c2..e38c614 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.93.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.93.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 89764383565763
+                "lo": 518097872500620
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.94.json b/contracts/test_snapshots/fuzz_calculate_fees.94.json
index e0ae6a9..499afdd 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.94.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.94.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 437474450290999
+                "lo": 290562669347155
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.95.json b/contracts/test_snapshots/fuzz_calculate_fees.95.json
index 560707d..8f37909 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.95.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.95.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 404216742461156
+                "lo": 578138767257007
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.96.json b/contracts/test_snapshots/fuzz_calculate_fees.96.json
index 5195c62..5b64d4d 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.96.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.96.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 766670004800859
+                "lo": 80997386087286
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.97.json b/contracts/test_snapshots/fuzz_calculate_fees.97.json
index 5a43b12..d32c600 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.97.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.97.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 82822321310770
+                "lo": 213954129683229
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.98.json b/contracts/test_snapshots/fuzz_calculate_fees.98.json
index 6e4f4a8..4fa6a68 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.98.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.98.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 819618698505627
+                "lo": 327348518511998
               }
             }
           }
diff --git a/contracts/test_snapshots/fuzz_calculate_fees.99.json b/contracts/test_snapshots/fuzz_calculate_fees.99.json
index 88561fc..22f2b1a 100644
--- a/contracts/test_snapshots/fuzz_calculate_fees.99.json
+++ b/contracts/test_snapshots/fuzz_calculate_fees.99.json
@@ -256,7 +256,7 @@
             "data": {
               "i128": {
                 "hi": 0,
-                "lo": 613464301949604
+                "lo": 144794817837955
               }
             }
           }
diff --git a/contracts/test_snapshots/payment_escrow/test/test_add_approver_duplicate_rejected.1.json b/contracts/test_snapshots/payment_escrow/test/test_add_approver_duplicate_rejected.1.json
index 5b53696..b573bce 100644
--- a/contracts/test_snapshots/payment_escrow/test/test_add_approver_duplicate_rejected.1.json
+++ b/contracts/test_snapshots/payment_escrow/test/test_add_approver_duplicate_rejected.1.json
@@ -477,16 +477,7 @@
         {
           "contract_data": {
             "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-            "key": {
-              "vec": [
-                {
-                  "symbol": "Escrow"
-                },
-                {
-                  "u64": 1
-                }
-              ]
-            },
+            "key": "ledger_key_contract_instance",
             "durability": "persistent"
           }
         },
@@ -497,360 +488,341 @@
               "contract_data": {
                 "ext": "v0",
                 "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-                "key": {
-                  "vec": [
-                    {
-                      "symbol": "Escrow"
-                    },
-                    {
-                      "u64": 1
-                    }
-                  ]
-                },
+                "key": "ledger_key_contract_instance",
                 "durability": "persistent",
                 "val": {
-                  "map": [
-                    {
-                      "key": {
-                        "symbol": "amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 5000
-                        }
-                      }
+                  "contract_instance": {
+                    "executable": {
+                      "wasm": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
                     },
-                    {
-                      "key": {
-                        "symbol": "asset"
-                      },
-                      "val": {
-                        "map": [
-                          {
-                            "key": {
-                              "symbol": "code"
-                            },
-                            "val": {
-                              "string": "USDC"
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "issuer"
-                            },
-                            "val": {
-                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
+                    "storage": [
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "Admin"
                             }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "created_at"
-                      },
-                      "val": {
-                        "u64": 1000
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "deposited_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 5000
-                        }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "escrow_id"
-                      },
-                      "val": {
-                        "u64": 1
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "flags"
-                      },
-                      "val": {
-                        "u32": 2
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "last_deposit_at"
-                      },
-                      "val": {
-                        "u64": 1000
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "memo"
-                      },
-                      "val": {
-                        "string": "Multi-party test"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "recipient"
-                      },
-                      "val": {
-                        "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "refund_timestamp"
-                      },
-                      "val": {
-                        "u64": 0
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "refunded_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 0
+                          ]
+                        },
+                        "val": {
+                          "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "release_conditions"
                       },
-                      "val": {
-                        "map": [
-                          {
-                            "key": {
-                              "symbol": "conditions"
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "Escrow"
                             },
-                            "val": {
-                              "vec": []
+                            {
+                              "u64": 1
                             }
-                          },
-                          {
-                            "key": {
-                              "symbol": "current_approvals"
+                          ]
+                        },
+                        "val": {
+                          "map": [
+                            {
+                              "key": {
+                                "symbol": "allow_partial_release"
+                              },
+                              "val": {
+                                "bool": false
+                              }
                             },
-                            "val": {
-                              "u32": 0
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "expiration_timestamp"
+                            {
+                              "key": {
+                                "symbol": "amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 5000
+                                }
+                              }
                             },
-                            "val": {
-                              "u64": 10000
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "min_approvals"
+                            {
+                              "key": {
+                                "symbol": "asset"
+                              },
+                              "val": {
+                                "map": [
+                                  {
+                                    "key": {
+                                      "symbol": "code"
+                                    },
+                                    "val": {
+                                      "string": "USDC"
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "issuer"
+                                    },
+                                    "val": {
+                                      "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
+                                    }
+                                  }
+                                ]
+                              }
                             },
-                            "val": {
-                              "u32": 1
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "operator"
+                            {
+                              "key": {
+                                "symbol": "created_at"
+                              },
+                              "val": {
+                                "u64": 1000
+                              }
                             },
-                            "val": {
-                              "vec": [
-                                {
-                                  "symbol": "And"
+                            {
+                              "key": {
+                                "symbol": "deposited_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 5000
                                 }
-                              ]
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "escrow_id"
+                              },
+                              "val": {
+                                "u64": 1
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "kyc_compliant"
+                              },
+                              "val": {
+                                "bool": false
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "last_deposit_at"
+                              },
+                              "val": {
+                                "u64": 1000
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "memo"
+                              },
+                              "val": {
+                                "string": "Multi-party test"
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "multi_party_enabled"
+                              },
+                              "val": {
+                                "bool": true
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "recipient"
+                              },
+                              "val": {
+                                "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "refund_timestamp"
+                              },
+                              "val": {
+                                "u64": 0
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "refunded_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 0
+                                }
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "release_conditions"
+                              },
+                              "val": {
+                                "map": [
+                                  {
+                                    "key": {
+                                      "symbol": "conditions"
+                                    },
+                                    "val": {
+                                      "vec": []
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "current_approvals"
+                                    },
+                                    "val": {
+                                      "u32": 0
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "expiration_timestamp"
+                                    },
+                                    "val": {
+                                      "u64": 10000
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "min_approvals"
+                                    },
+                                    "val": {
+                                      "u32": 1
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "operator"
+                                    },
+                                    "val": {
+                                      "vec": [
+                                        {
+                                          "symbol": "And"
+                                        }
+                                      ]
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "oracle_confirmation"
+                                    },
+                                    "val": {
+                                      "bool": false
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "recipient_approval"
+                                    },
+                                    "val": {
+                                      "bool": false
+                                    }
+                                  }
+                                ]
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "release_timestamp"
+                              },
+                              "val": {
+                                "u64": 0
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "released_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 0
+                                }
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "sender"
+                              },
+                              "val": {
+                                "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "status"
+                              },
+                              "val": {
+                                "vec": [
+                                  {
+                                    "symbol": "Funded"
+                                  }
+                                ]
+                              }
                             }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "release_timestamp"
-                      },
-                      "val": {
-                        "u64": 0
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "released_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 0
+                          ]
                         }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "sender"
-                      },
-                      "val": {
-                        "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "status"
                       },
-                      "val": {
-                        "vec": [
-                          {
-                            "symbol": "Funded"
-                          }
-                        ]
-                      }
-                    }
-                  ]
-                }
-              }
-            },
-            "ext": "v0"
-          },
-          4095
-        ]
-      ],
-      [
-        {
-          "contract_data": {
-            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-            "key": {
-              "vec": [
-                {
-                  "symbol": "EscrowApprovals"
-                },
-                {
-                  "u64": 1
-                }
-              ]
-            },
-            "durability": "persistent"
-          }
-        },
-        [
-          {
-            "last_modified_ledger_seq": 0,
-            "data": {
-              "contract_data": {
-                "ext": "v0",
-                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-                "key": {
-                  "vec": [
-                    {
-                      "symbol": "EscrowApprovals"
-                    },
-                    {
-                      "u64": 1
-                    }
-                  ]
-                },
-                "durability": "persistent",
-                "val": {
-                  "map": [
-                    {
-                      "key": {
-                        "symbol": "approval_timeout"
-                      },
-                      "val": {
-                        "u64": 5000
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "approvals"
-                      },
-                      "val": {
-                        "map": []
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "finalized"
-                      },
-                      "val": {
-                        "bool": false
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "required_approvals"
-                      },
-                      "val": {
-                        "u32": 2
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "whitelisted_approvers"
-                      },
-                      "val": {
-                        "vec": [
-                          {
-                            "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
-                          },
-                          {
-                            "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
-                          }
-                        ]
-                      }
-                    }
-                  ]
-                }
-              }
-            },
-            "ext": "v0"
-          },
-          4095
-        ]
-      ],
-      [
-        {
-          "contract_data": {
-            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-            "key": "ledger_key_contract_instance",
-            "durability": "persistent"
-          }
-        },
-        [
-          {
-            "last_modified_ledger_seq": 0,
-            "data": {
-              "contract_data": {
-                "ext": "v0",
-                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-                "key": "ledger_key_contract_instance",
-                "durability": "persistent",
-                "val": {
-                  "contract_instance": {
-                    "executable": {
-                      "wasm": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
-                    },
-                    "storage": [
                       {
                         "key": {
                           "vec": [
                             {
-                              "symbol": "Admin"
+                              "symbol": "EscrowApprovals"
+                            },
+                            {
+                              "u64": 1
                             }
                           ]
                         },
                         "val": {
-                          "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
+                          "map": [
+                            {
+                              "key": {
+                                "symbol": "approval_timeout"
+                              },
+                              "val": {
+                                "u64": 5000
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "approvals"
+                              },
+                              "val": {
+                                "map": []
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "finalized"
+                              },
+                              "val": {
+                                "bool": false
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "required_approvals"
+                              },
+                              "val": {
+                                "u32": 2
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "whitelisted_approvers"
+                              },
+                              "val": {
+                                "vec": [
+                                  {
+                                    "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
+                                  },
+                                  {
+                                    "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
+                                  }
+                                ]
+                              }
+                            }
+                          ]
                         }
                       },
                       {
diff --git a/contracts/test_snapshots/payment_escrow/test/test_add_approver_dynamic.1.json b/contracts/test_snapshots/payment_escrow/test/test_add_approver_dynamic.1.json
index 8a5e27c..76fe453 100644
--- a/contracts/test_snapshots/payment_escrow/test/test_add_approver_dynamic.1.json
+++ b/contracts/test_snapshots/payment_escrow/test/test_add_approver_dynamic.1.json
@@ -557,16 +557,7 @@
         {
           "contract_data": {
             "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-            "key": {
-              "vec": [
-                {
-                  "symbol": "Escrow"
-                },
-                {
-                  "u64": 1
-                }
-              ]
-            },
+            "key": "ledger_key_contract_instance",
             "durability": "persistent"
           }
         },
@@ -577,372 +568,353 @@
               "contract_data": {
                 "ext": "v0",
                 "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-                "key": {
-                  "vec": [
-                    {
-                      "symbol": "Escrow"
-                    },
-                    {
-                      "u64": 1
-                    }
-                  ]
-                },
+                "key": "ledger_key_contract_instance",
                 "durability": "persistent",
                 "val": {
-                  "map": [
-                    {
-                      "key": {
-                        "symbol": "amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 5000
-                        }
-                      }
+                  "contract_instance": {
+                    "executable": {
+                      "wasm": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
                     },
-                    {
-                      "key": {
-                        "symbol": "asset"
-                      },
-                      "val": {
-                        "map": [
-                          {
-                            "key": {
-                              "symbol": "code"
-                            },
-                            "val": {
-                              "string": "USDC"
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "issuer"
-                            },
-                            "val": {
-                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
+                    "storage": [
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "Admin"
                             }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "created_at"
-                      },
-                      "val": {
-                        "u64": 1000
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "deposited_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 5000
-                        }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "escrow_id"
-                      },
-                      "val": {
-                        "u64": 1
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "flags"
-                      },
-                      "val": {
-                        "u32": 2
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "last_deposit_at"
-                      },
-                      "val": {
-                        "u64": 1000
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "memo"
-                      },
-                      "val": {
-                        "string": "Multi-party test"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "recipient"
-                      },
-                      "val": {
-                        "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "refund_timestamp"
-                      },
-                      "val": {
-                        "u64": 0
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "refunded_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 0
+                          ]
+                        },
+                        "val": {
+                          "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "release_conditions"
                       },
-                      "val": {
-                        "map": [
-                          {
-                            "key": {
-                              "symbol": "conditions"
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "Escrow"
                             },
-                            "val": {
-                              "vec": []
+                            {
+                              "u64": 1
                             }
-                          },
-                          {
-                            "key": {
-                              "symbol": "current_approvals"
+                          ]
+                        },
+                        "val": {
+                          "map": [
+                            {
+                              "key": {
+                                "symbol": "allow_partial_release"
+                              },
+                              "val": {
+                                "bool": false
+                              }
                             },
-                            "val": {
-                              "u32": 0
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "expiration_timestamp"
+                            {
+                              "key": {
+                                "symbol": "amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 5000
+                                }
+                              }
                             },
-                            "val": {
-                              "u64": 10000
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "min_approvals"
+                            {
+                              "key": {
+                                "symbol": "asset"
+                              },
+                              "val": {
+                                "map": [
+                                  {
+                                    "key": {
+                                      "symbol": "code"
+                                    },
+                                    "val": {
+                                      "string": "USDC"
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "issuer"
+                                    },
+                                    "val": {
+                                      "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
+                                    }
+                                  }
+                                ]
+                              }
                             },
-                            "val": {
-                              "u32": 1
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "operator"
+                            {
+                              "key": {
+                                "symbol": "created_at"
+                              },
+                              "val": {
+                                "u64": 1000
+                              }
                             },
-                            "val": {
-                              "vec": [
-                                {
-                                  "symbol": "And"
+                            {
+                              "key": {
+                                "symbol": "deposited_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 5000
                                 }
-                              ]
-                            }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "release_timestamp"
-                      },
-                      "val": {
-                        "u64": 0
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "released_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 0
-                        }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "sender"
-                      },
-                      "val": {
-                        "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "status"
-                      },
-                      "val": {
-                        "vec": [
-                          {
-                            "symbol": "Funded"
-                          }
-                        ]
-                      }
-                    }
-                  ]
-                }
-              }
-            },
-            "ext": "v0"
-          },
-          4095
-        ]
-      ],
-      [
-        {
-          "contract_data": {
-            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-            "key": {
-              "vec": [
-                {
-                  "symbol": "EscrowApprovals"
-                },
-                {
-                  "u64": 1
-                }
-              ]
-            },
-            "durability": "persistent"
-          }
-        },
-        [
-          {
-            "last_modified_ledger_seq": 0,
-            "data": {
-              "contract_data": {
-                "ext": "v0",
-                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-                "key": {
-                  "vec": [
-                    {
-                      "symbol": "EscrowApprovals"
-                    },
-                    {
-                      "u64": 1
-                    }
-                  ]
-                },
-                "durability": "persistent",
-                "val": {
-                  "map": [
-                    {
-                      "key": {
-                        "symbol": "approval_timeout"
-                      },
-                      "val": {
-                        "u64": 5000
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "approvals"
-                      },
-                      "val": {
-                        "map": [
-                          {
-                            "key": {
-                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMDR4"
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "escrow_id"
+                              },
+                              "val": {
+                                "u64": 1
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "kyc_compliant"
+                              },
+                              "val": {
+                                "bool": false
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "last_deposit_at"
+                              },
+                              "val": {
+                                "u64": 1000
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "memo"
+                              },
+                              "val": {
+                                "string": "Multi-party test"
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "multi_party_enabled"
+                              },
+                              "val": {
+                                "bool": true
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "recipient"
+                              },
+                              "val": {
+                                "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "refund_timestamp"
+                              },
+                              "val": {
+                                "u64": 0
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "refunded_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 0
+                                }
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "release_conditions"
+                              },
+                              "val": {
+                                "map": [
+                                  {
+                                    "key": {
+                                      "symbol": "conditions"
+                                    },
+                                    "val": {
+                                      "vec": []
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "current_approvals"
+                                    },
+                                    "val": {
+                                      "u32": 0
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "expiration_timestamp"
+                                    },
+                                    "val": {
+                                      "u64": 10000
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "min_approvals"
+                                    },
+                                    "val": {
+                                      "u32": 1
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "operator"
+                                    },
+                                    "val": {
+                                      "vec": [
+                                        {
+                                          "symbol": "And"
+                                        }
+                                      ]
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "oracle_confirmation"
+                                    },
+                                    "val": {
+                                      "bool": false
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "recipient_approval"
+                                    },
+                                    "val": {
+                                      "bool": false
+                                    }
+                                  }
+                                ]
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "release_timestamp"
+                              },
+                              "val": {
+                                "u64": 0
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "released_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 0
+                                }
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "sender"
+                              },
+                              "val": {
+                                "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
+                              }
                             },
-                            "val": {
-                              "bool": true
+                            {
+                              "key": {
+                                "symbol": "status"
+                              },
+                              "val": {
+                                "vec": [
+                                  {
+                                    "symbol": "Funded"
+                                  }
+                                ]
+                              }
                             }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "finalized"
-                      },
-                      "val": {
-                        "bool": false
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "required_approvals"
-                      },
-                      "val": {
-                        "u32": 2
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "whitelisted_approvers"
+                          ]
+                        }
                       },
-                      "val": {
-                        "vec": [
-                          {
-                            "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
-                          },
-                          {
-                            "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
-                          },
-                          {
-                            "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMDR4"
-                          }
-                        ]
-                      }
-                    }
-                  ]
-                }
-              }
-            },
-            "ext": "v0"
-          },
-          4095
-        ]
-      ],
-      [
-        {
-          "contract_data": {
-            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-            "key": "ledger_key_contract_instance",
-            "durability": "persistent"
-          }
-        },
-        [
-          {
-            "last_modified_ledger_seq": 0,
-            "data": {
-              "contract_data": {
-                "ext": "v0",
-                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-                "key": "ledger_key_contract_instance",
-                "durability": "persistent",
-                "val": {
-                  "contract_instance": {
-                    "executable": {
-                      "wasm": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
-                    },
-                    "storage": [
                       {
                         "key": {
                           "vec": [
                             {
-                              "symbol": "Admin"
+                              "symbol": "EscrowApprovals"
+                            },
+                            {
+                              "u64": 1
                             }
                           ]
                         },
                         "val": {
-                          "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
+                          "map": [
+                            {
+                              "key": {
+                                "symbol": "approval_timeout"
+                              },
+                              "val": {
+                                "u64": 5000
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "approvals"
+                              },
+                              "val": {
+                                "map": [
+                                  {
+                                    "key": {
+                                      "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMDR4"
+                                    },
+                                    "val": {
+                                      "bool": true
+                                    }
+                                  }
+                                ]
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "finalized"
+                              },
+                              "val": {
+                                "bool": false
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "required_approvals"
+                              },
+                              "val": {
+                                "u32": 2
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "whitelisted_approvers"
+                              },
+                              "val": {
+                                "vec": [
+                                  {
+                                    "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
+                                  },
+                                  {
+                                    "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
+                                  },
+                                  {
+                                    "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMDR4"
+                                  }
+                                ]
+                              }
+                            }
+                          ]
                         }
                       },
                       {
diff --git a/contracts/test_snapshots/payment_escrow/test/test_add_condition.1.json b/contracts/test_snapshots/payment_escrow/test/test_add_condition.1.json
index 4197b2c..b07bc42 100644
--- a/contracts/test_snapshots/payment_escrow/test/test_add_condition.1.json
+++ b/contracts/test_snapshots/payment_escrow/test/test_add_condition.1.json
@@ -152,16 +152,7 @@
         {
           "contract_data": {
             "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM",
-            "key": {
-              "vec": [
-                {
-                  "symbol": "Escrow"
-                },
-                {
-                  "u64": 1
-                }
-              ]
-            },
+            "key": "ledger_key_contract_instance",
             "durability": "persistent"
           }
         },
@@ -172,311 +163,322 @@
               "contract_data": {
                 "ext": "v0",
                 "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM",
-                "key": {
-                  "vec": [
-                    {
-                      "symbol": "Escrow"
-                    },
-                    {
-                      "u64": 1
-                    }
-                  ]
-                },
+                "key": "ledger_key_contract_instance",
                 "durability": "persistent",
                 "val": {
-                  "map": [
-                    {
-                      "key": {
-                        "symbol": "amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 1000
-                        }
-                      }
+                  "contract_instance": {
+                    "executable": {
+                      "wasm": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
                     },
-                    {
-                      "key": {
-                        "symbol": "asset"
+                    "storage": [
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "Admin"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
+                        }
                       },
-                      "val": {
-                        "map": [
-                          {
-                            "key": {
-                              "symbol": "code"
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "Escrow"
                             },
-                            "val": {
-                              "string": "USDC"
+                            {
+                              "u64": 1
                             }
-                          },
-                          {
-                            "key": {
-                              "symbol": "issuer"
+                          ]
+                        },
+                        "val": {
+                          "map": [
+                            {
+                              "key": {
+                                "symbol": "allow_partial_release"
+                              },
+                              "val": {
+                                "bool": false
+                              }
                             },
-                            "val": {
-                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
-                            }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "created_at"
-                      },
-                      "val": {
-                        "u64": 0
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "deposited_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 0
-                        }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "escrow_id"
-                      },
-                      "val": {
-                        "u64": 1
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "flags"
-                      },
-                      "val": {
-                        "u32": 0
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "last_deposit_at"
-                      },
-                      "val": {
-                        "u64": 0
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "memo"
-                      },
-                      "val": {
-                        "string": "Test"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "recipient"
-                      },
-                      "val": {
-                        "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "refund_timestamp"
-                      },
-                      "val": {
-                        "u64": 0
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "refunded_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 0
-                        }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "release_conditions"
-                      },
-                      "val": {
-                        "map": [
-                          {
-                            "key": {
-                              "symbol": "conditions"
+                            {
+                              "key": {
+                                "symbol": "amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 1000
+                                }
+                              }
                             },
-                            "val": {
-                              "vec": [
-                                {
-                                  "map": [
-                                    {
-                                      "key": {
-                                        "symbol": "condition_type"
-                                      },
-                                      "val": {
-                                        "vec": [
-                                          {
-                                            "symbol": "OraclePrice"
-                                          }
-                                        ]
-                                      }
-                                    },
-                                    {
-                                      "key": {
-                                        "symbol": "required"
-                                      },
-                                      "val": {
-                                        "bool": true
-                                      }
+                            {
+                              "key": {
+                                "symbol": "asset"
+                              },
+                              "val": {
+                                "map": [
+                                  {
+                                    "key": {
+                                      "symbol": "code"
                                     },
-                                    {
-                                      "key": {
-                                        "symbol": "threshold_value"
-                                      },
-                                      "val": {
-                                        "i128": {
-                                          "hi": 0,
-                                          "lo": 100
-                                        }
-                                      }
+                                    "val": {
+                                      "string": "USDC"
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "issuer"
                                     },
-                                    {
-                                      "key": {
-                                        "symbol": "verified"
-                                      },
-                                      "val": {
-                                        "bool": false
-                                      }
+                                    "val": {
+                                      "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
                                     }
-                                  ]
+                                  }
+                                ]
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "created_at"
+                              },
+                              "val": {
+                                "u64": 0
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "deposited_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 0
                                 }
-                              ]
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "current_approvals"
+                              }
                             },
-                            "val": {
-                              "u32": 0
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "expiration_timestamp"
+                            {
+                              "key": {
+                                "symbol": "escrow_id"
+                              },
+                              "val": {
+                                "u64": 1
+                              }
                             },
-                            "val": {
-                              "u64": 2000
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "min_approvals"
+                            {
+                              "key": {
+                                "symbol": "kyc_compliant"
+                              },
+                              "val": {
+                                "bool": false
+                              }
                             },
-                            "val": {
-                              "u32": 1
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "operator"
+                            {
+                              "key": {
+                                "symbol": "last_deposit_at"
+                              },
+                              "val": {
+                                "u64": 0
+                              }
                             },
-                            "val": {
-                              "vec": [
-                                {
-                                  "symbol": "And"
+                            {
+                              "key": {
+                                "symbol": "memo"
+                              },
+                              "val": {
+                                "string": "Test"
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "multi_party_enabled"
+                              },
+                              "val": {
+                                "bool": false
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "recipient"
+                              },
+                              "val": {
+                                "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "refund_timestamp"
+                              },
+                              "val": {
+                                "u64": 0
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "refunded_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 0
                                 }
-                              ]
-                            }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "release_timestamp"
-                      },
-                      "val": {
-                        "u64": 0
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "released_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 0
-                        }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "sender"
-                      },
-                      "val": {
-                        "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "status"
-                      },
-                      "val": {
-                        "vec": [
-                          {
-                            "symbol": "Pending"
-                          }
-                        ]
-                      }
-                    }
-                  ]
-                }
-              }
-            },
-            "ext": "v0"
-          },
-          4095
-        ]
-      ],
-      [
-        {
-          "contract_data": {
-            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM",
-            "key": "ledger_key_contract_instance",
-            "durability": "persistent"
-          }
-        },
-        [
-          {
-            "last_modified_ledger_seq": 0,
-            "data": {
-              "contract_data": {
-                "ext": "v0",
-                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM",
-                "key": "ledger_key_contract_instance",
-                "durability": "persistent",
-                "val": {
-                  "contract_instance": {
-                    "executable": {
-                      "wasm": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
-                    },
-                    "storage": [
-                      {
-                        "key": {
-                          "vec": [
+                              }
+                            },
                             {
-                              "symbol": "Admin"
+                              "key": {
+                                "symbol": "release_conditions"
+                              },
+                              "val": {
+                                "map": [
+                                  {
+                                    "key": {
+                                      "symbol": "conditions"
+                                    },
+                                    "val": {
+                                      "vec": [
+                                        {
+                                          "map": [
+                                            {
+                                              "key": {
+                                                "symbol": "condition_type"
+                                              },
+                                              "val": {
+                                                "vec": [
+                                                  {
+                                                    "symbol": "OraclePrice"
+                                                  }
+                                                ]
+                                              }
+                                            },
+                                            {
+                                              "key": {
+                                                "symbol": "required"
+                                              },
+                                              "val": {
+                                                "bool": true
+                                              }
+                                            },
+                                            {
+                                              "key": {
+                                                "symbol": "threshold_value"
+                                              },
+                                              "val": {
+                                                "i128": {
+                                                  "hi": 0,
+                                                  "lo": 100
+                                                }
+                                              }
+                                            },
+                                            {
+                                              "key": {
+                                                "symbol": "verified"
+                                              },
+                                              "val": {
+                                                "bool": false
+                                              }
+                                            }
+                                          ]
+                                        }
+                                      ]
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "current_approvals"
+                                    },
+                                    "val": {
+                                      "u32": 0
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "expiration_timestamp"
+                                    },
+                                    "val": {
+                                      "u64": 2000
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "min_approvals"
+                                    },
+                                    "val": {
+                                      "u32": 1
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "operator"
+                                    },
+                                    "val": {
+                                      "vec": [
+                                        {
+                                          "symbol": "And"
+                                        }
+                                      ]
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "oracle_confirmation"
+                                    },
+                                    "val": {
+                                      "bool": false
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "recipient_approval"
+                                    },
+                                    "val": {
+                                      "bool": false
+                                    }
+                                  }
+                                ]
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "release_timestamp"
+                              },
+                              "val": {
+                                "u64": 0
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "released_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 0
+                                }
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "sender"
+                              },
+                              "val": {
+                                "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "status"
+                              },
+                              "val": {
+                                "vec": [
+                                  {
+                                    "symbol": "Pending"
+                                  }
+                                ]
+                              }
                             }
                           ]
-                        },
-                        "val": {
-                          "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
                         }
                       },
                       {
@@ -1144,6 +1146,14 @@
             ],
             "data": {
               "map": [
+                {
+                  "key": {
+                    "symbol": "allow_partial_release"
+                  },
+                  "val": {
+                    "bool": false
+                  }
+                },
                 {
                   "key": {
                     "symbol": "amount"
@@ -1209,10 +1219,10 @@
                 },
                 {
                   "key": {
-                    "symbol": "flags"
+                    "symbol": "kyc_compliant"
                   },
                   "val": {
-                    "u32": 0
+                    "bool": false
                   }
                 },
                 {
@@ -1231,6 +1241,14 @@
                     "string": "Test"
                   }
                 },
+                {
+                  "key": {
+                    "symbol": "multi_party_enabled"
+                  },
+                  "val": {
+                    "bool": false
+                  }
+                },
                 {
                   "key": {
                     "symbol": "recipient"
@@ -1351,6 +1369,22 @@
                             }
                           ]
                         }
+                      },
+                      {
+                        "key": {
+                          "symbol": "oracle_confirmation"
+                        },
+                        "val": {
+                          "bool": false
+                        }
+                      },
+                      {
+                        "key": {
+                          "symbol": "recipient_approval"
+                        },
+                        "val": {
+                          "bool": false
+                        }
                       }
                     ]
                   }
diff --git a/contracts/test_snapshots/payment_escrow/test/test_approve_after_finalized_rejected.1.json b/contracts/test_snapshots/payment_escrow/test/test_approve_after_finalized_rejected.1.json
index d5af91a..0058e9d 100644
--- a/contracts/test_snapshots/payment_escrow/test/test_approve_after_finalized_rejected.1.json
+++ b/contracts/test_snapshots/payment_escrow/test/test_approve_after_finalized_rejected.1.json
@@ -703,16 +703,7 @@
         {
           "contract_data": {
             "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-            "key": {
-              "vec": [
-                {
-                  "symbol": "Escrow"
-                },
-                {
-                  "u64": 1
-                }
-              ]
-            },
+            "key": "ledger_key_contract_instance",
             "durability": "persistent"
           }
         },
@@ -723,380 +714,361 @@
               "contract_data": {
                 "ext": "v0",
                 "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-                "key": {
-                  "vec": [
-                    {
-                      "symbol": "Escrow"
-                    },
-                    {
-                      "u64": 1
-                    }
-                  ]
-                },
+                "key": "ledger_key_contract_instance",
                 "durability": "persistent",
                 "val": {
-                  "map": [
-                    {
-                      "key": {
-                        "symbol": "amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 5000
-                        }
-                      }
+                  "contract_instance": {
+                    "executable": {
+                      "wasm": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
                     },
-                    {
-                      "key": {
-                        "symbol": "asset"
-                      },
-                      "val": {
-                        "map": [
-                          {
-                            "key": {
-                              "symbol": "code"
-                            },
-                            "val": {
-                              "string": "USDC"
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "issuer"
-                            },
-                            "val": {
-                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
+                    "storage": [
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "Admin"
                             }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "created_at"
-                      },
-                      "val": {
-                        "u64": 1000
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "deposited_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 5000
-                        }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "escrow_id"
-                      },
-                      "val": {
-                        "u64": 1
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "flags"
-                      },
-                      "val": {
-                        "u32": 2
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "last_deposit_at"
-                      },
-                      "val": {
-                        "u64": 1000
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "memo"
-                      },
-                      "val": {
-                        "string": "Multi-party test"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "recipient"
-                      },
-                      "val": {
-                        "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "refund_timestamp"
-                      },
-                      "val": {
-                        "u64": 0
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "refunded_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 0
+                          ]
+                        },
+                        "val": {
+                          "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "release_conditions"
                       },
-                      "val": {
-                        "map": [
-                          {
-                            "key": {
-                              "symbol": "conditions"
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "Escrow"
                             },
-                            "val": {
-                              "vec": []
+                            {
+                              "u64": 1
                             }
-                          },
-                          {
-                            "key": {
-                              "symbol": "current_approvals"
+                          ]
+                        },
+                        "val": {
+                          "map": [
+                            {
+                              "key": {
+                                "symbol": "allow_partial_release"
+                              },
+                              "val": {
+                                "bool": false
+                              }
                             },
-                            "val": {
-                              "u32": 0
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "expiration_timestamp"
+                            {
+                              "key": {
+                                "symbol": "amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 5000
+                                }
+                              }
                             },
-                            "val": {
-                              "u64": 10000
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "min_approvals"
+                            {
+                              "key": {
+                                "symbol": "asset"
+                              },
+                              "val": {
+                                "map": [
+                                  {
+                                    "key": {
+                                      "symbol": "code"
+                                    },
+                                    "val": {
+                                      "string": "USDC"
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "issuer"
+                                    },
+                                    "val": {
+                                      "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
+                                    }
+                                  }
+                                ]
+                              }
                             },
-                            "val": {
-                              "u32": 1
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "operator"
+                            {
+                              "key": {
+                                "symbol": "created_at"
+                              },
+                              "val": {
+                                "u64": 1000
+                              }
                             },
-                            "val": {
-                              "vec": [
-                                {
-                                  "symbol": "And"
+                            {
+                              "key": {
+                                "symbol": "deposited_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 5000
                                 }
-                              ]
-                            }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "release_timestamp"
-                      },
-                      "val": {
-                        "u64": 1000
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "released_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 5000
-                        }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "sender"
-                      },
-                      "val": {
-                        "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "status"
-                      },
-                      "val": {
-                        "vec": [
-                          {
-                            "symbol": "Released"
-                          }
-                        ]
-                      }
-                    }
-                  ]
-                }
-              }
-            },
-            "ext": "v0"
-          },
-          4095
-        ]
-      ],
-      [
-        {
-          "contract_data": {
-            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-            "key": {
-              "vec": [
-                {
-                  "symbol": "EscrowApprovals"
-                },
-                {
-                  "u64": 1
-                }
-              ]
-            },
-            "durability": "persistent"
-          }
-        },
-        [
-          {
-            "last_modified_ledger_seq": 0,
-            "data": {
-              "contract_data": {
-                "ext": "v0",
-                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-                "key": {
-                  "vec": [
-                    {
-                      "symbol": "EscrowApprovals"
-                    },
-                    {
-                      "u64": 1
-                    }
-                  ]
-                },
-                "durability": "persistent",
-                "val": {
-                  "map": [
-                    {
-                      "key": {
-                        "symbol": "approval_timeout"
-                      },
-                      "val": {
-                        "u64": 5000
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "approvals"
-                      },
-                      "val": {
-                        "map": [
-                          {
-                            "key": {
-                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
+                              }
                             },
-                            "val": {
-                              "bool": true
-                            }
-                          },
-                          {
-                            "key": {
-                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
+                            {
+                              "key": {
+                                "symbol": "escrow_id"
+                              },
+                              "val": {
+                                "u64": 1
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "kyc_compliant"
+                              },
+                              "val": {
+                                "bool": false
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "last_deposit_at"
+                              },
+                              "val": {
+                                "u64": 1000
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "memo"
+                              },
+                              "val": {
+                                "string": "Multi-party test"
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "multi_party_enabled"
+                              },
+                              "val": {
+                                "bool": true
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "recipient"
+                              },
+                              "val": {
+                                "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "refund_timestamp"
+                              },
+                              "val": {
+                                "u64": 0
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "refunded_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 0
+                                }
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "release_conditions"
+                              },
+                              "val": {
+                                "map": [
+                                  {
+                                    "key": {
+                                      "symbol": "conditions"
+                                    },
+                                    "val": {
+                                      "vec": []
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "current_approvals"
+                                    },
+                                    "val": {
+                                      "u32": 0
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "expiration_timestamp"
+                                    },
+                                    "val": {
+                                      "u64": 10000
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "min_approvals"
+                                    },
+                                    "val": {
+                                      "u32": 1
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "operator"
+                                    },
+                                    "val": {
+                                      "vec": [
+                                        {
+                                          "symbol": "And"
+                                        }
+                                      ]
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "oracle_confirmation"
+                                    },
+                                    "val": {
+                                      "bool": false
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "recipient_approval"
+                                    },
+                                    "val": {
+                                      "bool": false
+                                    }
+                                  }
+                                ]
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "release_timestamp"
+                              },
+                              "val": {
+                                "u64": 1000
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "released_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 5000
+                                }
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "sender"
+                              },
+                              "val": {
+                                "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
+                              }
                             },
-                            "val": {
-                              "bool": true
+                            {
+                              "key": {
+                                "symbol": "status"
+                              },
+                              "val": {
+                                "vec": [
+                                  {
+                                    "symbol": "Released"
+                                  }
+                                ]
+                              }
                             }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "finalized"
-                      },
-                      "val": {
-                        "bool": true
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "required_approvals"
-                      },
-                      "val": {
-                        "u32": 2
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "whitelisted_approvers"
+                          ]
+                        }
                       },
-                      "val": {
-                        "vec": [
-                          {
-                            "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
-                          },
-                          {
-                            "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
-                          },
-                          {
-                            "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
-                          }
-                        ]
-                      }
-                    }
-                  ]
-                }
-              }
-            },
-            "ext": "v0"
-          },
-          4095
-        ]
-      ],
-      [
-        {
-          "contract_data": {
-            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-            "key": "ledger_key_contract_instance",
-            "durability": "persistent"
-          }
-        },
-        [
-          {
-            "last_modified_ledger_seq": 0,
-            "data": {
-              "contract_data": {
-                "ext": "v0",
-                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-                "key": "ledger_key_contract_instance",
-                "durability": "persistent",
-                "val": {
-                  "contract_instance": {
-                    "executable": {
-                      "wasm": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
-                    },
-                    "storage": [
                       {
                         "key": {
                           "vec": [
                             {
-                              "symbol": "Admin"
+                              "symbol": "EscrowApprovals"
+                            },
+                            {
+                              "u64": 1
                             }
                           ]
                         },
                         "val": {
-                          "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
+                          "map": [
+                            {
+                              "key": {
+                                "symbol": "approval_timeout"
+                              },
+                              "val": {
+                                "u64": 5000
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "approvals"
+                              },
+                              "val": {
+                                "map": [
+                                  {
+                                    "key": {
+                                      "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
+                                    },
+                                    "val": {
+                                      "bool": true
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
+                                    },
+                                    "val": {
+                                      "bool": true
+                                    }
+                                  }
+                                ]
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "finalized"
+                              },
+                              "val": {
+                                "bool": true
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "required_approvals"
+                              },
+                              "val": {
+                                "u32": 2
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "whitelisted_approvers"
+                              },
+                              "val": {
+                                "vec": [
+                                  {
+                                    "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
+                                  },
+                                  {
+                                    "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
+                                  },
+                                  {
+                                    "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
+                                  }
+                                ]
+                              }
+                            }
+                          ]
                         }
                       },
                       {
diff --git a/contracts/test_snapshots/payment_escrow/test/test_approve_and_release_with_deposit.1.json b/contracts/test_snapshots/payment_escrow/test/test_approve_and_release_with_deposit.1.json
index 4f0cb69..a36dea3 100644
--- a/contracts/test_snapshots/payment_escrow/test/test_approve_and_release_with_deposit.1.json
+++ b/contracts/test_snapshots/payment_escrow/test/test_approve_and_release_with_deposit.1.json
@@ -518,258 +518,6 @@
           6311999
         ]
       ],
-      [
-        {
-          "contract_data": {
-            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-            "key": {
-              "vec": [
-                {
-                  "symbol": "Escrow"
-                },
-                {
-                  "u64": 1
-                }
-              ]
-            },
-            "durability": "persistent"
-          }
-        },
-        [
-          {
-            "last_modified_ledger_seq": 0,
-            "data": {
-              "contract_data": {
-                "ext": "v0",
-                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-                "key": {
-                  "vec": [
-                    {
-                      "symbol": "Escrow"
-                    },
-                    {
-                      "u64": 1
-                    }
-                  ]
-                },
-                "durability": "persistent",
-                "val": {
-                  "map": [
-                    {
-                      "key": {
-                        "symbol": "amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 1000
-                        }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "asset"
-                      },
-                      "val": {
-                        "map": [
-                          {
-                            "key": {
-                              "symbol": "code"
-                            },
-                            "val": {
-                              "string": "USDC"
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "issuer"
-                            },
-                            "val": {
-                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
-                            }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "created_at"
-                      },
-                      "val": {
-                        "u64": 1000
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "deposited_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 1000
-                        }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "escrow_id"
-                      },
-                      "val": {
-                        "u64": 1
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "flags"
-                      },
-                      "val": {
-                        "u32": 0
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "last_deposit_at"
-                      },
-                      "val": {
-                        "u64": 1000
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "memo"
-                      },
-                      "val": {
-                        "string": "Test"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "recipient"
-                      },
-                      "val": {
-                        "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "refund_timestamp"
-                      },
-                      "val": {
-                        "u64": 0
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "refunded_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 0
-                        }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "release_conditions"
-                      },
-                      "val": {
-                        "map": [
-                          {
-                            "key": {
-                              "symbol": "conditions"
-                            },
-                            "val": {
-                              "vec": []
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "current_approvals"
-                            },
-                            "val": {
-                              "u32": 0
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "expiration_timestamp"
-                            },
-                            "val": {
-                              "u64": 2000
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "min_approvals"
-                            },
-                            "val": {
-                              "u32": 1
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "operator"
-                            },
-                            "val": {
-                              "vec": [
-                                {
-                                  "symbol": "And"
-                                }
-                              ]
-                            }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "release_timestamp"
-                      },
-                      "val": {
-                        "u64": 1000
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "released_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 1000
-                        }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "sender"
-                      },
-                      "val": {
-                        "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "status"
-                      },
-                      "val": {
-                        "vec": [
-                          {
-                            "symbol": "Released"
-                          }
-                        ]
-                      }
-                    }
-                  ]
-                }
-              }
-            },
-            "ext": "v0"
-          },
-          4095
-        ]
-      ],
       [
         {
           "contract_data": {
@@ -805,6 +553,260 @@
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "Escrow"
+                            },
+                            {
+                              "u64": 1
+                            }
+                          ]
+                        },
+                        "val": {
+                          "map": [
+                            {
+                              "key": {
+                                "symbol": "allow_partial_release"
+                              },
+                              "val": {
+                                "bool": false
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 1000
+                                }
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "asset"
+                              },
+                              "val": {
+                                "map": [
+                                  {
+                                    "key": {
+                                      "symbol": "code"
+                                    },
+                                    "val": {
+                                      "string": "USDC"
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "issuer"
+                                    },
+                                    "val": {
+                                      "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
+                                    }
+                                  }
+                                ]
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "created_at"
+                              },
+                              "val": {
+                                "u64": 1000
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "deposited_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 1000
+                                }
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "escrow_id"
+                              },
+                              "val": {
+                                "u64": 1
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "kyc_compliant"
+                              },
+                              "val": {
+                                "bool": false
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "last_deposit_at"
+                              },
+                              "val": {
+                                "u64": 1000
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "memo"
+                              },
+                              "val": {
+                                "string": "Test"
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "multi_party_enabled"
+                              },
+                              "val": {
+                                "bool": false
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "recipient"
+                              },
+                              "val": {
+                                "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "refund_timestamp"
+                              },
+                              "val": {
+                                "u64": 0
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "refunded_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 0
+                                }
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "release_conditions"
+                              },
+                              "val": {
+                                "map": [
+                                  {
+                                    "key": {
+                                      "symbol": "conditions"
+                                    },
+                                    "val": {
+                                      "vec": []
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "current_approvals"
+                                    },
+                                    "val": {
+                                      "u32": 0
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "expiration_timestamp"
+                                    },
+                                    "val": {
+                                      "u64": 2000
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "min_approvals"
+                                    },
+                                    "val": {
+                                      "u32": 1
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "operator"
+                                    },
+                                    "val": {
+                                      "vec": [
+                                        {
+                                          "symbol": "And"
+                                        }
+                                      ]
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "oracle_confirmation"
+                                    },
+                                    "val": {
+                                      "bool": false
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "recipient_approval"
+                                    },
+                                    "val": {
+                                      "bool": false
+                                    }
+                                  }
+                                ]
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "release_timestamp"
+                              },
+                              "val": {
+                                "u64": 1000
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "released_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 1000
+                                }
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "sender"
+                              },
+                              "val": {
+                                "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "status"
+                              },
+                              "val": {
+                                "vec": [
+                                  {
+                                    "symbol": "Released"
+                                  }
+                                ]
+                              }
+                            }
+                          ]
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -2165,6 +2167,14 @@
             ],
             "data": {
               "map": [
+                {
+                  "key": {
+                    "symbol": "allow_partial_release"
+                  },
+                  "val": {
+                    "bool": false
+                  }
+                },
                 {
                   "key": {
                     "symbol": "amount"
@@ -2230,10 +2240,10 @@
                 },
                 {
                   "key": {
-                    "symbol": "flags"
+                    "symbol": "kyc_compliant"
                   },
                   "val": {
-                    "u32": 0
+                    "bool": false
                   }
                 },
                 {
@@ -2252,6 +2262,14 @@
                     "string": "Test"
                   }
                 },
+                {
+                  "key": {
+                    "symbol": "multi_party_enabled"
+                  },
+                  "val": {
+                    "bool": false
+                  }
+                },
                 {
                   "key": {
                     "symbol": "recipient"
@@ -2328,6 +2346,22 @@
                             }
                           ]
                         }
+                      },
+                      {
+                        "key": {
+                          "symbol": "oracle_confirmation"
+                        },
+                        "val": {
+                          "bool": false
+                        }
+                      },
+                      {
+                        "key": {
+                          "symbol": "recipient_approval"
+                        },
+                        "val": {
+                          "bool": false
+                        }
                       }
                     ]
                   }
@@ -2664,6 +2698,14 @@
             ],
             "data": {
               "map": [
+                {
+                  "key": {
+                    "symbol": "allow_partial_release"
+                  },
+                  "val": {
+                    "bool": false
+                  }
+                },
                 {
                   "key": {
                     "symbol": "amount"
@@ -2729,10 +2771,10 @@
                 },
                 {
                   "key": {
-                    "symbol": "flags"
+                    "symbol": "kyc_compliant"
                   },
                   "val": {
-                    "u32": 0
+                    "bool": false
                   }
                 },
                 {
@@ -2751,6 +2793,14 @@
                     "string": "Test"
                   }
                 },
+                {
+                  "key": {
+                    "symbol": "multi_party_enabled"
+                  },
+                  "val": {
+                    "bool": false
+                  }
+                },
                 {
                   "key": {
                     "symbol": "recipient"
@@ -2827,6 +2877,22 @@
                             }
                           ]
                         }
+                      },
+                      {
+                        "key": {
+                          "symbol": "oracle_confirmation"
+                        },
+                        "val": {
+                          "bool": false
+                        }
+                      },
+                      {
+                        "key": {
+                          "symbol": "recipient_approval"
+                        },
+                        "val": {
+                          "bool": false
+                        }
                       }
                     ]
                   }
diff --git a/contracts/test_snapshots/payment_escrow/test/test_approve_on_non_multi_party_escrow_rejected.1.json b/contracts/test_snapshots/payment_escrow/test/test_approve_on_non_multi_party_escrow_rejected.1.json
index ca45545..c6d4f07 100644
--- a/contracts/test_snapshots/payment_escrow/test/test_approve_on_non_multi_party_escrow_rejected.1.json
+++ b/contracts/test_snapshots/payment_escrow/test/test_approve_on_non_multi_party_escrow_rejected.1.json
@@ -402,258 +402,6 @@
           6311999
         ]
       ],
-      [
-        {
-          "contract_data": {
-            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-            "key": {
-              "vec": [
-                {
-                  "symbol": "Escrow"
-                },
-                {
-                  "u64": 1
-                }
-              ]
-            },
-            "durability": "persistent"
-          }
-        },
-        [
-          {
-            "last_modified_ledger_seq": 0,
-            "data": {
-              "contract_data": {
-                "ext": "v0",
-                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-                "key": {
-                  "vec": [
-                    {
-                      "symbol": "Escrow"
-                    },
-                    {
-                      "u64": 1
-                    }
-                  ]
-                },
-                "durability": "persistent",
-                "val": {
-                  "map": [
-                    {
-                      "key": {
-                        "symbol": "amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 5000
-                        }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "asset"
-                      },
-                      "val": {
-                        "map": [
-                          {
-                            "key": {
-                              "symbol": "code"
-                            },
-                            "val": {
-                              "string": "USDC"
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "issuer"
-                            },
-                            "val": {
-                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
-                            }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "created_at"
-                      },
-                      "val": {
-                        "u64": 1000
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "deposited_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 5000
-                        }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "escrow_id"
-                      },
-                      "val": {
-                        "u64": 1
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "flags"
-                      },
-                      "val": {
-                        "u32": 0
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "last_deposit_at"
-                      },
-                      "val": {
-                        "u64": 1000
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "memo"
-                      },
-                      "val": {
-                        "string": "Multi-party test"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "recipient"
-                      },
-                      "val": {
-                        "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "refund_timestamp"
-                      },
-                      "val": {
-                        "u64": 0
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "refunded_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 0
-                        }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "release_conditions"
-                      },
-                      "val": {
-                        "map": [
-                          {
-                            "key": {
-                              "symbol": "conditions"
-                            },
-                            "val": {
-                              "vec": []
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "current_approvals"
-                            },
-                            "val": {
-                              "u32": 0
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "expiration_timestamp"
-                            },
-                            "val": {
-                              "u64": 10000
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "min_approvals"
-                            },
-                            "val": {
-                              "u32": 1
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "operator"
-                            },
-                            "val": {
-                              "vec": [
-                                {
-                                  "symbol": "And"
-                                }
-                              ]
-                            }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "release_timestamp"
-                      },
-                      "val": {
-                        "u64": 0
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "released_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 0
-                        }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "sender"
-                      },
-                      "val": {
-                        "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "status"
-                      },
-                      "val": {
-                        "vec": [
-                          {
-                            "symbol": "Funded"
-                          }
-                        ]
-                      }
-                    }
-                  ]
-                }
-              }
-            },
-            "ext": "v0"
-          },
-          4095
-        ]
-      ],
       [
         {
           "contract_data": {
@@ -689,6 +437,260 @@
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "Escrow"
+                            },
+                            {
+                              "u64": 1
+                            }
+                          ]
+                        },
+                        "val": {
+                          "map": [
+                            {
+                              "key": {
+                                "symbol": "allow_partial_release"
+                              },
+                              "val": {
+                                "bool": false
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 5000
+                                }
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "asset"
+                              },
+                              "val": {
+                                "map": [
+                                  {
+                                    "key": {
+                                      "symbol": "code"
+                                    },
+                                    "val": {
+                                      "string": "USDC"
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "issuer"
+                                    },
+                                    "val": {
+                                      "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
+                                    }
+                                  }
+                                ]
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "created_at"
+                              },
+                              "val": {
+                                "u64": 1000
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "deposited_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 5000
+                                }
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "escrow_id"
+                              },
+                              "val": {
+                                "u64": 1
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "kyc_compliant"
+                              },
+                              "val": {
+                                "bool": false
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "last_deposit_at"
+                              },
+                              "val": {
+                                "u64": 1000
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "memo"
+                              },
+                              "val": {
+                                "string": "Multi-party test"
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "multi_party_enabled"
+                              },
+                              "val": {
+                                "bool": false
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "recipient"
+                              },
+                              "val": {
+                                "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "refund_timestamp"
+                              },
+                              "val": {
+                                "u64": 0
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "refunded_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 0
+                                }
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "release_conditions"
+                              },
+                              "val": {
+                                "map": [
+                                  {
+                                    "key": {
+                                      "symbol": "conditions"
+                                    },
+                                    "val": {
+                                      "vec": []
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "current_approvals"
+                                    },
+                                    "val": {
+                                      "u32": 0
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "expiration_timestamp"
+                                    },
+                                    "val": {
+                                      "u64": 10000
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "min_approvals"
+                                    },
+                                    "val": {
+                                      "u32": 1
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "operator"
+                                    },
+                                    "val": {
+                                      "vec": [
+                                        {
+                                          "symbol": "And"
+                                        }
+                                      ]
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "oracle_confirmation"
+                                    },
+                                    "val": {
+                                      "bool": false
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "recipient_approval"
+                                    },
+                                    "val": {
+                                      "bool": false
+                                    }
+                                  }
+                                ]
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "release_timestamp"
+                              },
+                              "val": {
+                                "u64": 0
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "released_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 0
+                                }
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "sender"
+                              },
+                              "val": {
+                                "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "status"
+                              },
+                              "val": {
+                                "vec": [
+                                  {
+                                    "symbol": "Funded"
+                                  }
+                                ]
+                              }
+                            }
+                          ]
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
diff --git a/contracts/test_snapshots/payment_escrow/test/test_create_escrow.1.json b/contracts/test_snapshots/payment_escrow/test/test_create_escrow.1.json
index e0d544f..d55aa48 100644
--- a/contracts/test_snapshots/payment_escrow/test/test_create_escrow.1.json
+++ b/contracts/test_snapshots/payment_escrow/test/test_create_escrow.1.json
@@ -110,258 +110,6 @@
     "min_temp_entry_ttl": 16,
     "max_entry_ttl": 6312000,
     "ledger_entries": [
-      [
-        {
-          "contract_data": {
-            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM",
-            "key": {
-              "vec": [
-                {
-                  "symbol": "Escrow"
-                },
-                {
-                  "u64": 1
-                }
-              ]
-            },
-            "durability": "persistent"
-          }
-        },
-        [
-          {
-            "last_modified_ledger_seq": 0,
-            "data": {
-              "contract_data": {
-                "ext": "v0",
-                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM",
-                "key": {
-                  "vec": [
-                    {
-                      "symbol": "Escrow"
-                    },
-                    {
-                      "u64": 1
-                    }
-                  ]
-                },
-                "durability": "persistent",
-                "val": {
-                  "map": [
-                    {
-                      "key": {
-                        "symbol": "amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 1000
-                        }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "asset"
-                      },
-                      "val": {
-                        "map": [
-                          {
-                            "key": {
-                              "symbol": "code"
-                            },
-                            "val": {
-                              "string": "USDC"
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "issuer"
-                            },
-                            "val": {
-                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM"
-                            }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "created_at"
-                      },
-                      "val": {
-                        "u64": 1000
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "deposited_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 0
-                        }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "escrow_id"
-                      },
-                      "val": {
-                        "u64": 1
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "flags"
-                      },
-                      "val": {
-                        "u32": 0
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "last_deposit_at"
-                      },
-                      "val": {
-                        "u64": 0
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "memo"
-                      },
-                      "val": {
-                        "string": "Payment for services"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "recipient"
-                      },
-                      "val": {
-                        "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "refund_timestamp"
-                      },
-                      "val": {
-                        "u64": 0
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "refunded_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 0
-                        }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "release_conditions"
-                      },
-                      "val": {
-                        "map": [
-                          {
-                            "key": {
-                              "symbol": "conditions"
-                            },
-                            "val": {
-                              "vec": []
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "current_approvals"
-                            },
-                            "val": {
-                              "u32": 0
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "expiration_timestamp"
-                            },
-                            "val": {
-                              "u64": 2000
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "min_approvals"
-                            },
-                            "val": {
-                              "u32": 1
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "operator"
-                            },
-                            "val": {
-                              "vec": [
-                                {
-                                  "symbol": "And"
-                                }
-                              ]
-                            }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "release_timestamp"
-                      },
-                      "val": {
-                        "u64": 0
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "released_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 0
-                        }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "sender"
-                      },
-                      "val": {
-                        "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "status"
-                      },
-                      "val": {
-                        "vec": [
-                          {
-                            "symbol": "Pending"
-                          }
-                        ]
-                      }
-                    }
-                  ]
-                }
-              }
-            },
-            "ext": "v0"
-          },
-          4095
-        ]
-      ],
       [
         {
           "contract_data": {
@@ -397,6 +145,260 @@
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
                         }
                       },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "Escrow"
+                            },
+                            {
+                              "u64": 1
+                            }
+                          ]
+                        },
+                        "val": {
+                          "map": [
+                            {
+                              "key": {
+                                "symbol": "allow_partial_release"
+                              },
+                              "val": {
+                                "bool": false
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 1000
+                                }
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "asset"
+                              },
+                              "val": {
+                                "map": [
+                                  {
+                                    "key": {
+                                      "symbol": "code"
+                                    },
+                                    "val": {
+                                      "string": "USDC"
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "issuer"
+                                    },
+                                    "val": {
+                                      "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM"
+                                    }
+                                  }
+                                ]
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "created_at"
+                              },
+                              "val": {
+                                "u64": 1000
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "deposited_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 0
+                                }
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "escrow_id"
+                              },
+                              "val": {
+                                "u64": 1
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "kyc_compliant"
+                              },
+                              "val": {
+                                "bool": false
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "last_deposit_at"
+                              },
+                              "val": {
+                                "u64": 0
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "memo"
+                              },
+                              "val": {
+                                "string": "Payment for services"
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "multi_party_enabled"
+                              },
+                              "val": {
+                                "bool": false
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "recipient"
+                              },
+                              "val": {
+                                "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "refund_timestamp"
+                              },
+                              "val": {
+                                "u64": 0
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "refunded_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 0
+                                }
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "release_conditions"
+                              },
+                              "val": {
+                                "map": [
+                                  {
+                                    "key": {
+                                      "symbol": "conditions"
+                                    },
+                                    "val": {
+                                      "vec": []
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "current_approvals"
+                                    },
+                                    "val": {
+                                      "u32": 0
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "expiration_timestamp"
+                                    },
+                                    "val": {
+                                      "u64": 2000
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "min_approvals"
+                                    },
+                                    "val": {
+                                      "u32": 1
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "operator"
+                                    },
+                                    "val": {
+                                      "vec": [
+                                        {
+                                          "symbol": "And"
+                                        }
+                                      ]
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "oracle_confirmation"
+                                    },
+                                    "val": {
+                                      "bool": false
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "recipient_approval"
+                                    },
+                                    "val": {
+                                      "bool": false
+                                    }
+                                  }
+                                ]
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "release_timestamp"
+                              },
+                              "val": {
+                                "u64": 0
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "released_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 0
+                                }
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "sender"
+                              },
+                              "val": {
+                                "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "status"
+                              },
+                              "val": {
+                                "vec": [
+                                  {
+                                    "symbol": "Pending"
+                                  }
+                                ]
+                              }
+                            }
+                          ]
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -932,6 +934,14 @@
             ],
             "data": {
               "map": [
+                {
+                  "key": {
+                    "symbol": "allow_partial_release"
+                  },
+                  "val": {
+                    "bool": false
+                  }
+                },
                 {
                   "key": {
                     "symbol": "amount"
@@ -997,10 +1007,10 @@
                 },
                 {
                   "key": {
-                    "symbol": "flags"
+                    "symbol": "kyc_compliant"
                   },
                   "val": {
-                    "u32": 0
+                    "bool": false
                   }
                 },
                 {
@@ -1019,6 +1029,14 @@
                     "string": "Payment for services"
                   }
                 },
+                {
+                  "key": {
+                    "symbol": "multi_party_enabled"
+                  },
+                  "val": {
+                    "bool": false
+                  }
+                },
                 {
                   "key": {
                     "symbol": "recipient"
@@ -1095,6 +1113,22 @@
                             }
                           ]
                         }
+                      },
+                      {
+                        "key": {
+                          "symbol": "oracle_confirmation"
+                        },
+                        "val": {
+                          "bool": false
+                        }
+                      },
+                      {
+                        "key": {
+                          "symbol": "recipient_approval"
+                        },
+                        "val": {
+                          "bool": false
+                        }
                       }
                     ]
                   }
diff --git a/contracts/test_snapshots/payment_escrow/test/test_deposit_exceeds_amount.1.json b/contracts/test_snapshots/payment_escrow/test/test_deposit_exceeds_amount.1.json
index 7f5b8ae..b71d9dc 100644
--- a/contracts/test_snapshots/payment_escrow/test/test_deposit_exceeds_amount.1.json
+++ b/contracts/test_snapshots/payment_escrow/test/test_deposit_exceeds_amount.1.json
@@ -314,258 +314,6 @@
           6311999
         ]
       ],
-      [
-        {
-          "contract_data": {
-            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-            "key": {
-              "vec": [
-                {
-                  "symbol": "Escrow"
-                },
-                {
-                  "u64": 1
-                }
-              ]
-            },
-            "durability": "persistent"
-          }
-        },
-        [
-          {
-            "last_modified_ledger_seq": 0,
-            "data": {
-              "contract_data": {
-                "ext": "v0",
-                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-                "key": {
-                  "vec": [
-                    {
-                      "symbol": "Escrow"
-                    },
-                    {
-                      "u64": 1
-                    }
-                  ]
-                },
-                "durability": "persistent",
-                "val": {
-                  "map": [
-                    {
-                      "key": {
-                        "symbol": "amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 1000
-                        }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "asset"
-                      },
-                      "val": {
-                        "map": [
-                          {
-                            "key": {
-                              "symbol": "code"
-                            },
-                            "val": {
-                              "string": "USDC"
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "issuer"
-                            },
-                            "val": {
-                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
-                            }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "created_at"
-                      },
-                      "val": {
-                        "u64": 0
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "deposited_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 0
-                        }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "escrow_id"
-                      },
-                      "val": {
-                        "u64": 1
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "flags"
-                      },
-                      "val": {
-                        "u32": 0
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "last_deposit_at"
-                      },
-                      "val": {
-                        "u64": 0
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "memo"
-                      },
-                      "val": {
-                        "string": "Test"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "recipient"
-                      },
-                      "val": {
-                        "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "refund_timestamp"
-                      },
-                      "val": {
-                        "u64": 0
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "refunded_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 0
-                        }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "release_conditions"
-                      },
-                      "val": {
-                        "map": [
-                          {
-                            "key": {
-                              "symbol": "conditions"
-                            },
-                            "val": {
-                              "vec": []
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "current_approvals"
-                            },
-                            "val": {
-                              "u32": 0
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "expiration_timestamp"
-                            },
-                            "val": {
-                              "u64": 2000
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "min_approvals"
-                            },
-                            "val": {
-                              "u32": 1
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "operator"
-                            },
-                            "val": {
-                              "vec": [
-                                {
-                                  "symbol": "And"
-                                }
-                              ]
-                            }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "release_timestamp"
-                      },
-                      "val": {
-                        "u64": 0
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "released_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 0
-                        }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "sender"
-                      },
-                      "val": {
-                        "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "status"
-                      },
-                      "val": {
-                        "vec": [
-                          {
-                            "symbol": "Pending"
-                          }
-                        ]
-                      }
-                    }
-                  ]
-                }
-              }
-            },
-            "ext": "v0"
-          },
-          4095
-        ]
-      ],
       [
         {
           "contract_data": {
@@ -601,6 +349,260 @@
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "Escrow"
+                            },
+                            {
+                              "u64": 1
+                            }
+                          ]
+                        },
+                        "val": {
+                          "map": [
+                            {
+                              "key": {
+                                "symbol": "allow_partial_release"
+                              },
+                              "val": {
+                                "bool": false
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 1000
+                                }
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "asset"
+                              },
+                              "val": {
+                                "map": [
+                                  {
+                                    "key": {
+                                      "symbol": "code"
+                                    },
+                                    "val": {
+                                      "string": "USDC"
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "issuer"
+                                    },
+                                    "val": {
+                                      "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
+                                    }
+                                  }
+                                ]
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "created_at"
+                              },
+                              "val": {
+                                "u64": 0
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "deposited_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 0
+                                }
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "escrow_id"
+                              },
+                              "val": {
+                                "u64": 1
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "kyc_compliant"
+                              },
+                              "val": {
+                                "bool": false
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "last_deposit_at"
+                              },
+                              "val": {
+                                "u64": 0
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "memo"
+                              },
+                              "val": {
+                                "string": "Test"
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "multi_party_enabled"
+                              },
+                              "val": {
+                                "bool": false
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "recipient"
+                              },
+                              "val": {
+                                "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "refund_timestamp"
+                              },
+                              "val": {
+                                "u64": 0
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "refunded_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 0
+                                }
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "release_conditions"
+                              },
+                              "val": {
+                                "map": [
+                                  {
+                                    "key": {
+                                      "symbol": "conditions"
+                                    },
+                                    "val": {
+                                      "vec": []
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "current_approvals"
+                                    },
+                                    "val": {
+                                      "u32": 0
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "expiration_timestamp"
+                                    },
+                                    "val": {
+                                      "u64": 2000
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "min_approvals"
+                                    },
+                                    "val": {
+                                      "u32": 1
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "operator"
+                                    },
+                                    "val": {
+                                      "vec": [
+                                        {
+                                          "symbol": "And"
+                                        }
+                                      ]
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "oracle_confirmation"
+                                    },
+                                    "val": {
+                                      "bool": false
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "recipient_approval"
+                                    },
+                                    "val": {
+                                      "bool": false
+                                    }
+                                  }
+                                ]
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "release_timestamp"
+                              },
+                              "val": {
+                                "u64": 0
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "released_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 0
+                                }
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "sender"
+                              },
+                              "val": {
+                                "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "status"
+                              },
+                              "val": {
+                                "vec": [
+                                  {
+                                    "symbol": "Pending"
+                                  }
+                                ]
+                              }
+                            }
+                          ]
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
diff --git a/contracts/test_snapshots/payment_escrow/test/test_deposit_full_amount.1.json b/contracts/test_snapshots/payment_escrow/test/test_deposit_full_amount.1.json
index 4de7467..ce1abaa 100644
--- a/contracts/test_snapshots/payment_escrow/test/test_deposit_full_amount.1.json
+++ b/contracts/test_snapshots/payment_escrow/test/test_deposit_full_amount.1.json
@@ -402,258 +402,6 @@
           6311999
         ]
       ],
-      [
-        {
-          "contract_data": {
-            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-            "key": {
-              "vec": [
-                {
-                  "symbol": "Escrow"
-                },
-                {
-                  "u64": 1
-                }
-              ]
-            },
-            "durability": "persistent"
-          }
-        },
-        [
-          {
-            "last_modified_ledger_seq": 0,
-            "data": {
-              "contract_data": {
-                "ext": "v0",
-                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-                "key": {
-                  "vec": [
-                    {
-                      "symbol": "Escrow"
-                    },
-                    {
-                      "u64": 1
-                    }
-                  ]
-                },
-                "durability": "persistent",
-                "val": {
-                  "map": [
-                    {
-                      "key": {
-                        "symbol": "amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 1000
-                        }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "asset"
-                      },
-                      "val": {
-                        "map": [
-                          {
-                            "key": {
-                              "symbol": "code"
-                            },
-                            "val": {
-                              "string": "USDC"
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "issuer"
-                            },
-                            "val": {
-                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
-                            }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "created_at"
-                      },
-                      "val": {
-                        "u64": 1000
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "deposited_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 1000
-                        }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "escrow_id"
-                      },
-                      "val": {
-                        "u64": 1
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "flags"
-                      },
-                      "val": {
-                        "u32": 0
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "last_deposit_at"
-                      },
-                      "val": {
-                        "u64": 1000
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "memo"
-                      },
-                      "val": {
-                        "string": "Test payment"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "recipient"
-                      },
-                      "val": {
-                        "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "refund_timestamp"
-                      },
-                      "val": {
-                        "u64": 0
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "refunded_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 0
-                        }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "release_conditions"
-                      },
-                      "val": {
-                        "map": [
-                          {
-                            "key": {
-                              "symbol": "conditions"
-                            },
-                            "val": {
-                              "vec": []
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "current_approvals"
-                            },
-                            "val": {
-                              "u32": 0
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "expiration_timestamp"
-                            },
-                            "val": {
-                              "u64": 2000
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "min_approvals"
-                            },
-                            "val": {
-                              "u32": 1
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "operator"
-                            },
-                            "val": {
-                              "vec": [
-                                {
-                                  "symbol": "And"
-                                }
-                              ]
-                            }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "release_timestamp"
-                      },
-                      "val": {
-                        "u64": 0
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "released_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 0
-                        }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "sender"
-                      },
-                      "val": {
-                        "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "status"
-                      },
-                      "val": {
-                        "vec": [
-                          {
-                            "symbol": "Funded"
-                          }
-                        ]
-                      }
-                    }
-                  ]
-                }
-              }
-            },
-            "ext": "v0"
-          },
-          4095
-        ]
-      ],
       [
         {
           "contract_data": {
@@ -689,6 +437,260 @@
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "Escrow"
+                            },
+                            {
+                              "u64": 1
+                            }
+                          ]
+                        },
+                        "val": {
+                          "map": [
+                            {
+                              "key": {
+                                "symbol": "allow_partial_release"
+                              },
+                              "val": {
+                                "bool": false
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 1000
+                                }
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "asset"
+                              },
+                              "val": {
+                                "map": [
+                                  {
+                                    "key": {
+                                      "symbol": "code"
+                                    },
+                                    "val": {
+                                      "string": "USDC"
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "issuer"
+                                    },
+                                    "val": {
+                                      "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
+                                    }
+                                  }
+                                ]
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "created_at"
+                              },
+                              "val": {
+                                "u64": 1000
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "deposited_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 1000
+                                }
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "escrow_id"
+                              },
+                              "val": {
+                                "u64": 1
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "kyc_compliant"
+                              },
+                              "val": {
+                                "bool": false
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "last_deposit_at"
+                              },
+                              "val": {
+                                "u64": 1000
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "memo"
+                              },
+                              "val": {
+                                "string": "Test payment"
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "multi_party_enabled"
+                              },
+                              "val": {
+                                "bool": false
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "recipient"
+                              },
+                              "val": {
+                                "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "refund_timestamp"
+                              },
+                              "val": {
+                                "u64": 0
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "refunded_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 0
+                                }
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "release_conditions"
+                              },
+                              "val": {
+                                "map": [
+                                  {
+                                    "key": {
+                                      "symbol": "conditions"
+                                    },
+                                    "val": {
+                                      "vec": []
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "current_approvals"
+                                    },
+                                    "val": {
+                                      "u32": 0
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "expiration_timestamp"
+                                    },
+                                    "val": {
+                                      "u64": 2000
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "min_approvals"
+                                    },
+                                    "val": {
+                                      "u32": 1
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "operator"
+                                    },
+                                    "val": {
+                                      "vec": [
+                                        {
+                                          "symbol": "And"
+                                        }
+                                      ]
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "oracle_confirmation"
+                                    },
+                                    "val": {
+                                      "bool": false
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "recipient_approval"
+                                    },
+                                    "val": {
+                                      "bool": false
+                                    }
+                                  }
+                                ]
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "release_timestamp"
+                              },
+                              "val": {
+                                "u64": 0
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "released_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 0
+                                }
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "sender"
+                              },
+                              "val": {
+                                "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "status"
+                              },
+                              "val": {
+                                "vec": [
+                                  {
+                                    "symbol": "Funded"
+                                  }
+                                ]
+                              }
+                            }
+                          ]
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -1859,6 +1861,14 @@
             ],
             "data": {
               "map": [
+                {
+                  "key": {
+                    "symbol": "allow_partial_release"
+                  },
+                  "val": {
+                    "bool": false
+                  }
+                },
                 {
                   "key": {
                     "symbol": "amount"
@@ -1924,10 +1934,10 @@
                 },
                 {
                   "key": {
-                    "symbol": "flags"
+                    "symbol": "kyc_compliant"
                   },
                   "val": {
-                    "u32": 0
+                    "bool": false
                   }
                 },
                 {
@@ -1946,6 +1956,14 @@
                     "string": "Test payment"
                   }
                 },
+                {
+                  "key": {
+                    "symbol": "multi_party_enabled"
+                  },
+                  "val": {
+                    "bool": false
+                  }
+                },
                 {
                   "key": {
                     "symbol": "recipient"
@@ -2022,6 +2040,22 @@
                             }
                           ]
                         }
+                      },
+                      {
+                        "key": {
+                          "symbol": "oracle_confirmation"
+                        },
+                        "val": {
+                          "bool": false
+                        }
+                      },
+                      {
+                        "key": {
+                          "symbol": "recipient_approval"
+                        },
+                        "val": {
+                          "bool": false
+                        }
                       }
                     ]
                   }
diff --git a/contracts/test_snapshots/payment_escrow/test/test_deposit_partial_amounts.1.json b/contracts/test_snapshots/payment_escrow/test/test_deposit_partial_amounts.1.json
index b247417..4510eae 100644
--- a/contracts/test_snapshots/payment_escrow/test/test_deposit_partial_amounts.1.json
+++ b/contracts/test_snapshots/payment_escrow/test/test_deposit_partial_amounts.1.json
@@ -491,258 +491,6 @@
           6311999
         ]
       ],
-      [
-        {
-          "contract_data": {
-            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-            "key": {
-              "vec": [
-                {
-                  "symbol": "Escrow"
-                },
-                {
-                  "u64": 1
-                }
-              ]
-            },
-            "durability": "persistent"
-          }
-        },
-        [
-          {
-            "last_modified_ledger_seq": 0,
-            "data": {
-              "contract_data": {
-                "ext": "v0",
-                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-                "key": {
-                  "vec": [
-                    {
-                      "symbol": "Escrow"
-                    },
-                    {
-                      "u64": 1
-                    }
-                  ]
-                },
-                "durability": "persistent",
-                "val": {
-                  "map": [
-                    {
-                      "key": {
-                        "symbol": "amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 1000
-                        }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "asset"
-                      },
-                      "val": {
-                        "map": [
-                          {
-                            "key": {
-                              "symbol": "code"
-                            },
-                            "val": {
-                              "string": "USDC"
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "issuer"
-                            },
-                            "val": {
-                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
-                            }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "created_at"
-                      },
-                      "val": {
-                        "u64": 1000
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "deposited_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 1000
-                        }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "escrow_id"
-                      },
-                      "val": {
-                        "u64": 1
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "flags"
-                      },
-                      "val": {
-                        "u32": 0
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "last_deposit_at"
-                      },
-                      "val": {
-                        "u64": 1000
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "memo"
-                      },
-                      "val": {
-                        "string": "Test payment"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "recipient"
-                      },
-                      "val": {
-                        "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "refund_timestamp"
-                      },
-                      "val": {
-                        "u64": 0
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "refunded_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 0
-                        }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "release_conditions"
-                      },
-                      "val": {
-                        "map": [
-                          {
-                            "key": {
-                              "symbol": "conditions"
-                            },
-                            "val": {
-                              "vec": []
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "current_approvals"
-                            },
-                            "val": {
-                              "u32": 0
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "expiration_timestamp"
-                            },
-                            "val": {
-                              "u64": 2000
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "min_approvals"
-                            },
-                            "val": {
-                              "u32": 1
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "operator"
-                            },
-                            "val": {
-                              "vec": [
-                                {
-                                  "symbol": "And"
-                                }
-                              ]
-                            }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "release_timestamp"
-                      },
-                      "val": {
-                        "u64": 0
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "released_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 0
-                        }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "sender"
-                      },
-                      "val": {
-                        "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "status"
-                      },
-                      "val": {
-                        "vec": [
-                          {
-                            "symbol": "Funded"
-                          }
-                        ]
-                      }
-                    }
-                  ]
-                }
-              }
-            },
-            "ext": "v0"
-          },
-          4095
-        ]
-      ],
       [
         {
           "contract_data": {
@@ -778,6 +526,260 @@
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "Escrow"
+                            },
+                            {
+                              "u64": 1
+                            }
+                          ]
+                        },
+                        "val": {
+                          "map": [
+                            {
+                              "key": {
+                                "symbol": "allow_partial_release"
+                              },
+                              "val": {
+                                "bool": false
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 1000
+                                }
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "asset"
+                              },
+                              "val": {
+                                "map": [
+                                  {
+                                    "key": {
+                                      "symbol": "code"
+                                    },
+                                    "val": {
+                                      "string": "USDC"
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "issuer"
+                                    },
+                                    "val": {
+                                      "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
+                                    }
+                                  }
+                                ]
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "created_at"
+                              },
+                              "val": {
+                                "u64": 1000
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "deposited_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 1000
+                                }
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "escrow_id"
+                              },
+                              "val": {
+                                "u64": 1
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "kyc_compliant"
+                              },
+                              "val": {
+                                "bool": false
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "last_deposit_at"
+                              },
+                              "val": {
+                                "u64": 1000
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "memo"
+                              },
+                              "val": {
+                                "string": "Test payment"
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "multi_party_enabled"
+                              },
+                              "val": {
+                                "bool": false
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "recipient"
+                              },
+                              "val": {
+                                "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "refund_timestamp"
+                              },
+                              "val": {
+                                "u64": 0
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "refunded_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 0
+                                }
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "release_conditions"
+                              },
+                              "val": {
+                                "map": [
+                                  {
+                                    "key": {
+                                      "symbol": "conditions"
+                                    },
+                                    "val": {
+                                      "vec": []
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "current_approvals"
+                                    },
+                                    "val": {
+                                      "u32": 0
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "expiration_timestamp"
+                                    },
+                                    "val": {
+                                      "u64": 2000
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "min_approvals"
+                                    },
+                                    "val": {
+                                      "u32": 1
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "operator"
+                                    },
+                                    "val": {
+                                      "vec": [
+                                        {
+                                          "symbol": "And"
+                                        }
+                                      ]
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "oracle_confirmation"
+                                    },
+                                    "val": {
+                                      "bool": false
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "recipient_approval"
+                                    },
+                                    "val": {
+                                      "bool": false
+                                    }
+                                  }
+                                ]
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "release_timestamp"
+                              },
+                              "val": {
+                                "u64": 0
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "released_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 0
+                                }
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "sender"
+                              },
+                              "val": {
+                                "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "status"
+                              },
+                              "val": {
+                                "vec": [
+                                  {
+                                    "symbol": "Funded"
+                                  }
+                                ]
+                              }
+                            }
+                          ]
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -1948,6 +1950,14 @@
             ],
             "data": {
               "map": [
+                {
+                  "key": {
+                    "symbol": "allow_partial_release"
+                  },
+                  "val": {
+                    "bool": false
+                  }
+                },
                 {
                   "key": {
                     "symbol": "amount"
@@ -2013,10 +2023,10 @@
                 },
                 {
                   "key": {
-                    "symbol": "flags"
+                    "symbol": "kyc_compliant"
                   },
                   "val": {
-                    "u32": 0
+                    "bool": false
                   }
                 },
                 {
@@ -2035,6 +2045,14 @@
                     "string": "Test payment"
                   }
                 },
+                {
+                  "key": {
+                    "symbol": "multi_party_enabled"
+                  },
+                  "val": {
+                    "bool": false
+                  }
+                },
                 {
                   "key": {
                     "symbol": "recipient"
@@ -2111,6 +2129,22 @@
                             }
                           ]
                         }
+                      },
+                      {
+                        "key": {
+                          "symbol": "oracle_confirmation"
+                        },
+                        "val": {
+                          "bool": false
+                        }
+                      },
+                      {
+                        "key": {
+                          "symbol": "recipient_approval"
+                        },
+                        "val": {
+                          "bool": false
+                        }
                       }
                     ]
                   }
@@ -2438,6 +2472,14 @@
             ],
             "data": {
               "map": [
+                {
+                  "key": {
+                    "symbol": "allow_partial_release"
+                  },
+                  "val": {
+                    "bool": false
+                  }
+                },
                 {
                   "key": {
                     "symbol": "amount"
@@ -2503,10 +2545,10 @@
                 },
                 {
                   "key": {
-                    "symbol": "flags"
+                    "symbol": "kyc_compliant"
                   },
                   "val": {
-                    "u32": 0
+                    "bool": false
                   }
                 },
                 {
@@ -2525,6 +2567,14 @@
                     "string": "Test payment"
                   }
                 },
+                {
+                  "key": {
+                    "symbol": "multi_party_enabled"
+                  },
+                  "val": {
+                    "bool": false
+                  }
+                },
                 {
                   "key": {
                     "symbol": "recipient"
@@ -2601,6 +2651,22 @@
                             }
                           ]
                         }
+                      },
+                      {
+                        "key": {
+                          "symbol": "oracle_confirmation"
+                        },
+                        "val": {
+                          "bool": false
+                        }
+                      },
+                      {
+                        "key": {
+                          "symbol": "recipient_approval"
+                        },
+                        "val": {
+                          "bool": false
+                        }
                       }
                     ]
                   }
diff --git a/contracts/test_snapshots/payment_escrow/test/test_deposit_wrong_sender.1.json b/contracts/test_snapshots/payment_escrow/test/test_deposit_wrong_sender.1.json
index 92f8788..ef21d75 100644
--- a/contracts/test_snapshots/payment_escrow/test/test_deposit_wrong_sender.1.json
+++ b/contracts/test_snapshots/payment_escrow/test/test_deposit_wrong_sender.1.json
@@ -314,258 +314,6 @@
           6311999
         ]
       ],
-      [
-        {
-          "contract_data": {
-            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMDR4",
-            "key": {
-              "vec": [
-                {
-                  "symbol": "Escrow"
-                },
-                {
-                  "u64": 1
-                }
-              ]
-            },
-            "durability": "persistent"
-          }
-        },
-        [
-          {
-            "last_modified_ledger_seq": 0,
-            "data": {
-              "contract_data": {
-                "ext": "v0",
-                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMDR4",
-                "key": {
-                  "vec": [
-                    {
-                      "symbol": "Escrow"
-                    },
-                    {
-                      "u64": 1
-                    }
-                  ]
-                },
-                "durability": "persistent",
-                "val": {
-                  "map": [
-                    {
-                      "key": {
-                        "symbol": "amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 1000
-                        }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "asset"
-                      },
-                      "val": {
-                        "map": [
-                          {
-                            "key": {
-                              "symbol": "code"
-                            },
-                            "val": {
-                              "string": "USDC"
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "issuer"
-                            },
-                            "val": {
-                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
-                            }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "created_at"
-                      },
-                      "val": {
-                        "u64": 0
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "deposited_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 0
-                        }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "escrow_id"
-                      },
-                      "val": {
-                        "u64": 1
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "flags"
-                      },
-                      "val": {
-                        "u32": 0
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "last_deposit_at"
-                      },
-                      "val": {
-                        "u64": 0
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "memo"
-                      },
-                      "val": {
-                        "string": "Test"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "recipient"
-                      },
-                      "val": {
-                        "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "refund_timestamp"
-                      },
-                      "val": {
-                        "u64": 0
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "refunded_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 0
-                        }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "release_conditions"
-                      },
-                      "val": {
-                        "map": [
-                          {
-                            "key": {
-                              "symbol": "conditions"
-                            },
-                            "val": {
-                              "vec": []
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "current_approvals"
-                            },
-                            "val": {
-                              "u32": 0
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "expiration_timestamp"
-                            },
-                            "val": {
-                              "u64": 2000
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "min_approvals"
-                            },
-                            "val": {
-                              "u32": 1
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "operator"
-                            },
-                            "val": {
-                              "vec": [
-                                {
-                                  "symbol": "And"
-                                }
-                              ]
-                            }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "release_timestamp"
-                      },
-                      "val": {
-                        "u64": 0
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "released_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 0
-                        }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "sender"
-                      },
-                      "val": {
-                        "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "status"
-                      },
-                      "val": {
-                        "vec": [
-                          {
-                            "symbol": "Pending"
-                          }
-                        ]
-                      }
-                    }
-                  ]
-                }
-              }
-            },
-            "ext": "v0"
-          },
-          4095
-        ]
-      ],
       [
         {
           "contract_data": {
@@ -601,6 +349,260 @@
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "Escrow"
+                            },
+                            {
+                              "u64": 1
+                            }
+                          ]
+                        },
+                        "val": {
+                          "map": [
+                            {
+                              "key": {
+                                "symbol": "allow_partial_release"
+                              },
+                              "val": {
+                                "bool": false
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 1000
+                                }
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "asset"
+                              },
+                              "val": {
+                                "map": [
+                                  {
+                                    "key": {
+                                      "symbol": "code"
+                                    },
+                                    "val": {
+                                      "string": "USDC"
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "issuer"
+                                    },
+                                    "val": {
+                                      "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
+                                    }
+                                  }
+                                ]
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "created_at"
+                              },
+                              "val": {
+                                "u64": 0
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "deposited_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 0
+                                }
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "escrow_id"
+                              },
+                              "val": {
+                                "u64": 1
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "kyc_compliant"
+                              },
+                              "val": {
+                                "bool": false
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "last_deposit_at"
+                              },
+                              "val": {
+                                "u64": 0
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "memo"
+                              },
+                              "val": {
+                                "string": "Test"
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "multi_party_enabled"
+                              },
+                              "val": {
+                                "bool": false
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "recipient"
+                              },
+                              "val": {
+                                "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "refund_timestamp"
+                              },
+                              "val": {
+                                "u64": 0
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "refunded_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 0
+                                }
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "release_conditions"
+                              },
+                              "val": {
+                                "map": [
+                                  {
+                                    "key": {
+                                      "symbol": "conditions"
+                                    },
+                                    "val": {
+                                      "vec": []
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "current_approvals"
+                                    },
+                                    "val": {
+                                      "u32": 0
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "expiration_timestamp"
+                                    },
+                                    "val": {
+                                      "u64": 2000
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "min_approvals"
+                                    },
+                                    "val": {
+                                      "u32": 1
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "operator"
+                                    },
+                                    "val": {
+                                      "vec": [
+                                        {
+                                          "symbol": "And"
+                                        }
+                                      ]
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "oracle_confirmation"
+                                    },
+                                    "val": {
+                                      "bool": false
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "recipient_approval"
+                                    },
+                                    "val": {
+                                      "bool": false
+                                    }
+                                  }
+                                ]
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "release_timestamp"
+                              },
+                              "val": {
+                                "u64": 0
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "released_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 0
+                                }
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "sender"
+                              },
+                              "val": {
+                                "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "status"
+                              },
+                              "val": {
+                                "vec": [
+                                  {
+                                    "symbol": "Pending"
+                                  }
+                                ]
+                              }
+                            }
+                          ]
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
diff --git a/contracts/test_snapshots/payment_escrow/test/test_get_multi_party_status_none.1.json b/contracts/test_snapshots/payment_escrow/test/test_get_multi_party_status_none.1.json
index 0436323..920f422 100644
--- a/contracts/test_snapshots/payment_escrow/test/test_get_multi_party_status_none.1.json
+++ b/contracts/test_snapshots/payment_escrow/test/test_get_multi_party_status_none.1.json
@@ -402,258 +402,6 @@
           6311999
         ]
       ],
-      [
-        {
-          "contract_data": {
-            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-            "key": {
-              "vec": [
-                {
-                  "symbol": "Escrow"
-                },
-                {
-                  "u64": 1
-                }
-              ]
-            },
-            "durability": "persistent"
-          }
-        },
-        [
-          {
-            "last_modified_ledger_seq": 0,
-            "data": {
-              "contract_data": {
-                "ext": "v0",
-                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-                "key": {
-                  "vec": [
-                    {
-                      "symbol": "Escrow"
-                    },
-                    {
-                      "u64": 1
-                    }
-                  ]
-                },
-                "durability": "persistent",
-                "val": {
-                  "map": [
-                    {
-                      "key": {
-                        "symbol": "amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 5000
-                        }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "asset"
-                      },
-                      "val": {
-                        "map": [
-                          {
-                            "key": {
-                              "symbol": "code"
-                            },
-                            "val": {
-                              "string": "USDC"
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "issuer"
-                            },
-                            "val": {
-                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
-                            }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "created_at"
-                      },
-                      "val": {
-                        "u64": 1000
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "deposited_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 5000
-                        }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "escrow_id"
-                      },
-                      "val": {
-                        "u64": 1
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "flags"
-                      },
-                      "val": {
-                        "u32": 0
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "last_deposit_at"
-                      },
-                      "val": {
-                        "u64": 1000
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "memo"
-                      },
-                      "val": {
-                        "string": "Multi-party test"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "recipient"
-                      },
-                      "val": {
-                        "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "refund_timestamp"
-                      },
-                      "val": {
-                        "u64": 0
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "refunded_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 0
-                        }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "release_conditions"
-                      },
-                      "val": {
-                        "map": [
-                          {
-                            "key": {
-                              "symbol": "conditions"
-                            },
-                            "val": {
-                              "vec": []
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "current_approvals"
-                            },
-                            "val": {
-                              "u32": 0
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "expiration_timestamp"
-                            },
-                            "val": {
-                              "u64": 10000
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "min_approvals"
-                            },
-                            "val": {
-                              "u32": 1
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "operator"
-                            },
-                            "val": {
-                              "vec": [
-                                {
-                                  "symbol": "And"
-                                }
-                              ]
-                            }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "release_timestamp"
-                      },
-                      "val": {
-                        "u64": 0
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "released_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 0
-                        }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "sender"
-                      },
-                      "val": {
-                        "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "status"
-                      },
-                      "val": {
-                        "vec": [
-                          {
-                            "symbol": "Funded"
-                          }
-                        ]
-                      }
-                    }
-                  ]
-                }
-              }
-            },
-            "ext": "v0"
-          },
-          4095
-        ]
-      ],
       [
         {
           "contract_data": {
@@ -689,6 +437,260 @@
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "Escrow"
+                            },
+                            {
+                              "u64": 1
+                            }
+                          ]
+                        },
+                        "val": {
+                          "map": [
+                            {
+                              "key": {
+                                "symbol": "allow_partial_release"
+                              },
+                              "val": {
+                                "bool": false
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 5000
+                                }
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "asset"
+                              },
+                              "val": {
+                                "map": [
+                                  {
+                                    "key": {
+                                      "symbol": "code"
+                                    },
+                                    "val": {
+                                      "string": "USDC"
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "issuer"
+                                    },
+                                    "val": {
+                                      "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
+                                    }
+                                  }
+                                ]
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "created_at"
+                              },
+                              "val": {
+                                "u64": 1000
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "deposited_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 5000
+                                }
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "escrow_id"
+                              },
+                              "val": {
+                                "u64": 1
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "kyc_compliant"
+                              },
+                              "val": {
+                                "bool": false
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "last_deposit_at"
+                              },
+                              "val": {
+                                "u64": 1000
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "memo"
+                              },
+                              "val": {
+                                "string": "Multi-party test"
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "multi_party_enabled"
+                              },
+                              "val": {
+                                "bool": false
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "recipient"
+                              },
+                              "val": {
+                                "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "refund_timestamp"
+                              },
+                              "val": {
+                                "u64": 0
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "refunded_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 0
+                                }
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "release_conditions"
+                              },
+                              "val": {
+                                "map": [
+                                  {
+                                    "key": {
+                                      "symbol": "conditions"
+                                    },
+                                    "val": {
+                                      "vec": []
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "current_approvals"
+                                    },
+                                    "val": {
+                                      "u32": 0
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "expiration_timestamp"
+                                    },
+                                    "val": {
+                                      "u64": 10000
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "min_approvals"
+                                    },
+                                    "val": {
+                                      "u32": 1
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "operator"
+                                    },
+                                    "val": {
+                                      "vec": [
+                                        {
+                                          "symbol": "And"
+                                        }
+                                      ]
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "oracle_confirmation"
+                                    },
+                                    "val": {
+                                      "bool": false
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "recipient_approval"
+                                    },
+                                    "val": {
+                                      "bool": false
+                                    }
+                                  }
+                                ]
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "release_timestamp"
+                              },
+                              "val": {
+                                "u64": 0
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "released_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 0
+                                }
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "sender"
+                              },
+                              "val": {
+                                "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "status"
+                              },
+                              "val": {
+                                "vec": [
+                                  {
+                                    "symbol": "Funded"
+                                  }
+                                ]
+                              }
+                            }
+                          ]
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
diff --git a/contracts/test_snapshots/payment_escrow/test/test_multi_party_approval_expired.1.json b/contracts/test_snapshots/payment_escrow/test/test_multi_party_approval_expired.1.json
index a72b027..3d74446 100644
--- a/contracts/test_snapshots/payment_escrow/test/test_multi_party_approval_expired.1.json
+++ b/contracts/test_snapshots/payment_escrow/test/test_multi_party_approval_expired.1.json
@@ -477,16 +477,7 @@
         {
           "contract_data": {
             "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-            "key": {
-              "vec": [
-                {
-                  "symbol": "Escrow"
-                },
-                {
-                  "u64": 1
-                }
-              ]
-            },
+            "key": "ledger_key_contract_instance",
             "durability": "persistent"
           }
         },
@@ -497,360 +488,341 @@
               "contract_data": {
                 "ext": "v0",
                 "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-                "key": {
-                  "vec": [
-                    {
-                      "symbol": "Escrow"
-                    },
-                    {
-                      "u64": 1
-                    }
-                  ]
-                },
+                "key": "ledger_key_contract_instance",
                 "durability": "persistent",
                 "val": {
-                  "map": [
-                    {
-                      "key": {
-                        "symbol": "amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 5000
-                        }
-                      }
+                  "contract_instance": {
+                    "executable": {
+                      "wasm": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
                     },
-                    {
-                      "key": {
-                        "symbol": "asset"
-                      },
-                      "val": {
-                        "map": [
-                          {
-                            "key": {
-                              "symbol": "code"
-                            },
-                            "val": {
-                              "string": "USDC"
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "issuer"
-                            },
-                            "val": {
-                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
+                    "storage": [
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "Admin"
                             }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "created_at"
-                      },
-                      "val": {
-                        "u64": 1000
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "deposited_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 5000
-                        }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "escrow_id"
-                      },
-                      "val": {
-                        "u64": 1
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "flags"
-                      },
-                      "val": {
-                        "u32": 2
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "last_deposit_at"
-                      },
-                      "val": {
-                        "u64": 1000
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "memo"
-                      },
-                      "val": {
-                        "string": "Multi-party test"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "recipient"
-                      },
-                      "val": {
-                        "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "refund_timestamp"
-                      },
-                      "val": {
-                        "u64": 0
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "refunded_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 0
+                          ]
+                        },
+                        "val": {
+                          "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "release_conditions"
                       },
-                      "val": {
-                        "map": [
-                          {
-                            "key": {
-                              "symbol": "conditions"
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "Escrow"
                             },
-                            "val": {
-                              "vec": []
+                            {
+                              "u64": 1
                             }
-                          },
-                          {
-                            "key": {
-                              "symbol": "current_approvals"
+                          ]
+                        },
+                        "val": {
+                          "map": [
+                            {
+                              "key": {
+                                "symbol": "allow_partial_release"
+                              },
+                              "val": {
+                                "bool": false
+                              }
                             },
-                            "val": {
-                              "u32": 0
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "expiration_timestamp"
+                            {
+                              "key": {
+                                "symbol": "amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 5000
+                                }
+                              }
                             },
-                            "val": {
-                              "u64": 10000
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "min_approvals"
+                            {
+                              "key": {
+                                "symbol": "asset"
+                              },
+                              "val": {
+                                "map": [
+                                  {
+                                    "key": {
+                                      "symbol": "code"
+                                    },
+                                    "val": {
+                                      "string": "USDC"
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "issuer"
+                                    },
+                                    "val": {
+                                      "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
+                                    }
+                                  }
+                                ]
+                              }
                             },
-                            "val": {
-                              "u32": 1
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "operator"
+                            {
+                              "key": {
+                                "symbol": "created_at"
+                              },
+                              "val": {
+                                "u64": 1000
+                              }
                             },
-                            "val": {
-                              "vec": [
-                                {
-                                  "symbol": "And"
+                            {
+                              "key": {
+                                "symbol": "deposited_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 5000
                                 }
-                              ]
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "escrow_id"
+                              },
+                              "val": {
+                                "u64": 1
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "kyc_compliant"
+                              },
+                              "val": {
+                                "bool": false
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "last_deposit_at"
+                              },
+                              "val": {
+                                "u64": 1000
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "memo"
+                              },
+                              "val": {
+                                "string": "Multi-party test"
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "multi_party_enabled"
+                              },
+                              "val": {
+                                "bool": true
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "recipient"
+                              },
+                              "val": {
+                                "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "refund_timestamp"
+                              },
+                              "val": {
+                                "u64": 0
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "refunded_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 0
+                                }
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "release_conditions"
+                              },
+                              "val": {
+                                "map": [
+                                  {
+                                    "key": {
+                                      "symbol": "conditions"
+                                    },
+                                    "val": {
+                                      "vec": []
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "current_approvals"
+                                    },
+                                    "val": {
+                                      "u32": 0
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "expiration_timestamp"
+                                    },
+                                    "val": {
+                                      "u64": 10000
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "min_approvals"
+                                    },
+                                    "val": {
+                                      "u32": 1
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "operator"
+                                    },
+                                    "val": {
+                                      "vec": [
+                                        {
+                                          "symbol": "And"
+                                        }
+                                      ]
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "oracle_confirmation"
+                                    },
+                                    "val": {
+                                      "bool": false
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "recipient_approval"
+                                    },
+                                    "val": {
+                                      "bool": false
+                                    }
+                                  }
+                                ]
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "release_timestamp"
+                              },
+                              "val": {
+                                "u64": 0
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "released_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 0
+                                }
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "sender"
+                              },
+                              "val": {
+                                "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "status"
+                              },
+                              "val": {
+                                "vec": [
+                                  {
+                                    "symbol": "Funded"
+                                  }
+                                ]
+                              }
                             }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "release_timestamp"
-                      },
-                      "val": {
-                        "u64": 0
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "released_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 0
+                          ]
                         }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "sender"
-                      },
-                      "val": {
-                        "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "status"
                       },
-                      "val": {
-                        "vec": [
-                          {
-                            "symbol": "Funded"
-                          }
-                        ]
-                      }
-                    }
-                  ]
-                }
-              }
-            },
-            "ext": "v0"
-          },
-          4095
-        ]
-      ],
-      [
-        {
-          "contract_data": {
-            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-            "key": {
-              "vec": [
-                {
-                  "symbol": "EscrowApprovals"
-                },
-                {
-                  "u64": 1
-                }
-              ]
-            },
-            "durability": "persistent"
-          }
-        },
-        [
-          {
-            "last_modified_ledger_seq": 0,
-            "data": {
-              "contract_data": {
-                "ext": "v0",
-                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-                "key": {
-                  "vec": [
-                    {
-                      "symbol": "EscrowApprovals"
-                    },
-                    {
-                      "u64": 1
-                    }
-                  ]
-                },
-                "durability": "persistent",
-                "val": {
-                  "map": [
-                    {
-                      "key": {
-                        "symbol": "approval_timeout"
-                      },
-                      "val": {
-                        "u64": 5000
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "approvals"
-                      },
-                      "val": {
-                        "map": []
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "finalized"
-                      },
-                      "val": {
-                        "bool": false
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "required_approvals"
-                      },
-                      "val": {
-                        "u32": 2
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "whitelisted_approvers"
-                      },
-                      "val": {
-                        "vec": [
-                          {
-                            "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
-                          },
-                          {
-                            "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
-                          }
-                        ]
-                      }
-                    }
-                  ]
-                }
-              }
-            },
-            "ext": "v0"
-          },
-          4095
-        ]
-      ],
-      [
-        {
-          "contract_data": {
-            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-            "key": "ledger_key_contract_instance",
-            "durability": "persistent"
-          }
-        },
-        [
-          {
-            "last_modified_ledger_seq": 0,
-            "data": {
-              "contract_data": {
-                "ext": "v0",
-                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-                "key": "ledger_key_contract_instance",
-                "durability": "persistent",
-                "val": {
-                  "contract_instance": {
-                    "executable": {
-                      "wasm": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
-                    },
-                    "storage": [
                       {
                         "key": {
                           "vec": [
                             {
-                              "symbol": "Admin"
+                              "symbol": "EscrowApprovals"
+                            },
+                            {
+                              "u64": 1
                             }
                           ]
                         },
                         "val": {
-                          "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
+                          "map": [
+                            {
+                              "key": {
+                                "symbol": "approval_timeout"
+                              },
+                              "val": {
+                                "u64": 5000
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "approvals"
+                              },
+                              "val": {
+                                "map": []
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "finalized"
+                              },
+                              "val": {
+                                "bool": false
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "required_approvals"
+                              },
+                              "val": {
+                                "u32": 2
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "whitelisted_approvers"
+                              },
+                              "val": {
+                                "vec": [
+                                  {
+                                    "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
+                                  },
+                                  {
+                                    "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
+                                  }
+                                ]
+                              }
+                            }
+                          ]
                         }
                       },
                       {
diff --git a/contracts/test_snapshots/payment_escrow/test/test_multi_party_approve_single.1.json b/contracts/test_snapshots/payment_escrow/test/test_multi_party_approve_single.1.json
index 087fa98..6973ec7 100644
--- a/contracts/test_snapshots/payment_escrow/test/test_multi_party_approve_single.1.json
+++ b/contracts/test_snapshots/payment_escrow/test/test_multi_party_approve_single.1.json
@@ -535,16 +535,7 @@
         {
           "contract_data": {
             "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-            "key": {
-              "vec": [
-                {
-                  "symbol": "Escrow"
-                },
-                {
-                  "u64": 1
-                }
-              ]
-            },
+            "key": "ledger_key_contract_instance",
             "durability": "persistent"
           }
         },
@@ -555,372 +546,353 @@
               "contract_data": {
                 "ext": "v0",
                 "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-                "key": {
-                  "vec": [
-                    {
-                      "symbol": "Escrow"
-                    },
-                    {
-                      "u64": 1
-                    }
-                  ]
-                },
+                "key": "ledger_key_contract_instance",
                 "durability": "persistent",
                 "val": {
-                  "map": [
-                    {
-                      "key": {
-                        "symbol": "amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 5000
-                        }
-                      }
+                  "contract_instance": {
+                    "executable": {
+                      "wasm": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
                     },
-                    {
-                      "key": {
-                        "symbol": "asset"
-                      },
-                      "val": {
-                        "map": [
-                          {
-                            "key": {
-                              "symbol": "code"
-                            },
-                            "val": {
-                              "string": "USDC"
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "issuer"
-                            },
-                            "val": {
-                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
+                    "storage": [
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "Admin"
                             }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "created_at"
-                      },
-                      "val": {
-                        "u64": 1000
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "deposited_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 5000
-                        }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "escrow_id"
-                      },
-                      "val": {
-                        "u64": 1
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "flags"
-                      },
-                      "val": {
-                        "u32": 2
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "last_deposit_at"
-                      },
-                      "val": {
-                        "u64": 1000
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "memo"
-                      },
-                      "val": {
-                        "string": "Multi-party test"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "recipient"
-                      },
-                      "val": {
-                        "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "refund_timestamp"
-                      },
-                      "val": {
-                        "u64": 0
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "refunded_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 0
+                          ]
+                        },
+                        "val": {
+                          "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "release_conditions"
                       },
-                      "val": {
-                        "map": [
-                          {
-                            "key": {
-                              "symbol": "conditions"
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "Escrow"
                             },
-                            "val": {
-                              "vec": []
+                            {
+                              "u64": 1
                             }
-                          },
-                          {
-                            "key": {
-                              "symbol": "current_approvals"
+                          ]
+                        },
+                        "val": {
+                          "map": [
+                            {
+                              "key": {
+                                "symbol": "allow_partial_release"
+                              },
+                              "val": {
+                                "bool": false
+                              }
                             },
-                            "val": {
-                              "u32": 0
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "expiration_timestamp"
+                            {
+                              "key": {
+                                "symbol": "amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 5000
+                                }
+                              }
                             },
-                            "val": {
-                              "u64": 10000
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "min_approvals"
+                            {
+                              "key": {
+                                "symbol": "asset"
+                              },
+                              "val": {
+                                "map": [
+                                  {
+                                    "key": {
+                                      "symbol": "code"
+                                    },
+                                    "val": {
+                                      "string": "USDC"
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "issuer"
+                                    },
+                                    "val": {
+                                      "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
+                                    }
+                                  }
+                                ]
+                              }
                             },
-                            "val": {
-                              "u32": 1
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "operator"
+                            {
+                              "key": {
+                                "symbol": "created_at"
+                              },
+                              "val": {
+                                "u64": 1000
+                              }
                             },
-                            "val": {
-                              "vec": [
-                                {
-                                  "symbol": "And"
+                            {
+                              "key": {
+                                "symbol": "deposited_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 5000
                                 }
-                              ]
-                            }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "release_timestamp"
-                      },
-                      "val": {
-                        "u64": 0
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "released_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 0
-                        }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "sender"
-                      },
-                      "val": {
-                        "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "status"
-                      },
-                      "val": {
-                        "vec": [
-                          {
-                            "symbol": "Funded"
-                          }
-                        ]
-                      }
-                    }
-                  ]
-                }
-              }
-            },
-            "ext": "v0"
-          },
-          4095
-        ]
-      ],
-      [
-        {
-          "contract_data": {
-            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-            "key": {
-              "vec": [
-                {
-                  "symbol": "EscrowApprovals"
-                },
-                {
-                  "u64": 1
-                }
-              ]
-            },
-            "durability": "persistent"
-          }
-        },
-        [
-          {
-            "last_modified_ledger_seq": 0,
-            "data": {
-              "contract_data": {
-                "ext": "v0",
-                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-                "key": {
-                  "vec": [
-                    {
-                      "symbol": "EscrowApprovals"
-                    },
-                    {
-                      "u64": 1
-                    }
-                  ]
-                },
-                "durability": "persistent",
-                "val": {
-                  "map": [
-                    {
-                      "key": {
-                        "symbol": "approval_timeout"
-                      },
-                      "val": {
-                        "u64": 5000
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "approvals"
-                      },
-                      "val": {
-                        "map": [
-                          {
-                            "key": {
-                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "escrow_id"
+                              },
+                              "val": {
+                                "u64": 1
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "kyc_compliant"
+                              },
+                              "val": {
+                                "bool": false
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "last_deposit_at"
+                              },
+                              "val": {
+                                "u64": 1000
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "memo"
+                              },
+                              "val": {
+                                "string": "Multi-party test"
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "multi_party_enabled"
+                              },
+                              "val": {
+                                "bool": true
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "recipient"
+                              },
+                              "val": {
+                                "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "refund_timestamp"
+                              },
+                              "val": {
+                                "u64": 0
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "refunded_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 0
+                                }
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "release_conditions"
+                              },
+                              "val": {
+                                "map": [
+                                  {
+                                    "key": {
+                                      "symbol": "conditions"
+                                    },
+                                    "val": {
+                                      "vec": []
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "current_approvals"
+                                    },
+                                    "val": {
+                                      "u32": 0
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "expiration_timestamp"
+                                    },
+                                    "val": {
+                                      "u64": 10000
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "min_approvals"
+                                    },
+                                    "val": {
+                                      "u32": 1
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "operator"
+                                    },
+                                    "val": {
+                                      "vec": [
+                                        {
+                                          "symbol": "And"
+                                        }
+                                      ]
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "oracle_confirmation"
+                                    },
+                                    "val": {
+                                      "bool": false
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "recipient_approval"
+                                    },
+                                    "val": {
+                                      "bool": false
+                                    }
+                                  }
+                                ]
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "release_timestamp"
+                              },
+                              "val": {
+                                "u64": 0
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "released_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 0
+                                }
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "sender"
+                              },
+                              "val": {
+                                "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
+                              }
                             },
-                            "val": {
-                              "bool": true
+                            {
+                              "key": {
+                                "symbol": "status"
+                              },
+                              "val": {
+                                "vec": [
+                                  {
+                                    "symbol": "Funded"
+                                  }
+                                ]
+                              }
                             }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "finalized"
-                      },
-                      "val": {
-                        "bool": false
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "required_approvals"
-                      },
-                      "val": {
-                        "u32": 2
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "whitelisted_approvers"
+                          ]
+                        }
                       },
-                      "val": {
-                        "vec": [
-                          {
-                            "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
-                          },
-                          {
-                            "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
-                          },
-                          {
-                            "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
-                          }
-                        ]
-                      }
-                    }
-                  ]
-                }
-              }
-            },
-            "ext": "v0"
-          },
-          4095
-        ]
-      ],
-      [
-        {
-          "contract_data": {
-            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-            "key": "ledger_key_contract_instance",
-            "durability": "persistent"
-          }
-        },
-        [
-          {
-            "last_modified_ledger_seq": 0,
-            "data": {
-              "contract_data": {
-                "ext": "v0",
-                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-                "key": "ledger_key_contract_instance",
-                "durability": "persistent",
-                "val": {
-                  "contract_instance": {
-                    "executable": {
-                      "wasm": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
-                    },
-                    "storage": [
                       {
                         "key": {
                           "vec": [
                             {
-                              "symbol": "Admin"
+                              "symbol": "EscrowApprovals"
+                            },
+                            {
+                              "u64": 1
                             }
                           ]
                         },
                         "val": {
-                          "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
+                          "map": [
+                            {
+                              "key": {
+                                "symbol": "approval_timeout"
+                              },
+                              "val": {
+                                "u64": 5000
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "approvals"
+                              },
+                              "val": {
+                                "map": [
+                                  {
+                                    "key": {
+                                      "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
+                                    },
+                                    "val": {
+                                      "bool": true
+                                    }
+                                  }
+                                ]
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "finalized"
+                              },
+                              "val": {
+                                "bool": false
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "required_approvals"
+                              },
+                              "val": {
+                                "u32": 2
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "whitelisted_approvers"
+                              },
+                              "val": {
+                                "vec": [
+                                  {
+                                    "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
+                                  },
+                                  {
+                                    "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
+                                  },
+                                  {
+                                    "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
+                                  }
+                                ]
+                              }
+                            }
+                          ]
                         }
                       },
                       {
diff --git a/contracts/test_snapshots/payment_escrow/test/test_multi_party_duplicate_approval_rejected.1.json b/contracts/test_snapshots/payment_escrow/test/test_multi_party_duplicate_approval_rejected.1.json
index 46a0b35..70b72d9 100644
--- a/contracts/test_snapshots/payment_escrow/test/test_multi_party_duplicate_approval_rejected.1.json
+++ b/contracts/test_snapshots/payment_escrow/test/test_multi_party_duplicate_approval_rejected.1.json
@@ -532,16 +532,7 @@
         {
           "contract_data": {
             "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-            "key": {
-              "vec": [
-                {
-                  "symbol": "Escrow"
-                },
-                {
-                  "u64": 1
-                }
-              ]
-            },
+            "key": "ledger_key_contract_instance",
             "durability": "persistent"
           }
         },
@@ -552,369 +543,350 @@
               "contract_data": {
                 "ext": "v0",
                 "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-                "key": {
-                  "vec": [
-                    {
-                      "symbol": "Escrow"
-                    },
-                    {
-                      "u64": 1
-                    }
-                  ]
-                },
+                "key": "ledger_key_contract_instance",
                 "durability": "persistent",
                 "val": {
-                  "map": [
-                    {
-                      "key": {
-                        "symbol": "amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 5000
-                        }
-                      }
+                  "contract_instance": {
+                    "executable": {
+                      "wasm": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
                     },
-                    {
-                      "key": {
-                        "symbol": "asset"
-                      },
-                      "val": {
-                        "map": [
-                          {
-                            "key": {
-                              "symbol": "code"
-                            },
-                            "val": {
-                              "string": "USDC"
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "issuer"
-                            },
-                            "val": {
-                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
+                    "storage": [
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "Admin"
                             }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "created_at"
-                      },
-                      "val": {
-                        "u64": 1000
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "deposited_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 5000
-                        }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "escrow_id"
-                      },
-                      "val": {
-                        "u64": 1
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "flags"
-                      },
-                      "val": {
-                        "u32": 2
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "last_deposit_at"
-                      },
-                      "val": {
-                        "u64": 1000
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "memo"
-                      },
-                      "val": {
-                        "string": "Multi-party test"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "recipient"
-                      },
-                      "val": {
-                        "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "refund_timestamp"
-                      },
-                      "val": {
-                        "u64": 0
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "refunded_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 0
+                          ]
+                        },
+                        "val": {
+                          "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "release_conditions"
                       },
-                      "val": {
-                        "map": [
-                          {
-                            "key": {
-                              "symbol": "conditions"
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "Escrow"
                             },
-                            "val": {
-                              "vec": []
+                            {
+                              "u64": 1
                             }
-                          },
-                          {
-                            "key": {
-                              "symbol": "current_approvals"
+                          ]
+                        },
+                        "val": {
+                          "map": [
+                            {
+                              "key": {
+                                "symbol": "allow_partial_release"
+                              },
+                              "val": {
+                                "bool": false
+                              }
                             },
-                            "val": {
-                              "u32": 0
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "expiration_timestamp"
+                            {
+                              "key": {
+                                "symbol": "amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 5000
+                                }
+                              }
                             },
-                            "val": {
-                              "u64": 10000
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "min_approvals"
+                            {
+                              "key": {
+                                "symbol": "asset"
+                              },
+                              "val": {
+                                "map": [
+                                  {
+                                    "key": {
+                                      "symbol": "code"
+                                    },
+                                    "val": {
+                                      "string": "USDC"
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "issuer"
+                                    },
+                                    "val": {
+                                      "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
+                                    }
+                                  }
+                                ]
+                              }
                             },
-                            "val": {
-                              "u32": 1
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "operator"
+                            {
+                              "key": {
+                                "symbol": "created_at"
+                              },
+                              "val": {
+                                "u64": 1000
+                              }
                             },
-                            "val": {
-                              "vec": [
-                                {
-                                  "symbol": "And"
+                            {
+                              "key": {
+                                "symbol": "deposited_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 5000
                                 }
-                              ]
-                            }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "release_timestamp"
-                      },
-                      "val": {
-                        "u64": 0
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "released_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 0
-                        }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "sender"
-                      },
-                      "val": {
-                        "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "status"
-                      },
-                      "val": {
-                        "vec": [
-                          {
-                            "symbol": "Funded"
-                          }
-                        ]
-                      }
-                    }
-                  ]
-                }
-              }
-            },
-            "ext": "v0"
-          },
-          4095
-        ]
-      ],
-      [
-        {
-          "contract_data": {
-            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-            "key": {
-              "vec": [
-                {
-                  "symbol": "EscrowApprovals"
-                },
-                {
-                  "u64": 1
-                }
-              ]
-            },
-            "durability": "persistent"
-          }
-        },
-        [
-          {
-            "last_modified_ledger_seq": 0,
-            "data": {
-              "contract_data": {
-                "ext": "v0",
-                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-                "key": {
-                  "vec": [
-                    {
-                      "symbol": "EscrowApprovals"
-                    },
-                    {
-                      "u64": 1
-                    }
-                  ]
-                },
-                "durability": "persistent",
-                "val": {
-                  "map": [
-                    {
-                      "key": {
-                        "symbol": "approval_timeout"
-                      },
-                      "val": {
-                        "u64": 5000
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "approvals"
-                      },
-                      "val": {
-                        "map": [
-                          {
-                            "key": {
-                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "escrow_id"
+                              },
+                              "val": {
+                                "u64": 1
+                              }
                             },
-                            "val": {
-                              "bool": true
+                            {
+                              "key": {
+                                "symbol": "kyc_compliant"
+                              },
+                              "val": {
+                                "bool": false
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "last_deposit_at"
+                              },
+                              "val": {
+                                "u64": 1000
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "memo"
+                              },
+                              "val": {
+                                "string": "Multi-party test"
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "multi_party_enabled"
+                              },
+                              "val": {
+                                "bool": true
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "recipient"
+                              },
+                              "val": {
+                                "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "refund_timestamp"
+                              },
+                              "val": {
+                                "u64": 0
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "refunded_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 0
+                                }
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "release_conditions"
+                              },
+                              "val": {
+                                "map": [
+                                  {
+                                    "key": {
+                                      "symbol": "conditions"
+                                    },
+                                    "val": {
+                                      "vec": []
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "current_approvals"
+                                    },
+                                    "val": {
+                                      "u32": 0
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "expiration_timestamp"
+                                    },
+                                    "val": {
+                                      "u64": 10000
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "min_approvals"
+                                    },
+                                    "val": {
+                                      "u32": 1
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "operator"
+                                    },
+                                    "val": {
+                                      "vec": [
+                                        {
+                                          "symbol": "And"
+                                        }
+                                      ]
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "oracle_confirmation"
+                                    },
+                                    "val": {
+                                      "bool": false
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "recipient_approval"
+                                    },
+                                    "val": {
+                                      "bool": false
+                                    }
+                                  }
+                                ]
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "release_timestamp"
+                              },
+                              "val": {
+                                "u64": 0
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "released_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 0
+                                }
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "sender"
+                              },
+                              "val": {
+                                "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "status"
+                              },
+                              "val": {
+                                "vec": [
+                                  {
+                                    "symbol": "Funded"
+                                  }
+                                ]
+                              }
                             }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "finalized"
-                      },
-                      "val": {
-                        "bool": false
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "required_approvals"
-                      },
-                      "val": {
-                        "u32": 2
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "whitelisted_approvers"
+                          ]
+                        }
                       },
-                      "val": {
-                        "vec": [
-                          {
-                            "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
-                          },
-                          {
-                            "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
-                          }
-                        ]
-                      }
-                    }
-                  ]
-                }
-              }
-            },
-            "ext": "v0"
-          },
-          4095
-        ]
-      ],
-      [
-        {
-          "contract_data": {
-            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-            "key": "ledger_key_contract_instance",
-            "durability": "persistent"
-          }
-        },
-        [
-          {
-            "last_modified_ledger_seq": 0,
-            "data": {
-              "contract_data": {
-                "ext": "v0",
-                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-                "key": "ledger_key_contract_instance",
-                "durability": "persistent",
-                "val": {
-                  "contract_instance": {
-                    "executable": {
-                      "wasm": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
-                    },
-                    "storage": [
                       {
                         "key": {
                           "vec": [
                             {
-                              "symbol": "Admin"
+                              "symbol": "EscrowApprovals"
+                            },
+                            {
+                              "u64": 1
                             }
                           ]
                         },
                         "val": {
-                          "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
+                          "map": [
+                            {
+                              "key": {
+                                "symbol": "approval_timeout"
+                              },
+                              "val": {
+                                "u64": 5000
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "approvals"
+                              },
+                              "val": {
+                                "map": [
+                                  {
+                                    "key": {
+                                      "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
+                                    },
+                                    "val": {
+                                      "bool": true
+                                    }
+                                  }
+                                ]
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "finalized"
+                              },
+                              "val": {
+                                "bool": false
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "required_approvals"
+                              },
+                              "val": {
+                                "u32": 2
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "whitelisted_approvers"
+                              },
+                              "val": {
+                                "vec": [
+                                  {
+                                    "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
+                                  },
+                                  {
+                                    "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
+                                  }
+                                ]
+                              }
+                            }
+                          ]
                         }
                       },
                       {
diff --git a/contracts/test_snapshots/payment_escrow/test/test_multi_party_full_flow_2_of_3.1.json b/contracts/test_snapshots/payment_escrow/test/test_multi_party_full_flow_2_of_3.1.json
index f2ad8cf..ba38600 100644
--- a/contracts/test_snapshots/payment_escrow/test/test_multi_party_full_flow_2_of_3.1.json
+++ b/contracts/test_snapshots/payment_escrow/test/test_multi_party_full_flow_2_of_3.1.json
@@ -673,16 +673,7 @@
         {
           "contract_data": {
             "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-            "key": {
-              "vec": [
-                {
-                  "symbol": "Escrow"
-                },
-                {
-                  "u64": 1
-                }
-              ]
-            },
+            "key": "ledger_key_contract_instance",
             "durability": "persistent"
           }
         },
@@ -693,380 +684,361 @@
               "contract_data": {
                 "ext": "v0",
                 "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-                "key": {
-                  "vec": [
-                    {
-                      "symbol": "Escrow"
-                    },
-                    {
-                      "u64": 1
-                    }
-                  ]
-                },
+                "key": "ledger_key_contract_instance",
                 "durability": "persistent",
                 "val": {
-                  "map": [
-                    {
-                      "key": {
-                        "symbol": "amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 5000
-                        }
-                      }
+                  "contract_instance": {
+                    "executable": {
+                      "wasm": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
                     },
-                    {
-                      "key": {
-                        "symbol": "asset"
-                      },
-                      "val": {
-                        "map": [
-                          {
-                            "key": {
-                              "symbol": "code"
-                            },
-                            "val": {
-                              "string": "USDC"
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "issuer"
-                            },
-                            "val": {
-                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
+                    "storage": [
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "Admin"
                             }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "created_at"
-                      },
-                      "val": {
-                        "u64": 1000
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "deposited_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 5000
-                        }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "escrow_id"
-                      },
-                      "val": {
-                        "u64": 1
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "flags"
-                      },
-                      "val": {
-                        "u32": 2
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "last_deposit_at"
-                      },
-                      "val": {
-                        "u64": 1000
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "memo"
-                      },
-                      "val": {
-                        "string": "Multi-party test"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "recipient"
-                      },
-                      "val": {
-                        "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "refund_timestamp"
-                      },
-                      "val": {
-                        "u64": 0
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "refunded_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 0
+                          ]
+                        },
+                        "val": {
+                          "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "release_conditions"
                       },
-                      "val": {
-                        "map": [
-                          {
-                            "key": {
-                              "symbol": "conditions"
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "Escrow"
                             },
-                            "val": {
-                              "vec": []
+                            {
+                              "u64": 1
                             }
-                          },
-                          {
-                            "key": {
-                              "symbol": "current_approvals"
+                          ]
+                        },
+                        "val": {
+                          "map": [
+                            {
+                              "key": {
+                                "symbol": "allow_partial_release"
+                              },
+                              "val": {
+                                "bool": false
+                              }
                             },
-                            "val": {
-                              "u32": 0
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "expiration_timestamp"
+                            {
+                              "key": {
+                                "symbol": "amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 5000
+                                }
+                              }
                             },
-                            "val": {
-                              "u64": 10000
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "min_approvals"
+                            {
+                              "key": {
+                                "symbol": "asset"
+                              },
+                              "val": {
+                                "map": [
+                                  {
+                                    "key": {
+                                      "symbol": "code"
+                                    },
+                                    "val": {
+                                      "string": "USDC"
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "issuer"
+                                    },
+                                    "val": {
+                                      "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
+                                    }
+                                  }
+                                ]
+                              }
                             },
-                            "val": {
-                              "u32": 1
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "operator"
+                            {
+                              "key": {
+                                "symbol": "created_at"
+                              },
+                              "val": {
+                                "u64": 1000
+                              }
                             },
-                            "val": {
-                              "vec": [
-                                {
-                                  "symbol": "And"
+                            {
+                              "key": {
+                                "symbol": "deposited_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 5000
                                 }
-                              ]
-                            }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "release_timestamp"
-                      },
-                      "val": {
-                        "u64": 1000
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "released_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 5000
-                        }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "sender"
-                      },
-                      "val": {
-                        "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "status"
-                      },
-                      "val": {
-                        "vec": [
-                          {
-                            "symbol": "Released"
-                          }
-                        ]
-                      }
-                    }
-                  ]
-                }
-              }
-            },
-            "ext": "v0"
-          },
-          4095
-        ]
-      ],
-      [
-        {
-          "contract_data": {
-            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-            "key": {
-              "vec": [
-                {
-                  "symbol": "EscrowApprovals"
-                },
-                {
-                  "u64": 1
-                }
-              ]
-            },
-            "durability": "persistent"
-          }
-        },
-        [
-          {
-            "last_modified_ledger_seq": 0,
-            "data": {
-              "contract_data": {
-                "ext": "v0",
-                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-                "key": {
-                  "vec": [
-                    {
-                      "symbol": "EscrowApprovals"
-                    },
-                    {
-                      "u64": 1
-                    }
-                  ]
-                },
-                "durability": "persistent",
-                "val": {
-                  "map": [
-                    {
-                      "key": {
-                        "symbol": "approval_timeout"
-                      },
-                      "val": {
-                        "u64": 0
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "approvals"
-                      },
-                      "val": {
-                        "map": [
-                          {
-                            "key": {
-                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
+                              }
                             },
-                            "val": {
-                              "bool": true
-                            }
-                          },
-                          {
-                            "key": {
-                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMDR4"
+                            {
+                              "key": {
+                                "symbol": "escrow_id"
+                              },
+                              "val": {
+                                "u64": 1
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "kyc_compliant"
+                              },
+                              "val": {
+                                "bool": false
+                              }
                             },
-                            "val": {
-                              "bool": true
+                            {
+                              "key": {
+                                "symbol": "last_deposit_at"
+                              },
+                              "val": {
+                                "u64": 1000
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "memo"
+                              },
+                              "val": {
+                                "string": "Multi-party test"
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "multi_party_enabled"
+                              },
+                              "val": {
+                                "bool": true
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "recipient"
+                              },
+                              "val": {
+                                "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "refund_timestamp"
+                              },
+                              "val": {
+                                "u64": 0
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "refunded_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 0
+                                }
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "release_conditions"
+                              },
+                              "val": {
+                                "map": [
+                                  {
+                                    "key": {
+                                      "symbol": "conditions"
+                                    },
+                                    "val": {
+                                      "vec": []
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "current_approvals"
+                                    },
+                                    "val": {
+                                      "u32": 0
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "expiration_timestamp"
+                                    },
+                                    "val": {
+                                      "u64": 10000
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "min_approvals"
+                                    },
+                                    "val": {
+                                      "u32": 1
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "operator"
+                                    },
+                                    "val": {
+                                      "vec": [
+                                        {
+                                          "symbol": "And"
+                                        }
+                                      ]
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "oracle_confirmation"
+                                    },
+                                    "val": {
+                                      "bool": false
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "recipient_approval"
+                                    },
+                                    "val": {
+                                      "bool": false
+                                    }
+                                  }
+                                ]
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "release_timestamp"
+                              },
+                              "val": {
+                                "u64": 1000
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "released_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 5000
+                                }
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "sender"
+                              },
+                              "val": {
+                                "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "status"
+                              },
+                              "val": {
+                                "vec": [
+                                  {
+                                    "symbol": "Released"
+                                  }
+                                ]
+                              }
                             }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "finalized"
-                      },
-                      "val": {
-                        "bool": true
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "required_approvals"
-                      },
-                      "val": {
-                        "u32": 2
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "whitelisted_approvers"
+                          ]
+                        }
                       },
-                      "val": {
-                        "vec": [
-                          {
-                            "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
-                          },
-                          {
-                            "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
-                          },
-                          {
-                            "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMDR4"
-                          }
-                        ]
-                      }
-                    }
-                  ]
-                }
-              }
-            },
-            "ext": "v0"
-          },
-          4095
-        ]
-      ],
-      [
-        {
-          "contract_data": {
-            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-            "key": "ledger_key_contract_instance",
-            "durability": "persistent"
-          }
-        },
-        [
-          {
-            "last_modified_ledger_seq": 0,
-            "data": {
-              "contract_data": {
-                "ext": "v0",
-                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-                "key": "ledger_key_contract_instance",
-                "durability": "persistent",
-                "val": {
-                  "contract_instance": {
-                    "executable": {
-                      "wasm": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
-                    },
-                    "storage": [
                       {
                         "key": {
                           "vec": [
                             {
-                              "symbol": "Admin"
+                              "symbol": "EscrowApprovals"
+                            },
+                            {
+                              "u64": 1
                             }
                           ]
                         },
                         "val": {
-                          "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
+                          "map": [
+                            {
+                              "key": {
+                                "symbol": "approval_timeout"
+                              },
+                              "val": {
+                                "u64": 0
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "approvals"
+                              },
+                              "val": {
+                                "map": [
+                                  {
+                                    "key": {
+                                      "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
+                                    },
+                                    "val": {
+                                      "bool": true
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMDR4"
+                                    },
+                                    "val": {
+                                      "bool": true
+                                    }
+                                  }
+                                ]
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "finalized"
+                              },
+                              "val": {
+                                "bool": true
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "required_approvals"
+                              },
+                              "val": {
+                                "u32": 2
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "whitelisted_approvers"
+                              },
+                              "val": {
+                                "vec": [
+                                  {
+                                    "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
+                                  },
+                                  {
+                                    "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
+                                  },
+                                  {
+                                    "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMDR4"
+                                  }
+                                ]
+                              }
+                            }
+                          ]
                         }
                       },
                       {
@@ -3010,6 +2982,14 @@
             ],
             "data": {
               "map": [
+                {
+                  "key": {
+                    "symbol": "allow_partial_release"
+                  },
+                  "val": {
+                    "bool": false
+                  }
+                },
                 {
                   "key": {
                     "symbol": "amount"
@@ -3075,10 +3055,10 @@
                 },
                 {
                   "key": {
-                    "symbol": "flags"
+                    "symbol": "kyc_compliant"
                   },
                   "val": {
-                    "u32": 2
+                    "bool": false
                   }
                 },
                 {
@@ -3097,6 +3077,14 @@
                     "string": "Multi-party test"
                   }
                 },
+                {
+                  "key": {
+                    "symbol": "multi_party_enabled"
+                  },
+                  "val": {
+                    "bool": true
+                  }
+                },
                 {
                   "key": {
                     "symbol": "recipient"
@@ -3173,6 +3161,22 @@
                             }
                           ]
                         }
+                      },
+                      {
+                        "key": {
+                          "symbol": "oracle_confirmation"
+                        },
+                        "val": {
+                          "bool": false
+                        }
+                      },
+                      {
+                        "key": {
+                          "symbol": "recipient_approval"
+                        },
+                        "val": {
+                          "bool": false
+                        }
                       }
                     ]
                   }
diff --git a/contracts/test_snapshots/payment_escrow/test/test_multi_party_no_timeout.1.json b/contracts/test_snapshots/payment_escrow/test/test_multi_party_no_timeout.1.json
index d934e17..edf1b45 100644
--- a/contracts/test_snapshots/payment_escrow/test/test_multi_party_no_timeout.1.json
+++ b/contracts/test_snapshots/payment_escrow/test/test_multi_party_no_timeout.1.json
@@ -531,16 +531,7 @@
         {
           "contract_data": {
             "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-            "key": {
-              "vec": [
-                {
-                  "symbol": "Escrow"
-                },
-                {
-                  "u64": 1
-                }
-              ]
-            },
+            "key": "ledger_key_contract_instance",
             "durability": "persistent"
           }
         },
@@ -551,369 +542,350 @@
               "contract_data": {
                 "ext": "v0",
                 "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-                "key": {
-                  "vec": [
-                    {
-                      "symbol": "Escrow"
-                    },
-                    {
-                      "u64": 1
-                    }
-                  ]
-                },
+                "key": "ledger_key_contract_instance",
                 "durability": "persistent",
                 "val": {
-                  "map": [
-                    {
-                      "key": {
-                        "symbol": "amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 5000
-                        }
-                      }
+                  "contract_instance": {
+                    "executable": {
+                      "wasm": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
                     },
-                    {
-                      "key": {
-                        "symbol": "asset"
-                      },
-                      "val": {
-                        "map": [
-                          {
-                            "key": {
-                              "symbol": "code"
-                            },
-                            "val": {
-                              "string": "USDC"
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "issuer"
-                            },
-                            "val": {
-                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
+                    "storage": [
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "Admin"
                             }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "created_at"
-                      },
-                      "val": {
-                        "u64": 1000
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "deposited_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 5000
-                        }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "escrow_id"
-                      },
-                      "val": {
-                        "u64": 1
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "flags"
-                      },
-                      "val": {
-                        "u32": 2
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "last_deposit_at"
-                      },
-                      "val": {
-                        "u64": 1000
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "memo"
-                      },
-                      "val": {
-                        "string": "Multi-party test"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "recipient"
-                      },
-                      "val": {
-                        "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "refund_timestamp"
-                      },
-                      "val": {
-                        "u64": 0
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "refunded_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 0
+                          ]
+                        },
+                        "val": {
+                          "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "release_conditions"
                       },
-                      "val": {
-                        "map": [
-                          {
-                            "key": {
-                              "symbol": "conditions"
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "Escrow"
                             },
-                            "val": {
-                              "vec": []
+                            {
+                              "u64": 1
                             }
-                          },
-                          {
-                            "key": {
-                              "symbol": "current_approvals"
+                          ]
+                        },
+                        "val": {
+                          "map": [
+                            {
+                              "key": {
+                                "symbol": "allow_partial_release"
+                              },
+                              "val": {
+                                "bool": false
+                              }
                             },
-                            "val": {
-                              "u32": 0
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "expiration_timestamp"
+                            {
+                              "key": {
+                                "symbol": "amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 5000
+                                }
+                              }
                             },
-                            "val": {
-                              "u64": 10000
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "min_approvals"
+                            {
+                              "key": {
+                                "symbol": "asset"
+                              },
+                              "val": {
+                                "map": [
+                                  {
+                                    "key": {
+                                      "symbol": "code"
+                                    },
+                                    "val": {
+                                      "string": "USDC"
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "issuer"
+                                    },
+                                    "val": {
+                                      "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
+                                    }
+                                  }
+                                ]
+                              }
                             },
-                            "val": {
-                              "u32": 1
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "operator"
+                            {
+                              "key": {
+                                "symbol": "created_at"
+                              },
+                              "val": {
+                                "u64": 1000
+                              }
                             },
-                            "val": {
-                              "vec": [
-                                {
-                                  "symbol": "And"
+                            {
+                              "key": {
+                                "symbol": "deposited_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 5000
                                 }
-                              ]
-                            }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "release_timestamp"
-                      },
-                      "val": {
-                        "u64": 0
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "released_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 0
-                        }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "sender"
-                      },
-                      "val": {
-                        "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "status"
-                      },
-                      "val": {
-                        "vec": [
-                          {
-                            "symbol": "Funded"
-                          }
-                        ]
-                      }
-                    }
-                  ]
-                }
-              }
-            },
-            "ext": "v0"
-          },
-          4095
-        ]
-      ],
-      [
-        {
-          "contract_data": {
-            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-            "key": {
-              "vec": [
-                {
-                  "symbol": "EscrowApprovals"
-                },
-                {
-                  "u64": 1
-                }
-              ]
-            },
-            "durability": "persistent"
-          }
-        },
-        [
-          {
-            "last_modified_ledger_seq": 0,
-            "data": {
-              "contract_data": {
-                "ext": "v0",
-                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-                "key": {
-                  "vec": [
-                    {
-                      "symbol": "EscrowApprovals"
-                    },
-                    {
-                      "u64": 1
-                    }
-                  ]
-                },
-                "durability": "persistent",
-                "val": {
-                  "map": [
-                    {
-                      "key": {
-                        "symbol": "approval_timeout"
-                      },
-                      "val": {
-                        "u64": 0
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "approvals"
-                      },
-                      "val": {
-                        "map": [
-                          {
-                            "key": {
-                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "escrow_id"
+                              },
+                              "val": {
+                                "u64": 1
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "kyc_compliant"
+                              },
+                              "val": {
+                                "bool": false
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "last_deposit_at"
+                              },
+                              "val": {
+                                "u64": 1000
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "memo"
+                              },
+                              "val": {
+                                "string": "Multi-party test"
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "multi_party_enabled"
+                              },
+                              "val": {
+                                "bool": true
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "recipient"
+                              },
+                              "val": {
+                                "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "refund_timestamp"
+                              },
+                              "val": {
+                                "u64": 0
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "refunded_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 0
+                                }
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "release_conditions"
+                              },
+                              "val": {
+                                "map": [
+                                  {
+                                    "key": {
+                                      "symbol": "conditions"
+                                    },
+                                    "val": {
+                                      "vec": []
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "current_approvals"
+                                    },
+                                    "val": {
+                                      "u32": 0
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "expiration_timestamp"
+                                    },
+                                    "val": {
+                                      "u64": 10000
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "min_approvals"
+                                    },
+                                    "val": {
+                                      "u32": 1
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "operator"
+                                    },
+                                    "val": {
+                                      "vec": [
+                                        {
+                                          "symbol": "And"
+                                        }
+                                      ]
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "oracle_confirmation"
+                                    },
+                                    "val": {
+                                      "bool": false
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "recipient_approval"
+                                    },
+                                    "val": {
+                                      "bool": false
+                                    }
+                                  }
+                                ]
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "release_timestamp"
+                              },
+                              "val": {
+                                "u64": 0
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "released_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 0
+                                }
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "sender"
+                              },
+                              "val": {
+                                "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
+                              }
                             },
-                            "val": {
-                              "bool": true
+                            {
+                              "key": {
+                                "symbol": "status"
+                              },
+                              "val": {
+                                "vec": [
+                                  {
+                                    "symbol": "Funded"
+                                  }
+                                ]
+                              }
                             }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "finalized"
-                      },
-                      "val": {
-                        "bool": false
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "required_approvals"
-                      },
-                      "val": {
-                        "u32": 2
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "whitelisted_approvers"
+                          ]
+                        }
                       },
-                      "val": {
-                        "vec": [
-                          {
-                            "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
-                          },
-                          {
-                            "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
-                          }
-                        ]
-                      }
-                    }
-                  ]
-                }
-              }
-            },
-            "ext": "v0"
-          },
-          4095
-        ]
-      ],
-      [
-        {
-          "contract_data": {
-            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-            "key": "ledger_key_contract_instance",
-            "durability": "persistent"
-          }
-        },
-        [
-          {
-            "last_modified_ledger_seq": 0,
-            "data": {
-              "contract_data": {
-                "ext": "v0",
-                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-                "key": "ledger_key_contract_instance",
-                "durability": "persistent",
-                "val": {
-                  "contract_instance": {
-                    "executable": {
-                      "wasm": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
-                    },
-                    "storage": [
                       {
                         "key": {
                           "vec": [
                             {
-                              "symbol": "Admin"
+                              "symbol": "EscrowApprovals"
+                            },
+                            {
+                              "u64": 1
                             }
                           ]
                         },
                         "val": {
-                          "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
+                          "map": [
+                            {
+                              "key": {
+                                "symbol": "approval_timeout"
+                              },
+                              "val": {
+                                "u64": 0
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "approvals"
+                              },
+                              "val": {
+                                "map": [
+                                  {
+                                    "key": {
+                                      "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
+                                    },
+                                    "val": {
+                                      "bool": true
+                                    }
+                                  }
+                                ]
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "finalized"
+                              },
+                              "val": {
+                                "bool": false
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "required_approvals"
+                              },
+                              "val": {
+                                "u32": 2
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "whitelisted_approvers"
+                              },
+                              "val": {
+                                "vec": [
+                                  {
+                                    "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
+                                  },
+                                  {
+                                    "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
+                                  }
+                                ]
+                              }
+                            }
+                          ]
                         }
                       },
                       {
diff --git a/contracts/test_snapshots/payment_escrow/test/test_multi_party_non_whitelisted_rejected.1.json b/contracts/test_snapshots/payment_escrow/test/test_multi_party_non_whitelisted_rejected.1.json
index 26eddf9..7bdb233 100644
--- a/contracts/test_snapshots/payment_escrow/test/test_multi_party_non_whitelisted_rejected.1.json
+++ b/contracts/test_snapshots/payment_escrow/test/test_multi_party_non_whitelisted_rejected.1.json
@@ -477,16 +477,7 @@
         {
           "contract_data": {
             "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-            "key": {
-              "vec": [
-                {
-                  "symbol": "Escrow"
-                },
-                {
-                  "u64": 1
-                }
-              ]
-            },
+            "key": "ledger_key_contract_instance",
             "durability": "persistent"
           }
         },
@@ -497,360 +488,341 @@
               "contract_data": {
                 "ext": "v0",
                 "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-                "key": {
-                  "vec": [
-                    {
-                      "symbol": "Escrow"
-                    },
-                    {
-                      "u64": 1
-                    }
-                  ]
-                },
+                "key": "ledger_key_contract_instance",
                 "durability": "persistent",
                 "val": {
-                  "map": [
-                    {
-                      "key": {
-                        "symbol": "amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 5000
-                        }
-                      }
+                  "contract_instance": {
+                    "executable": {
+                      "wasm": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
                     },
-                    {
-                      "key": {
-                        "symbol": "asset"
-                      },
-                      "val": {
-                        "map": [
-                          {
-                            "key": {
-                              "symbol": "code"
-                            },
-                            "val": {
-                              "string": "USDC"
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "issuer"
-                            },
-                            "val": {
-                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
+                    "storage": [
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "Admin"
                             }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "created_at"
-                      },
-                      "val": {
-                        "u64": 1000
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "deposited_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 5000
-                        }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "escrow_id"
-                      },
-                      "val": {
-                        "u64": 1
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "flags"
-                      },
-                      "val": {
-                        "u32": 2
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "last_deposit_at"
-                      },
-                      "val": {
-                        "u64": 1000
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "memo"
-                      },
-                      "val": {
-                        "string": "Multi-party test"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "recipient"
-                      },
-                      "val": {
-                        "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "refund_timestamp"
-                      },
-                      "val": {
-                        "u64": 0
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "refunded_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 0
+                          ]
+                        },
+                        "val": {
+                          "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "release_conditions"
                       },
-                      "val": {
-                        "map": [
-                          {
-                            "key": {
-                              "symbol": "conditions"
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "Escrow"
                             },
-                            "val": {
-                              "vec": []
+                            {
+                              "u64": 1
                             }
-                          },
-                          {
-                            "key": {
-                              "symbol": "current_approvals"
+                          ]
+                        },
+                        "val": {
+                          "map": [
+                            {
+                              "key": {
+                                "symbol": "allow_partial_release"
+                              },
+                              "val": {
+                                "bool": false
+                              }
                             },
-                            "val": {
-                              "u32": 0
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "expiration_timestamp"
+                            {
+                              "key": {
+                                "symbol": "amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 5000
+                                }
+                              }
                             },
-                            "val": {
-                              "u64": 10000
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "min_approvals"
+                            {
+                              "key": {
+                                "symbol": "asset"
+                              },
+                              "val": {
+                                "map": [
+                                  {
+                                    "key": {
+                                      "symbol": "code"
+                                    },
+                                    "val": {
+                                      "string": "USDC"
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "issuer"
+                                    },
+                                    "val": {
+                                      "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
+                                    }
+                                  }
+                                ]
+                              }
                             },
-                            "val": {
-                              "u32": 1
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "operator"
+                            {
+                              "key": {
+                                "symbol": "created_at"
+                              },
+                              "val": {
+                                "u64": 1000
+                              }
                             },
-                            "val": {
-                              "vec": [
-                                {
-                                  "symbol": "And"
+                            {
+                              "key": {
+                                "symbol": "deposited_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 5000
                                 }
-                              ]
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "escrow_id"
+                              },
+                              "val": {
+                                "u64": 1
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "kyc_compliant"
+                              },
+                              "val": {
+                                "bool": false
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "last_deposit_at"
+                              },
+                              "val": {
+                                "u64": 1000
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "memo"
+                              },
+                              "val": {
+                                "string": "Multi-party test"
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "multi_party_enabled"
+                              },
+                              "val": {
+                                "bool": true
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "recipient"
+                              },
+                              "val": {
+                                "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "refund_timestamp"
+                              },
+                              "val": {
+                                "u64": 0
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "refunded_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 0
+                                }
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "release_conditions"
+                              },
+                              "val": {
+                                "map": [
+                                  {
+                                    "key": {
+                                      "symbol": "conditions"
+                                    },
+                                    "val": {
+                                      "vec": []
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "current_approvals"
+                                    },
+                                    "val": {
+                                      "u32": 0
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "expiration_timestamp"
+                                    },
+                                    "val": {
+                                      "u64": 10000
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "min_approvals"
+                                    },
+                                    "val": {
+                                      "u32": 1
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "operator"
+                                    },
+                                    "val": {
+                                      "vec": [
+                                        {
+                                          "symbol": "And"
+                                        }
+                                      ]
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "oracle_confirmation"
+                                    },
+                                    "val": {
+                                      "bool": false
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "recipient_approval"
+                                    },
+                                    "val": {
+                                      "bool": false
+                                    }
+                                  }
+                                ]
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "release_timestamp"
+                              },
+                              "val": {
+                                "u64": 0
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "released_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 0
+                                }
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "sender"
+                              },
+                              "val": {
+                                "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "status"
+                              },
+                              "val": {
+                                "vec": [
+                                  {
+                                    "symbol": "Funded"
+                                  }
+                                ]
+                              }
                             }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "release_timestamp"
-                      },
-                      "val": {
-                        "u64": 0
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "released_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 0
+                          ]
                         }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "sender"
-                      },
-                      "val": {
-                        "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "status"
                       },
-                      "val": {
-                        "vec": [
-                          {
-                            "symbol": "Funded"
-                          }
-                        ]
-                      }
-                    }
-                  ]
-                }
-              }
-            },
-            "ext": "v0"
-          },
-          4095
-        ]
-      ],
-      [
-        {
-          "contract_data": {
-            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-            "key": {
-              "vec": [
-                {
-                  "symbol": "EscrowApprovals"
-                },
-                {
-                  "u64": 1
-                }
-              ]
-            },
-            "durability": "persistent"
-          }
-        },
-        [
-          {
-            "last_modified_ledger_seq": 0,
-            "data": {
-              "contract_data": {
-                "ext": "v0",
-                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-                "key": {
-                  "vec": [
-                    {
-                      "symbol": "EscrowApprovals"
-                    },
-                    {
-                      "u64": 1
-                    }
-                  ]
-                },
-                "durability": "persistent",
-                "val": {
-                  "map": [
-                    {
-                      "key": {
-                        "symbol": "approval_timeout"
-                      },
-                      "val": {
-                        "u64": 5000
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "approvals"
-                      },
-                      "val": {
-                        "map": []
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "finalized"
-                      },
-                      "val": {
-                        "bool": false
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "required_approvals"
-                      },
-                      "val": {
-                        "u32": 2
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "whitelisted_approvers"
-                      },
-                      "val": {
-                        "vec": [
-                          {
-                            "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
-                          },
-                          {
-                            "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
-                          }
-                        ]
-                      }
-                    }
-                  ]
-                }
-              }
-            },
-            "ext": "v0"
-          },
-          4095
-        ]
-      ],
-      [
-        {
-          "contract_data": {
-            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-            "key": "ledger_key_contract_instance",
-            "durability": "persistent"
-          }
-        },
-        [
-          {
-            "last_modified_ledger_seq": 0,
-            "data": {
-              "contract_data": {
-                "ext": "v0",
-                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-                "key": "ledger_key_contract_instance",
-                "durability": "persistent",
-                "val": {
-                  "contract_instance": {
-                    "executable": {
-                      "wasm": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
-                    },
-                    "storage": [
                       {
                         "key": {
                           "vec": [
                             {
-                              "symbol": "Admin"
+                              "symbol": "EscrowApprovals"
+                            },
+                            {
+                              "u64": 1
                             }
                           ]
                         },
                         "val": {
-                          "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
+                          "map": [
+                            {
+                              "key": {
+                                "symbol": "approval_timeout"
+                              },
+                              "val": {
+                                "u64": 5000
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "approvals"
+                              },
+                              "val": {
+                                "map": []
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "finalized"
+                              },
+                              "val": {
+                                "bool": false
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "required_approvals"
+                              },
+                              "val": {
+                                "u32": 2
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "whitelisted_approvers"
+                              },
+                              "val": {
+                                "vec": [
+                                  {
+                                    "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
+                                  },
+                                  {
+                                    "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
+                                  }
+                                ]
+                              }
+                            }
+                          ]
                         }
                       },
                       {
diff --git a/contracts/test_snapshots/payment_escrow/test/test_multi_party_quorum_met.1.json b/contracts/test_snapshots/payment_escrow/test/test_multi_party_quorum_met.1.json
index ba99314..c766008 100644
--- a/contracts/test_snapshots/payment_escrow/test/test_multi_party_quorum_met.1.json
+++ b/contracts/test_snapshots/payment_escrow/test/test_multi_party_quorum_met.1.json
@@ -590,16 +590,7 @@
         {
           "contract_data": {
             "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-            "key": {
-              "vec": [
-                {
-                  "symbol": "Escrow"
-                },
-                {
-                  "u64": 1
-                }
-              ]
-            },
+            "key": "ledger_key_contract_instance",
             "durability": "persistent"
           }
         },
@@ -610,380 +601,361 @@
               "contract_data": {
                 "ext": "v0",
                 "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-                "key": {
-                  "vec": [
-                    {
-                      "symbol": "Escrow"
-                    },
-                    {
-                      "u64": 1
-                    }
-                  ]
-                },
+                "key": "ledger_key_contract_instance",
                 "durability": "persistent",
                 "val": {
-                  "map": [
-                    {
-                      "key": {
-                        "symbol": "amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 5000
-                        }
-                      }
+                  "contract_instance": {
+                    "executable": {
+                      "wasm": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
                     },
-                    {
-                      "key": {
-                        "symbol": "asset"
-                      },
-                      "val": {
-                        "map": [
-                          {
-                            "key": {
-                              "symbol": "code"
-                            },
-                            "val": {
-                              "string": "USDC"
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "issuer"
-                            },
-                            "val": {
-                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
+                    "storage": [
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "Admin"
                             }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "created_at"
-                      },
-                      "val": {
-                        "u64": 1000
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "deposited_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 5000
-                        }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "escrow_id"
-                      },
-                      "val": {
-                        "u64": 1
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "flags"
-                      },
-                      "val": {
-                        "u32": 2
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "last_deposit_at"
-                      },
-                      "val": {
-                        "u64": 1000
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "memo"
-                      },
-                      "val": {
-                        "string": "Multi-party test"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "recipient"
-                      },
-                      "val": {
-                        "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "refund_timestamp"
-                      },
-                      "val": {
-                        "u64": 0
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "refunded_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 0
+                          ]
+                        },
+                        "val": {
+                          "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "release_conditions"
                       },
-                      "val": {
-                        "map": [
-                          {
-                            "key": {
-                              "symbol": "conditions"
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "Escrow"
                             },
-                            "val": {
-                              "vec": []
+                            {
+                              "u64": 1
                             }
-                          },
-                          {
-                            "key": {
-                              "symbol": "current_approvals"
+                          ]
+                        },
+                        "val": {
+                          "map": [
+                            {
+                              "key": {
+                                "symbol": "allow_partial_release"
+                              },
+                              "val": {
+                                "bool": false
+                              }
                             },
-                            "val": {
-                              "u32": 0
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "expiration_timestamp"
+                            {
+                              "key": {
+                                "symbol": "amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 5000
+                                }
+                              }
                             },
-                            "val": {
-                              "u64": 10000
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "min_approvals"
+                            {
+                              "key": {
+                                "symbol": "asset"
+                              },
+                              "val": {
+                                "map": [
+                                  {
+                                    "key": {
+                                      "symbol": "code"
+                                    },
+                                    "val": {
+                                      "string": "USDC"
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "issuer"
+                                    },
+                                    "val": {
+                                      "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
+                                    }
+                                  }
+                                ]
+                              }
                             },
-                            "val": {
-                              "u32": 1
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "operator"
+                            {
+                              "key": {
+                                "symbol": "created_at"
+                              },
+                              "val": {
+                                "u64": 1000
+                              }
                             },
-                            "val": {
-                              "vec": [
-                                {
-                                  "symbol": "And"
+                            {
+                              "key": {
+                                "symbol": "deposited_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 5000
                                 }
-                              ]
-                            }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "release_timestamp"
-                      },
-                      "val": {
-                        "u64": 0
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "released_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 0
-                        }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "sender"
-                      },
-                      "val": {
-                        "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "status"
-                      },
-                      "val": {
-                        "vec": [
-                          {
-                            "symbol": "Funded"
-                          }
-                        ]
-                      }
-                    }
-                  ]
-                }
-              }
-            },
-            "ext": "v0"
-          },
-          4095
-        ]
-      ],
-      [
-        {
-          "contract_data": {
-            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-            "key": {
-              "vec": [
-                {
-                  "symbol": "EscrowApprovals"
-                },
-                {
-                  "u64": 1
-                }
-              ]
-            },
-            "durability": "persistent"
-          }
-        },
-        [
-          {
-            "last_modified_ledger_seq": 0,
-            "data": {
-              "contract_data": {
-                "ext": "v0",
-                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-                "key": {
-                  "vec": [
-                    {
-                      "symbol": "EscrowApprovals"
-                    },
-                    {
-                      "u64": 1
-                    }
-                  ]
-                },
-                "durability": "persistent",
-                "val": {
-                  "map": [
-                    {
-                      "key": {
-                        "symbol": "approval_timeout"
-                      },
-                      "val": {
-                        "u64": 5000
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "approvals"
-                      },
-                      "val": {
-                        "map": [
-                          {
-                            "key": {
-                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
+                              }
                             },
-                            "val": {
-                              "bool": true
-                            }
-                          },
-                          {
-                            "key": {
-                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
+                            {
+                              "key": {
+                                "symbol": "escrow_id"
+                              },
+                              "val": {
+                                "u64": 1
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "kyc_compliant"
+                              },
+                              "val": {
+                                "bool": false
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "last_deposit_at"
+                              },
+                              "val": {
+                                "u64": 1000
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "memo"
+                              },
+                              "val": {
+                                "string": "Multi-party test"
+                              }
                             },
-                            "val": {
-                              "bool": true
+                            {
+                              "key": {
+                                "symbol": "multi_party_enabled"
+                              },
+                              "val": {
+                                "bool": true
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "recipient"
+                              },
+                              "val": {
+                                "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "refund_timestamp"
+                              },
+                              "val": {
+                                "u64": 0
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "refunded_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 0
+                                }
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "release_conditions"
+                              },
+                              "val": {
+                                "map": [
+                                  {
+                                    "key": {
+                                      "symbol": "conditions"
+                                    },
+                                    "val": {
+                                      "vec": []
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "current_approvals"
+                                    },
+                                    "val": {
+                                      "u32": 0
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "expiration_timestamp"
+                                    },
+                                    "val": {
+                                      "u64": 10000
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "min_approvals"
+                                    },
+                                    "val": {
+                                      "u32": 1
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "operator"
+                                    },
+                                    "val": {
+                                      "vec": [
+                                        {
+                                          "symbol": "And"
+                                        }
+                                      ]
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "oracle_confirmation"
+                                    },
+                                    "val": {
+                                      "bool": false
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "recipient_approval"
+                                    },
+                                    "val": {
+                                      "bool": false
+                                    }
+                                  }
+                                ]
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "release_timestamp"
+                              },
+                              "val": {
+                                "u64": 0
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "released_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 0
+                                }
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "sender"
+                              },
+                              "val": {
+                                "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "status"
+                              },
+                              "val": {
+                                "vec": [
+                                  {
+                                    "symbol": "Funded"
+                                  }
+                                ]
+                              }
                             }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "finalized"
-                      },
-                      "val": {
-                        "bool": false
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "required_approvals"
-                      },
-                      "val": {
-                        "u32": 2
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "whitelisted_approvers"
+                          ]
+                        }
                       },
-                      "val": {
-                        "vec": [
-                          {
-                            "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
-                          },
-                          {
-                            "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
-                          },
-                          {
-                            "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
-                          }
-                        ]
-                      }
-                    }
-                  ]
-                }
-              }
-            },
-            "ext": "v0"
-          },
-          4095
-        ]
-      ],
-      [
-        {
-          "contract_data": {
-            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-            "key": "ledger_key_contract_instance",
-            "durability": "persistent"
-          }
-        },
-        [
-          {
-            "last_modified_ledger_seq": 0,
-            "data": {
-              "contract_data": {
-                "ext": "v0",
-                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-                "key": "ledger_key_contract_instance",
-                "durability": "persistent",
-                "val": {
-                  "contract_instance": {
-                    "executable": {
-                      "wasm": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
-                    },
-                    "storage": [
                       {
                         "key": {
                           "vec": [
                             {
-                              "symbol": "Admin"
+                              "symbol": "EscrowApprovals"
+                            },
+                            {
+                              "u64": 1
                             }
                           ]
                         },
                         "val": {
-                          "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
+                          "map": [
+                            {
+                              "key": {
+                                "symbol": "approval_timeout"
+                              },
+                              "val": {
+                                "u64": 5000
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "approvals"
+                              },
+                              "val": {
+                                "map": [
+                                  {
+                                    "key": {
+                                      "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
+                                    },
+                                    "val": {
+                                      "bool": true
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
+                                    },
+                                    "val": {
+                                      "bool": true
+                                    }
+                                  }
+                                ]
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "finalized"
+                              },
+                              "val": {
+                                "bool": false
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "required_approvals"
+                              },
+                              "val": {
+                                "u32": 2
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "whitelisted_approvers"
+                              },
+                              "val": {
+                                "vec": [
+                                  {
+                                    "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
+                                  },
+                                  {
+                                    "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
+                                  },
+                                  {
+                                    "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
+                                  }
+                                ]
+                              }
+                            }
+                          ]
                         }
                       },
                       {
diff --git a/contracts/test_snapshots/payment_escrow/test/test_multi_party_revoke_then_reapprove.1.json b/contracts/test_snapshots/payment_escrow/test/test_multi_party_revoke_then_reapprove.1.json
index b049247..57827ae 100644
--- a/contracts/test_snapshots/payment_escrow/test/test_multi_party_revoke_then_reapprove.1.json
+++ b/contracts/test_snapshots/payment_escrow/test/test_multi_party_revoke_then_reapprove.1.json
@@ -701,16 +701,7 @@
         {
           "contract_data": {
             "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-            "key": {
-              "vec": [
-                {
-                  "symbol": "Escrow"
-                },
-                {
-                  "u64": 1
-                }
-              ]
-            },
+            "key": "ledger_key_contract_instance",
             "durability": "persistent"
           }
         },
@@ -721,380 +712,361 @@
               "contract_data": {
                 "ext": "v0",
                 "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-                "key": {
-                  "vec": [
-                    {
-                      "symbol": "Escrow"
-                    },
-                    {
-                      "u64": 1
-                    }
-                  ]
-                },
+                "key": "ledger_key_contract_instance",
                 "durability": "persistent",
                 "val": {
-                  "map": [
-                    {
-                      "key": {
-                        "symbol": "amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 5000
-                        }
-                      }
+                  "contract_instance": {
+                    "executable": {
+                      "wasm": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
                     },
-                    {
-                      "key": {
-                        "symbol": "asset"
-                      },
-                      "val": {
-                        "map": [
-                          {
-                            "key": {
-                              "symbol": "code"
-                            },
-                            "val": {
-                              "string": "USDC"
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "issuer"
-                            },
-                            "val": {
-                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
+                    "storage": [
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "Admin"
                             }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "created_at"
-                      },
-                      "val": {
-                        "u64": 1000
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "deposited_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 5000
-                        }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "escrow_id"
-                      },
-                      "val": {
-                        "u64": 1
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "flags"
-                      },
-                      "val": {
-                        "u32": 2
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "last_deposit_at"
-                      },
-                      "val": {
-                        "u64": 1000
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "memo"
-                      },
-                      "val": {
-                        "string": "Multi-party test"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "recipient"
-                      },
-                      "val": {
-                        "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "refund_timestamp"
-                      },
-                      "val": {
-                        "u64": 0
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "refunded_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 0
+                          ]
+                        },
+                        "val": {
+                          "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "release_conditions"
                       },
-                      "val": {
-                        "map": [
-                          {
-                            "key": {
-                              "symbol": "conditions"
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "Escrow"
                             },
-                            "val": {
-                              "vec": []
+                            {
+                              "u64": 1
                             }
-                          },
-                          {
-                            "key": {
-                              "symbol": "current_approvals"
+                          ]
+                        },
+                        "val": {
+                          "map": [
+                            {
+                              "key": {
+                                "symbol": "allow_partial_release"
+                              },
+                              "val": {
+                                "bool": false
+                              }
                             },
-                            "val": {
-                              "u32": 0
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "expiration_timestamp"
+                            {
+                              "key": {
+                                "symbol": "amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 5000
+                                }
+                              }
                             },
-                            "val": {
-                              "u64": 10000
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "min_approvals"
+                            {
+                              "key": {
+                                "symbol": "asset"
+                              },
+                              "val": {
+                                "map": [
+                                  {
+                                    "key": {
+                                      "symbol": "code"
+                                    },
+                                    "val": {
+                                      "string": "USDC"
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "issuer"
+                                    },
+                                    "val": {
+                                      "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
+                                    }
+                                  }
+                                ]
+                              }
                             },
-                            "val": {
-                              "u32": 1
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "operator"
+                            {
+                              "key": {
+                                "symbol": "created_at"
+                              },
+                              "val": {
+                                "u64": 1000
+                              }
                             },
-                            "val": {
-                              "vec": [
-                                {
-                                  "symbol": "And"
+                            {
+                              "key": {
+                                "symbol": "deposited_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 5000
                                 }
-                              ]
-                            }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "release_timestamp"
-                      },
-                      "val": {
-                        "u64": 0
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "released_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 0
-                        }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "sender"
-                      },
-                      "val": {
-                        "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "status"
-                      },
-                      "val": {
-                        "vec": [
-                          {
-                            "symbol": "Funded"
-                          }
-                        ]
-                      }
-                    }
-                  ]
-                }
-              }
-            },
-            "ext": "v0"
-          },
-          4095
-        ]
-      ],
-      [
-        {
-          "contract_data": {
-            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-            "key": {
-              "vec": [
-                {
-                  "symbol": "EscrowApprovals"
-                },
-                {
-                  "u64": 1
-                }
-              ]
-            },
-            "durability": "persistent"
-          }
-        },
-        [
-          {
-            "last_modified_ledger_seq": 0,
-            "data": {
-              "contract_data": {
-                "ext": "v0",
-                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-                "key": {
-                  "vec": [
-                    {
-                      "symbol": "EscrowApprovals"
-                    },
-                    {
-                      "u64": 1
-                    }
-                  ]
-                },
-                "durability": "persistent",
-                "val": {
-                  "map": [
-                    {
-                      "key": {
-                        "symbol": "approval_timeout"
-                      },
-                      "val": {
-                        "u64": 5000
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "approvals"
-                      },
-                      "val": {
-                        "map": [
-                          {
-                            "key": {
-                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
+                              }
                             },
-                            "val": {
-                              "bool": true
-                            }
-                          },
-                          {
-                            "key": {
-                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
+                            {
+                              "key": {
+                                "symbol": "escrow_id"
+                              },
+                              "val": {
+                                "u64": 1
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "kyc_compliant"
+                              },
+                              "val": {
+                                "bool": false
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "last_deposit_at"
+                              },
+                              "val": {
+                                "u64": 1000
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "memo"
+                              },
+                              "val": {
+                                "string": "Multi-party test"
+                              }
                             },
-                            "val": {
-                              "bool": true
+                            {
+                              "key": {
+                                "symbol": "multi_party_enabled"
+                              },
+                              "val": {
+                                "bool": true
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "recipient"
+                              },
+                              "val": {
+                                "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "refund_timestamp"
+                              },
+                              "val": {
+                                "u64": 0
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "refunded_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 0
+                                }
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "release_conditions"
+                              },
+                              "val": {
+                                "map": [
+                                  {
+                                    "key": {
+                                      "symbol": "conditions"
+                                    },
+                                    "val": {
+                                      "vec": []
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "current_approvals"
+                                    },
+                                    "val": {
+                                      "u32": 0
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "expiration_timestamp"
+                                    },
+                                    "val": {
+                                      "u64": 10000
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "min_approvals"
+                                    },
+                                    "val": {
+                                      "u32": 1
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "operator"
+                                    },
+                                    "val": {
+                                      "vec": [
+                                        {
+                                          "symbol": "And"
+                                        }
+                                      ]
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "oracle_confirmation"
+                                    },
+                                    "val": {
+                                      "bool": false
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "recipient_approval"
+                                    },
+                                    "val": {
+                                      "bool": false
+                                    }
+                                  }
+                                ]
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "release_timestamp"
+                              },
+                              "val": {
+                                "u64": 0
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "released_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 0
+                                }
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "sender"
+                              },
+                              "val": {
+                                "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "status"
+                              },
+                              "val": {
+                                "vec": [
+                                  {
+                                    "symbol": "Funded"
+                                  }
+                                ]
+                              }
                             }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "finalized"
-                      },
-                      "val": {
-                        "bool": false
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "required_approvals"
-                      },
-                      "val": {
-                        "u32": 2
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "whitelisted_approvers"
+                          ]
+                        }
                       },
-                      "val": {
-                        "vec": [
-                          {
-                            "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
-                          },
-                          {
-                            "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
-                          },
-                          {
-                            "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
-                          }
-                        ]
-                      }
-                    }
-                  ]
-                }
-              }
-            },
-            "ext": "v0"
-          },
-          4095
-        ]
-      ],
-      [
-        {
-          "contract_data": {
-            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-            "key": "ledger_key_contract_instance",
-            "durability": "persistent"
-          }
-        },
-        [
-          {
-            "last_modified_ledger_seq": 0,
-            "data": {
-              "contract_data": {
-                "ext": "v0",
-                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-                "key": "ledger_key_contract_instance",
-                "durability": "persistent",
-                "val": {
-                  "contract_instance": {
-                    "executable": {
-                      "wasm": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
-                    },
-                    "storage": [
                       {
                         "key": {
                           "vec": [
                             {
-                              "symbol": "Admin"
+                              "symbol": "EscrowApprovals"
+                            },
+                            {
+                              "u64": 1
                             }
                           ]
                         },
                         "val": {
-                          "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
+                          "map": [
+                            {
+                              "key": {
+                                "symbol": "approval_timeout"
+                              },
+                              "val": {
+                                "u64": 5000
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "approvals"
+                              },
+                              "val": {
+                                "map": [
+                                  {
+                                    "key": {
+                                      "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
+                                    },
+                                    "val": {
+                                      "bool": true
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
+                                    },
+                                    "val": {
+                                      "bool": true
+                                    }
+                                  }
+                                ]
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "finalized"
+                              },
+                              "val": {
+                                "bool": false
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "required_approvals"
+                              },
+                              "val": {
+                                "u32": 2
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "whitelisted_approvers"
+                              },
+                              "val": {
+                                "vec": [
+                                  {
+                                    "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
+                                  },
+                                  {
+                                    "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
+                                  },
+                                  {
+                                    "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
+                                  }
+                                ]
+                              }
+                            }
+                          ]
                         }
                       },
                       {
diff --git a/contracts/test_snapshots/payment_escrow/test/test_multi_party_setup_unauthorized.1.json b/contracts/test_snapshots/payment_escrow/test/test_multi_party_setup_unauthorized.1.json
index 7940ad2..3c2fbe3 100644
--- a/contracts/test_snapshots/payment_escrow/test/test_multi_party_setup_unauthorized.1.json
+++ b/contracts/test_snapshots/payment_escrow/test/test_multi_party_setup_unauthorized.1.json
@@ -402,258 +402,6 @@
           6311999
         ]
       ],
-      [
-        {
-          "contract_data": {
-            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-            "key": {
-              "vec": [
-                {
-                  "symbol": "Escrow"
-                },
-                {
-                  "u64": 1
-                }
-              ]
-            },
-            "durability": "persistent"
-          }
-        },
-        [
-          {
-            "last_modified_ledger_seq": 0,
-            "data": {
-              "contract_data": {
-                "ext": "v0",
-                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-                "key": {
-                  "vec": [
-                    {
-                      "symbol": "Escrow"
-                    },
-                    {
-                      "u64": 1
-                    }
-                  ]
-                },
-                "durability": "persistent",
-                "val": {
-                  "map": [
-                    {
-                      "key": {
-                        "symbol": "amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 5000
-                        }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "asset"
-                      },
-                      "val": {
-                        "map": [
-                          {
-                            "key": {
-                              "symbol": "code"
-                            },
-                            "val": {
-                              "string": "USDC"
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "issuer"
-                            },
-                            "val": {
-                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
-                            }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "created_at"
-                      },
-                      "val": {
-                        "u64": 1000
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "deposited_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 5000
-                        }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "escrow_id"
-                      },
-                      "val": {
-                        "u64": 1
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "flags"
-                      },
-                      "val": {
-                        "u32": 0
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "last_deposit_at"
-                      },
-                      "val": {
-                        "u64": 1000
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "memo"
-                      },
-                      "val": {
-                        "string": "Multi-party test"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "recipient"
-                      },
-                      "val": {
-                        "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "refund_timestamp"
-                      },
-                      "val": {
-                        "u64": 0
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "refunded_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 0
-                        }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "release_conditions"
-                      },
-                      "val": {
-                        "map": [
-                          {
-                            "key": {
-                              "symbol": "conditions"
-                            },
-                            "val": {
-                              "vec": []
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "current_approvals"
-                            },
-                            "val": {
-                              "u32": 0
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "expiration_timestamp"
-                            },
-                            "val": {
-                              "u64": 10000
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "min_approvals"
-                            },
-                            "val": {
-                              "u32": 1
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "operator"
-                            },
-                            "val": {
-                              "vec": [
-                                {
-                                  "symbol": "And"
-                                }
-                              ]
-                            }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "release_timestamp"
-                      },
-                      "val": {
-                        "u64": 0
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "released_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 0
-                        }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "sender"
-                      },
-                      "val": {
-                        "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "status"
-                      },
-                      "val": {
-                        "vec": [
-                          {
-                            "symbol": "Funded"
-                          }
-                        ]
-                      }
-                    }
-                  ]
-                }
-              }
-            },
-            "ext": "v0"
-          },
-          4095
-        ]
-      ],
       [
         {
           "contract_data": {
@@ -689,6 +437,260 @@
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "Escrow"
+                            },
+                            {
+                              "u64": 1
+                            }
+                          ]
+                        },
+                        "val": {
+                          "map": [
+                            {
+                              "key": {
+                                "symbol": "allow_partial_release"
+                              },
+                              "val": {
+                                "bool": false
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 5000
+                                }
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "asset"
+                              },
+                              "val": {
+                                "map": [
+                                  {
+                                    "key": {
+                                      "symbol": "code"
+                                    },
+                                    "val": {
+                                      "string": "USDC"
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "issuer"
+                                    },
+                                    "val": {
+                                      "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
+                                    }
+                                  }
+                                ]
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "created_at"
+                              },
+                              "val": {
+                                "u64": 1000
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "deposited_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 5000
+                                }
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "escrow_id"
+                              },
+                              "val": {
+                                "u64": 1
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "kyc_compliant"
+                              },
+                              "val": {
+                                "bool": false
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "last_deposit_at"
+                              },
+                              "val": {
+                                "u64": 1000
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "memo"
+                              },
+                              "val": {
+                                "string": "Multi-party test"
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "multi_party_enabled"
+                              },
+                              "val": {
+                                "bool": false
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "recipient"
+                              },
+                              "val": {
+                                "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "refund_timestamp"
+                              },
+                              "val": {
+                                "u64": 0
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "refunded_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 0
+                                }
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "release_conditions"
+                              },
+                              "val": {
+                                "map": [
+                                  {
+                                    "key": {
+                                      "symbol": "conditions"
+                                    },
+                                    "val": {
+                                      "vec": []
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "current_approvals"
+                                    },
+                                    "val": {
+                                      "u32": 0
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "expiration_timestamp"
+                                    },
+                                    "val": {
+                                      "u64": 10000
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "min_approvals"
+                                    },
+                                    "val": {
+                                      "u32": 1
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "operator"
+                                    },
+                                    "val": {
+                                      "vec": [
+                                        {
+                                          "symbol": "And"
+                                        }
+                                      ]
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "oracle_confirmation"
+                                    },
+                                    "val": {
+                                      "bool": false
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "recipient_approval"
+                                    },
+                                    "val": {
+                                      "bool": false
+                                    }
+                                  }
+                                ]
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "release_timestamp"
+                              },
+                              "val": {
+                                "u64": 0
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "released_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 0
+                                }
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "sender"
+                              },
+                              "val": {
+                                "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "status"
+                              },
+                              "val": {
+                                "vec": [
+                                  {
+                                    "symbol": "Funded"
+                                  }
+                                ]
+                              }
+                            }
+                          ]
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
diff --git a/contracts/test_snapshots/payment_escrow/test/test_multi_signature_approval.1.json b/contracts/test_snapshots/payment_escrow/test/test_multi_signature_approval.1.json
index ce89714..2f8791c 100644
--- a/contracts/test_snapshots/payment_escrow/test/test_multi_signature_approval.1.json
+++ b/contracts/test_snapshots/payment_escrow/test/test_multi_signature_approval.1.json
@@ -201,258 +201,6 @@
     "min_temp_entry_ttl": 16,
     "max_entry_ttl": 6312000,
     "ledger_entries": [
-      [
-        {
-          "contract_data": {
-            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM",
-            "key": {
-              "vec": [
-                {
-                  "symbol": "Escrow"
-                },
-                {
-                  "u64": 1
-                }
-              ]
-            },
-            "durability": "persistent"
-          }
-        },
-        [
-          {
-            "last_modified_ledger_seq": 0,
-            "data": {
-              "contract_data": {
-                "ext": "v0",
-                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM",
-                "key": {
-                  "vec": [
-                    {
-                      "symbol": "Escrow"
-                    },
-                    {
-                      "u64": 1
-                    }
-                  ]
-                },
-                "durability": "persistent",
-                "val": {
-                  "map": [
-                    {
-                      "key": {
-                        "symbol": "amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 1000
-                        }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "asset"
-                      },
-                      "val": {
-                        "map": [
-                          {
-                            "key": {
-                              "symbol": "code"
-                            },
-                            "val": {
-                              "string": "USDC"
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "issuer"
-                            },
-                            "val": {
-                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
-                            }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "created_at"
-                      },
-                      "val": {
-                        "u64": 0
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "deposited_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 0
-                        }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "escrow_id"
-                      },
-                      "val": {
-                        "u64": 1
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "flags"
-                      },
-                      "val": {
-                        "u32": 0
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "last_deposit_at"
-                      },
-                      "val": {
-                        "u64": 0
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "memo"
-                      },
-                      "val": {
-                        "string": "Test"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "recipient"
-                      },
-                      "val": {
-                        "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "refund_timestamp"
-                      },
-                      "val": {
-                        "u64": 0
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "refunded_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 0
-                        }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "release_conditions"
-                      },
-                      "val": {
-                        "map": [
-                          {
-                            "key": {
-                              "symbol": "conditions"
-                            },
-                            "val": {
-                              "vec": []
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "current_approvals"
-                            },
-                            "val": {
-                              "u32": 3
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "expiration_timestamp"
-                            },
-                            "val": {
-                              "u64": 2000
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "min_approvals"
-                            },
-                            "val": {
-                              "u32": 3
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "operator"
-                            },
-                            "val": {
-                              "vec": [
-                                {
-                                  "symbol": "And"
-                                }
-                              ]
-                            }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "release_timestamp"
-                      },
-                      "val": {
-                        "u64": 0
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "released_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 0
-                        }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "sender"
-                      },
-                      "val": {
-                        "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "status"
-                      },
-                      "val": {
-                        "vec": [
-                          {
-                            "symbol": "Pending"
-                          }
-                        ]
-                      }
-                    }
-                  ]
-                }
-              }
-            },
-            "ext": "v0"
-          },
-          4095
-        ]
-      ],
       [
         {
           "contract_data": {
@@ -488,6 +236,260 @@
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
                         }
                       },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "Escrow"
+                            },
+                            {
+                              "u64": 1
+                            }
+                          ]
+                        },
+                        "val": {
+                          "map": [
+                            {
+                              "key": {
+                                "symbol": "allow_partial_release"
+                              },
+                              "val": {
+                                "bool": false
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 1000
+                                }
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "asset"
+                              },
+                              "val": {
+                                "map": [
+                                  {
+                                    "key": {
+                                      "symbol": "code"
+                                    },
+                                    "val": {
+                                      "string": "USDC"
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "issuer"
+                                    },
+                                    "val": {
+                                      "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
+                                    }
+                                  }
+                                ]
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "created_at"
+                              },
+                              "val": {
+                                "u64": 0
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "deposited_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 0
+                                }
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "escrow_id"
+                              },
+                              "val": {
+                                "u64": 1
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "kyc_compliant"
+                              },
+                              "val": {
+                                "bool": false
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "last_deposit_at"
+                              },
+                              "val": {
+                                "u64": 0
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "memo"
+                              },
+                              "val": {
+                                "string": "Test"
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "multi_party_enabled"
+                              },
+                              "val": {
+                                "bool": false
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "recipient"
+                              },
+                              "val": {
+                                "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "refund_timestamp"
+                              },
+                              "val": {
+                                "u64": 0
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "refunded_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 0
+                                }
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "release_conditions"
+                              },
+                              "val": {
+                                "map": [
+                                  {
+                                    "key": {
+                                      "symbol": "conditions"
+                                    },
+                                    "val": {
+                                      "vec": []
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "current_approvals"
+                                    },
+                                    "val": {
+                                      "u32": 3
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "expiration_timestamp"
+                                    },
+                                    "val": {
+                                      "u64": 2000
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "min_approvals"
+                                    },
+                                    "val": {
+                                      "u32": 3
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "operator"
+                                    },
+                                    "val": {
+                                      "vec": [
+                                        {
+                                          "symbol": "And"
+                                        }
+                                      ]
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "oracle_confirmation"
+                                    },
+                                    "val": {
+                                      "bool": false
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "recipient_approval"
+                                    },
+                                    "val": {
+                                      "bool": false
+                                    }
+                                  }
+                                ]
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "release_timestamp"
+                              },
+                              "val": {
+                                "u64": 0
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "released_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 0
+                                }
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "sender"
+                              },
+                              "val": {
+                                "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "status"
+                              },
+                              "val": {
+                                "vec": [
+                                  {
+                                    "symbol": "Pending"
+                                  }
+                                ]
+                              }
+                            }
+                          ]
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -1487,6 +1489,14 @@
             ],
             "data": {
               "map": [
+                {
+                  "key": {
+                    "symbol": "allow_partial_release"
+                  },
+                  "val": {
+                    "bool": false
+                  }
+                },
                 {
                   "key": {
                     "symbol": "amount"
@@ -1552,10 +1562,10 @@
                 },
                 {
                   "key": {
-                    "symbol": "flags"
+                    "symbol": "kyc_compliant"
                   },
                   "val": {
-                    "u32": 0
+                    "bool": false
                   }
                 },
                 {
@@ -1574,6 +1584,14 @@
                     "string": "Test"
                   }
                 },
+                {
+                  "key": {
+                    "symbol": "multi_party_enabled"
+                  },
+                  "val": {
+                    "bool": false
+                  }
+                },
                 {
                   "key": {
                     "symbol": "recipient"
@@ -1650,6 +1668,22 @@
                             }
                           ]
                         }
+                      },
+                      {
+                        "key": {
+                          "symbol": "oracle_confirmation"
+                        },
+                        "val": {
+                          "bool": false
+                        }
+                      },
+                      {
+                        "key": {
+                          "symbol": "recipient_approval"
+                        },
+                        "val": {
+                          "bool": false
+                        }
                       }
                     ]
                   }
diff --git a/contracts/test_snapshots/payment_escrow/test/test_partial_refund.1.json b/contracts/test_snapshots/payment_escrow/test/test_partial_refund.1.json
index b888dec..3a0ed38 100644
--- a/contracts/test_snapshots/payment_escrow/test/test_partial_refund.1.json
+++ b/contracts/test_snapshots/payment_escrow/test/test_partial_refund.1.json
@@ -547,258 +547,6 @@
           6311999
         ]
       ],
-      [
-        {
-          "contract_data": {
-            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-            "key": {
-              "vec": [
-                {
-                  "symbol": "Escrow"
-                },
-                {
-                  "u64": 1
-                }
-              ]
-            },
-            "durability": "persistent"
-          }
-        },
-        [
-          {
-            "last_modified_ledger_seq": 0,
-            "data": {
-              "contract_data": {
-                "ext": "v0",
-                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-                "key": {
-                  "vec": [
-                    {
-                      "symbol": "Escrow"
-                    },
-                    {
-                      "u64": 1
-                    }
-                  ]
-                },
-                "durability": "persistent",
-                "val": {
-                  "map": [
-                    {
-                      "key": {
-                        "symbol": "amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 1000
-                        }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "asset"
-                      },
-                      "val": {
-                        "map": [
-                          {
-                            "key": {
-                              "symbol": "code"
-                            },
-                            "val": {
-                              "string": "USDC"
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "issuer"
-                            },
-                            "val": {
-                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
-                            }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "created_at"
-                      },
-                      "val": {
-                        "u64": 1000
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "deposited_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 1000
-                        }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "escrow_id"
-                      },
-                      "val": {
-                        "u64": 1
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "flags"
-                      },
-                      "val": {
-                        "u32": 0
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "last_deposit_at"
-                      },
-                      "val": {
-                        "u64": 1000
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "memo"
-                      },
-                      "val": {
-                        "string": "Test"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "recipient"
-                      },
-                      "val": {
-                        "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "refund_timestamp"
-                      },
-                      "val": {
-                        "u64": 1000
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "refunded_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 1000
-                        }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "release_conditions"
-                      },
-                      "val": {
-                        "map": [
-                          {
-                            "key": {
-                              "symbol": "conditions"
-                            },
-                            "val": {
-                              "vec": []
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "current_approvals"
-                            },
-                            "val": {
-                              "u32": 0
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "expiration_timestamp"
-                            },
-                            "val": {
-                              "u64": 2000
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "min_approvals"
-                            },
-                            "val": {
-                              "u32": 1
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "operator"
-                            },
-                            "val": {
-                              "vec": [
-                                {
-                                  "symbol": "And"
-                                }
-                              ]
-                            }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "release_timestamp"
-                      },
-                      "val": {
-                        "u64": 0
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "released_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 0
-                        }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "sender"
-                      },
-                      "val": {
-                        "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "status"
-                      },
-                      "val": {
-                        "vec": [
-                          {
-                            "symbol": "Refunded"
-                          }
-                        ]
-                      }
-                    }
-                  ]
-                }
-              }
-            },
-            "ext": "v0"
-          },
-          4095
-        ]
-      ],
       [
         {
           "contract_data": {
@@ -834,6 +582,260 @@
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "Escrow"
+                            },
+                            {
+                              "u64": 1
+                            }
+                          ]
+                        },
+                        "val": {
+                          "map": [
+                            {
+                              "key": {
+                                "symbol": "allow_partial_release"
+                              },
+                              "val": {
+                                "bool": false
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 1000
+                                }
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "asset"
+                              },
+                              "val": {
+                                "map": [
+                                  {
+                                    "key": {
+                                      "symbol": "code"
+                                    },
+                                    "val": {
+                                      "string": "USDC"
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "issuer"
+                                    },
+                                    "val": {
+                                      "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
+                                    }
+                                  }
+                                ]
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "created_at"
+                              },
+                              "val": {
+                                "u64": 1000
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "deposited_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 1000
+                                }
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "escrow_id"
+                              },
+                              "val": {
+                                "u64": 1
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "kyc_compliant"
+                              },
+                              "val": {
+                                "bool": false
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "last_deposit_at"
+                              },
+                              "val": {
+                                "u64": 1000
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "memo"
+                              },
+                              "val": {
+                                "string": "Test"
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "multi_party_enabled"
+                              },
+                              "val": {
+                                "bool": false
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "recipient"
+                              },
+                              "val": {
+                                "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "refund_timestamp"
+                              },
+                              "val": {
+                                "u64": 1000
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "refunded_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 1000
+                                }
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "release_conditions"
+                              },
+                              "val": {
+                                "map": [
+                                  {
+                                    "key": {
+                                      "symbol": "conditions"
+                                    },
+                                    "val": {
+                                      "vec": []
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "current_approvals"
+                                    },
+                                    "val": {
+                                      "u32": 0
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "expiration_timestamp"
+                                    },
+                                    "val": {
+                                      "u64": 2000
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "min_approvals"
+                                    },
+                                    "val": {
+                                      "u32": 1
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "operator"
+                                    },
+                                    "val": {
+                                      "vec": [
+                                        {
+                                          "symbol": "And"
+                                        }
+                                      ]
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "oracle_confirmation"
+                                    },
+                                    "val": {
+                                      "bool": false
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "recipient_approval"
+                                    },
+                                    "val": {
+                                      "bool": false
+                                    }
+                                  }
+                                ]
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "release_timestamp"
+                              },
+                              "val": {
+                                "u64": 0
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "released_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 0
+                                }
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "sender"
+                              },
+                              "val": {
+                                "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "status"
+                              },
+                              "val": {
+                                "vec": [
+                                  {
+                                    "symbol": "Refunded"
+                                  }
+                                ]
+                              }
+                            }
+                          ]
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -2263,6 +2265,14 @@
             ],
             "data": {
               "map": [
+                {
+                  "key": {
+                    "symbol": "allow_partial_release"
+                  },
+                  "val": {
+                    "bool": false
+                  }
+                },
                 {
                   "key": {
                     "symbol": "amount"
@@ -2328,10 +2338,10 @@
                 },
                 {
                   "key": {
-                    "symbol": "flags"
+                    "symbol": "kyc_compliant"
                   },
                   "val": {
-                    "u32": 0
+                    "bool": false
                   }
                 },
                 {
@@ -2350,6 +2360,14 @@
                     "string": "Test"
                   }
                 },
+                {
+                  "key": {
+                    "symbol": "multi_party_enabled"
+                  },
+                  "val": {
+                    "bool": false
+                  }
+                },
                 {
                   "key": {
                     "symbol": "recipient"
@@ -2426,6 +2444,22 @@
                             }
                           ]
                         }
+                      },
+                      {
+                        "key": {
+                          "symbol": "oracle_confirmation"
+                        },
+                        "val": {
+                          "bool": false
+                        }
+                      },
+                      {
+                        "key": {
+                          "symbol": "recipient_approval"
+                        },
+                        "val": {
+                          "bool": false
+                        }
                       }
                     ]
                   }
@@ -2778,6 +2812,14 @@
             ],
             "data": {
               "map": [
+                {
+                  "key": {
+                    "symbol": "allow_partial_release"
+                  },
+                  "val": {
+                    "bool": false
+                  }
+                },
                 {
                   "key": {
                     "symbol": "amount"
@@ -2843,10 +2885,10 @@
                 },
                 {
                   "key": {
-                    "symbol": "flags"
+                    "symbol": "kyc_compliant"
                   },
                   "val": {
-                    "u32": 0
+                    "bool": false
                   }
                 },
                 {
@@ -2865,6 +2907,14 @@
                     "string": "Test"
                   }
                 },
+                {
+                  "key": {
+                    "symbol": "multi_party_enabled"
+                  },
+                  "val": {
+                    "bool": false
+                  }
+                },
                 {
                   "key": {
                     "symbol": "recipient"
@@ -2941,6 +2991,22 @@
                             }
                           ]
                         }
+                      },
+                      {
+                        "key": {
+                          "symbol": "oracle_confirmation"
+                        },
+                        "val": {
+                          "bool": false
+                        }
+                      },
+                      {
+                        "key": {
+                          "symbol": "recipient_approval"
+                        },
+                        "val": {
+                          "bool": false
+                        }
                       }
                     ]
                   }
diff --git a/contracts/test_snapshots/payment_escrow/test/test_partial_release.1.json b/contracts/test_snapshots/payment_escrow/test/test_partial_release.1.json
index b90f6f3..7fbcb63 100644
--- a/contracts/test_snapshots/payment_escrow/test/test_partial_release.1.json
+++ b/contracts/test_snapshots/payment_escrow/test/test_partial_release.1.json
@@ -643,258 +643,6 @@
           6311999
         ]
       ],
-      [
-        {
-          "contract_data": {
-            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-            "key": {
-              "vec": [
-                {
-                  "symbol": "Escrow"
-                },
-                {
-                  "u64": 1
-                }
-              ]
-            },
-            "durability": "persistent"
-          }
-        },
-        [
-          {
-            "last_modified_ledger_seq": 0,
-            "data": {
-              "contract_data": {
-                "ext": "v0",
-                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-                "key": {
-                  "vec": [
-                    {
-                      "symbol": "Escrow"
-                    },
-                    {
-                      "u64": 1
-                    }
-                  ]
-                },
-                "durability": "persistent",
-                "val": {
-                  "map": [
-                    {
-                      "key": {
-                        "symbol": "amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 1000
-                        }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "asset"
-                      },
-                      "val": {
-                        "map": [
-                          {
-                            "key": {
-                              "symbol": "code"
-                            },
-                            "val": {
-                              "string": "USDC"
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "issuer"
-                            },
-                            "val": {
-                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
-                            }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "created_at"
-                      },
-                      "val": {
-                        "u64": 1000
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "deposited_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 1000
-                        }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "escrow_id"
-                      },
-                      "val": {
-                        "u64": 1
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "flags"
-                      },
-                      "val": {
-                        "u32": 1
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "last_deposit_at"
-                      },
-                      "val": {
-                        "u64": 1000
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "memo"
-                      },
-                      "val": {
-                        "string": "Test"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "recipient"
-                      },
-                      "val": {
-                        "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "refund_timestamp"
-                      },
-                      "val": {
-                        "u64": 0
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "refunded_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 0
-                        }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "release_conditions"
-                      },
-                      "val": {
-                        "map": [
-                          {
-                            "key": {
-                              "symbol": "conditions"
-                            },
-                            "val": {
-                              "vec": []
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "current_approvals"
-                            },
-                            "val": {
-                              "u32": 0
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "expiration_timestamp"
-                            },
-                            "val": {
-                              "u64": 2000
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "min_approvals"
-                            },
-                            "val": {
-                              "u32": 1
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "operator"
-                            },
-                            "val": {
-                              "vec": [
-                                {
-                                  "symbol": "And"
-                                }
-                              ]
-                            }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "release_timestamp"
-                      },
-                      "val": {
-                        "u64": 1000
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "released_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 1000
-                        }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "sender"
-                      },
-                      "val": {
-                        "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "status"
-                      },
-                      "val": {
-                        "vec": [
-                          {
-                            "symbol": "Released"
-                          }
-                        ]
-                      }
-                    }
-                  ]
-                }
-              }
-            },
-            "ext": "v0"
-          },
-          4095
-        ]
-      ],
       [
         {
           "contract_data": {
@@ -930,6 +678,260 @@
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "Escrow"
+                            },
+                            {
+                              "u64": 1
+                            }
+                          ]
+                        },
+                        "val": {
+                          "map": [
+                            {
+                              "key": {
+                                "symbol": "allow_partial_release"
+                              },
+                              "val": {
+                                "bool": true
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 1000
+                                }
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "asset"
+                              },
+                              "val": {
+                                "map": [
+                                  {
+                                    "key": {
+                                      "symbol": "code"
+                                    },
+                                    "val": {
+                                      "string": "USDC"
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "issuer"
+                                    },
+                                    "val": {
+                                      "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
+                                    }
+                                  }
+                                ]
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "created_at"
+                              },
+                              "val": {
+                                "u64": 1000
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "deposited_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 1000
+                                }
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "escrow_id"
+                              },
+                              "val": {
+                                "u64": 1
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "kyc_compliant"
+                              },
+                              "val": {
+                                "bool": false
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "last_deposit_at"
+                              },
+                              "val": {
+                                "u64": 1000
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "memo"
+                              },
+                              "val": {
+                                "string": "Test"
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "multi_party_enabled"
+                              },
+                              "val": {
+                                "bool": false
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "recipient"
+                              },
+                              "val": {
+                                "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "refund_timestamp"
+                              },
+                              "val": {
+                                "u64": 0
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "refunded_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 0
+                                }
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "release_conditions"
+                              },
+                              "val": {
+                                "map": [
+                                  {
+                                    "key": {
+                                      "symbol": "conditions"
+                                    },
+                                    "val": {
+                                      "vec": []
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "current_approvals"
+                                    },
+                                    "val": {
+                                      "u32": 0
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "expiration_timestamp"
+                                    },
+                                    "val": {
+                                      "u64": 2000
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "min_approvals"
+                                    },
+                                    "val": {
+                                      "u32": 1
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "operator"
+                                    },
+                                    "val": {
+                                      "vec": [
+                                        {
+                                          "symbol": "And"
+                                        }
+                                      ]
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "oracle_confirmation"
+                                    },
+                                    "val": {
+                                      "bool": false
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "recipient_approval"
+                                    },
+                                    "val": {
+                                      "bool": false
+                                    }
+                                  }
+                                ]
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "release_timestamp"
+                              },
+                              "val": {
+                                "u64": 1000
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "released_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 1000
+                                }
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "sender"
+                              },
+                              "val": {
+                                "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "status"
+                              },
+                              "val": {
+                                "vec": [
+                                  {
+                                    "symbol": "Released"
+                                  }
+                                ]
+                              }
+                            }
+                          ]
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -2619,6 +2621,14 @@
             ],
             "data": {
               "map": [
+                {
+                  "key": {
+                    "symbol": "allow_partial_release"
+                  },
+                  "val": {
+                    "bool": true
+                  }
+                },
                 {
                   "key": {
                     "symbol": "amount"
@@ -2684,10 +2694,10 @@
                 },
                 {
                   "key": {
-                    "symbol": "flags"
+                    "symbol": "kyc_compliant"
                   },
                   "val": {
-                    "u32": 1
+                    "bool": false
                   }
                 },
                 {
@@ -2706,6 +2716,14 @@
                     "string": "Test"
                   }
                 },
+                {
+                  "key": {
+                    "symbol": "multi_party_enabled"
+                  },
+                  "val": {
+                    "bool": false
+                  }
+                },
                 {
                   "key": {
                     "symbol": "recipient"
@@ -2782,6 +2800,22 @@
                             }
                           ]
                         }
+                      },
+                      {
+                        "key": {
+                          "symbol": "oracle_confirmation"
+                        },
+                        "val": {
+                          "bool": false
+                        }
+                      },
+                      {
+                        "key": {
+                          "symbol": "recipient_approval"
+                        },
+                        "val": {
+                          "bool": false
+                        }
                       }
                     ]
                   }
@@ -3127,6 +3161,14 @@
             ],
             "data": {
               "map": [
+                {
+                  "key": {
+                    "symbol": "allow_partial_release"
+                  },
+                  "val": {
+                    "bool": true
+                  }
+                },
                 {
                   "key": {
                     "symbol": "amount"
@@ -3192,10 +3234,10 @@
                 },
                 {
                   "key": {
-                    "symbol": "flags"
+                    "symbol": "kyc_compliant"
                   },
                   "val": {
-                    "u32": 1
+                    "bool": false
                   }
                 },
                 {
@@ -3214,6 +3256,14 @@
                     "string": "Test"
                   }
                 },
+                {
+                  "key": {
+                    "symbol": "multi_party_enabled"
+                  },
+                  "val": {
+                    "bool": false
+                  }
+                },
                 {
                   "key": {
                     "symbol": "recipient"
@@ -3290,6 +3340,22 @@
                             }
                           ]
                         }
+                      },
+                      {
+                        "key": {
+                          "symbol": "oracle_confirmation"
+                        },
+                        "val": {
+                          "bool": false
+                        }
+                      },
+                      {
+                        "key": {
+                          "symbol": "recipient_approval"
+                        },
+                        "val": {
+                          "bool": false
+                        }
                       }
                     ]
                   }
diff --git a/contracts/test_snapshots/payment_escrow/test/test_refund_after_expiration.1.json b/contracts/test_snapshots/payment_escrow/test/test_refund_after_expiration.1.json
index cc921bd..6d190ad 100644
--- a/contracts/test_snapshots/payment_escrow/test/test_refund_after_expiration.1.json
+++ b/contracts/test_snapshots/payment_escrow/test/test_refund_after_expiration.1.json
@@ -469,258 +469,6 @@
           6311999
         ]
       ],
-      [
-        {
-          "contract_data": {
-            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-            "key": {
-              "vec": [
-                {
-                  "symbol": "Escrow"
-                },
-                {
-                  "u64": 1
-                }
-              ]
-            },
-            "durability": "persistent"
-          }
-        },
-        [
-          {
-            "last_modified_ledger_seq": 0,
-            "data": {
-              "contract_data": {
-                "ext": "v0",
-                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-                "key": {
-                  "vec": [
-                    {
-                      "symbol": "Escrow"
-                    },
-                    {
-                      "u64": 1
-                    }
-                  ]
-                },
-                "durability": "persistent",
-                "val": {
-                  "map": [
-                    {
-                      "key": {
-                        "symbol": "amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 1000
-                        }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "asset"
-                      },
-                      "val": {
-                        "map": [
-                          {
-                            "key": {
-                              "symbol": "code"
-                            },
-                            "val": {
-                              "string": "USDC"
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "issuer"
-                            },
-                            "val": {
-                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
-                            }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "created_at"
-                      },
-                      "val": {
-                        "u64": 1000
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "deposited_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 1000
-                        }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "escrow_id"
-                      },
-                      "val": {
-                        "u64": 1
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "flags"
-                      },
-                      "val": {
-                        "u32": 0
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "last_deposit_at"
-                      },
-                      "val": {
-                        "u64": 1000
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "memo"
-                      },
-                      "val": {
-                        "string": "Test"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "recipient"
-                      },
-                      "val": {
-                        "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "refund_timestamp"
-                      },
-                      "val": {
-                        "u64": 2500
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "refunded_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 1000
-                        }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "release_conditions"
-                      },
-                      "val": {
-                        "map": [
-                          {
-                            "key": {
-                              "symbol": "conditions"
-                            },
-                            "val": {
-                              "vec": []
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "current_approvals"
-                            },
-                            "val": {
-                              "u32": 0
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "expiration_timestamp"
-                            },
-                            "val": {
-                              "u64": 2000
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "min_approvals"
-                            },
-                            "val": {
-                              "u32": 1
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "operator"
-                            },
-                            "val": {
-                              "vec": [
-                                {
-                                  "symbol": "And"
-                                }
-                              ]
-                            }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "release_timestamp"
-                      },
-                      "val": {
-                        "u64": 0
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "released_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 0
-                        }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "sender"
-                      },
-                      "val": {
-                        "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "status"
-                      },
-                      "val": {
-                        "vec": [
-                          {
-                            "symbol": "Refunded"
-                          }
-                        ]
-                      }
-                    }
-                  ]
-                }
-              }
-            },
-            "ext": "v0"
-          },
-          4095
-        ]
-      ],
       [
         {
           "contract_data": {
@@ -756,6 +504,260 @@
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "Escrow"
+                            },
+                            {
+                              "u64": 1
+                            }
+                          ]
+                        },
+                        "val": {
+                          "map": [
+                            {
+                              "key": {
+                                "symbol": "allow_partial_release"
+                              },
+                              "val": {
+                                "bool": false
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 1000
+                                }
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "asset"
+                              },
+                              "val": {
+                                "map": [
+                                  {
+                                    "key": {
+                                      "symbol": "code"
+                                    },
+                                    "val": {
+                                      "string": "USDC"
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "issuer"
+                                    },
+                                    "val": {
+                                      "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
+                                    }
+                                  }
+                                ]
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "created_at"
+                              },
+                              "val": {
+                                "u64": 1000
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "deposited_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 1000
+                                }
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "escrow_id"
+                              },
+                              "val": {
+                                "u64": 1
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "kyc_compliant"
+                              },
+                              "val": {
+                                "bool": false
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "last_deposit_at"
+                              },
+                              "val": {
+                                "u64": 1000
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "memo"
+                              },
+                              "val": {
+                                "string": "Test"
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "multi_party_enabled"
+                              },
+                              "val": {
+                                "bool": false
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "recipient"
+                              },
+                              "val": {
+                                "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "refund_timestamp"
+                              },
+                              "val": {
+                                "u64": 2500
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "refunded_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 1000
+                                }
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "release_conditions"
+                              },
+                              "val": {
+                                "map": [
+                                  {
+                                    "key": {
+                                      "symbol": "conditions"
+                                    },
+                                    "val": {
+                                      "vec": []
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "current_approvals"
+                                    },
+                                    "val": {
+                                      "u32": 0
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "expiration_timestamp"
+                                    },
+                                    "val": {
+                                      "u64": 2000
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "min_approvals"
+                                    },
+                                    "val": {
+                                      "u32": 1
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "operator"
+                                    },
+                                    "val": {
+                                      "vec": [
+                                        {
+                                          "symbol": "And"
+                                        }
+                                      ]
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "oracle_confirmation"
+                                    },
+                                    "val": {
+                                      "bool": false
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "recipient_approval"
+                                    },
+                                    "val": {
+                                      "bool": false
+                                    }
+                                  }
+                                ]
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "release_timestamp"
+                              },
+                              "val": {
+                                "u64": 0
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "released_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 0
+                                }
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "sender"
+                              },
+                              "val": {
+                                "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "status"
+                              },
+                              "val": {
+                                "vec": [
+                                  {
+                                    "symbol": "Refunded"
+                                  }
+                                ]
+                              }
+                            }
+                          ]
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -2180,6 +2182,14 @@
             ],
             "data": {
               "map": [
+                {
+                  "key": {
+                    "symbol": "allow_partial_release"
+                  },
+                  "val": {
+                    "bool": false
+                  }
+                },
                 {
                   "key": {
                     "symbol": "amount"
@@ -2245,10 +2255,10 @@
                 },
                 {
                   "key": {
-                    "symbol": "flags"
+                    "symbol": "kyc_compliant"
                   },
                   "val": {
-                    "u32": 0
+                    "bool": false
                   }
                 },
                 {
@@ -2267,6 +2277,14 @@
                     "string": "Test"
                   }
                 },
+                {
+                  "key": {
+                    "symbol": "multi_party_enabled"
+                  },
+                  "val": {
+                    "bool": false
+                  }
+                },
                 {
                   "key": {
                     "symbol": "recipient"
@@ -2343,6 +2361,22 @@
                             }
                           ]
                         }
+                      },
+                      {
+                        "key": {
+                          "symbol": "oracle_confirmation"
+                        },
+                        "val": {
+                          "bool": false
+                        }
+                      },
+                      {
+                        "key": {
+                          "symbol": "recipient_approval"
+                        },
+                        "val": {
+                          "bool": false
+                        }
                       }
                     ]
                   }
diff --git a/contracts/test_snapshots/payment_escrow/test/test_refund_already_released.1.json b/contracts/test_snapshots/payment_escrow/test/test_refund_already_released.1.json
index 7633cdf..bf8498b 100644
--- a/contracts/test_snapshots/payment_escrow/test/test_refund_already_released.1.json
+++ b/contracts/test_snapshots/payment_escrow/test/test_refund_already_released.1.json
@@ -515,258 +515,6 @@
           6311999
         ]
       ],
-      [
-        {
-          "contract_data": {
-            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-            "key": {
-              "vec": [
-                {
-                  "symbol": "Escrow"
-                },
-                {
-                  "u64": 1
-                }
-              ]
-            },
-            "durability": "persistent"
-          }
-        },
-        [
-          {
-            "last_modified_ledger_seq": 0,
-            "data": {
-              "contract_data": {
-                "ext": "v0",
-                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-                "key": {
-                  "vec": [
-                    {
-                      "symbol": "Escrow"
-                    },
-                    {
-                      "u64": 1
-                    }
-                  ]
-                },
-                "durability": "persistent",
-                "val": {
-                  "map": [
-                    {
-                      "key": {
-                        "symbol": "amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 1000
-                        }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "asset"
-                      },
-                      "val": {
-                        "map": [
-                          {
-                            "key": {
-                              "symbol": "code"
-                            },
-                            "val": {
-                              "string": "USDC"
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "issuer"
-                            },
-                            "val": {
-                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
-                            }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "created_at"
-                      },
-                      "val": {
-                        "u64": 1000
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "deposited_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 1000
-                        }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "escrow_id"
-                      },
-                      "val": {
-                        "u64": 1
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "flags"
-                      },
-                      "val": {
-                        "u32": 0
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "last_deposit_at"
-                      },
-                      "val": {
-                        "u64": 1000
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "memo"
-                      },
-                      "val": {
-                        "string": "Test"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "recipient"
-                      },
-                      "val": {
-                        "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "refund_timestamp"
-                      },
-                      "val": {
-                        "u64": 0
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "refunded_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 0
-                        }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "release_conditions"
-                      },
-                      "val": {
-                        "map": [
-                          {
-                            "key": {
-                              "symbol": "conditions"
-                            },
-                            "val": {
-                              "vec": []
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "current_approvals"
-                            },
-                            "val": {
-                              "u32": 0
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "expiration_timestamp"
-                            },
-                            "val": {
-                              "u64": 2000
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "min_approvals"
-                            },
-                            "val": {
-                              "u32": 1
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "operator"
-                            },
-                            "val": {
-                              "vec": [
-                                {
-                                  "symbol": "And"
-                                }
-                              ]
-                            }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "release_timestamp"
-                      },
-                      "val": {
-                        "u64": 1000
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "released_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 1000
-                        }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "sender"
-                      },
-                      "val": {
-                        "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "status"
-                      },
-                      "val": {
-                        "vec": [
-                          {
-                            "symbol": "Released"
-                          }
-                        ]
-                      }
-                    }
-                  ]
-                }
-              }
-            },
-            "ext": "v0"
-          },
-          4095
-        ]
-      ],
       [
         {
           "contract_data": {
@@ -802,6 +550,260 @@
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "Escrow"
+                            },
+                            {
+                              "u64": 1
+                            }
+                          ]
+                        },
+                        "val": {
+                          "map": [
+                            {
+                              "key": {
+                                "symbol": "allow_partial_release"
+                              },
+                              "val": {
+                                "bool": false
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 1000
+                                }
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "asset"
+                              },
+                              "val": {
+                                "map": [
+                                  {
+                                    "key": {
+                                      "symbol": "code"
+                                    },
+                                    "val": {
+                                      "string": "USDC"
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "issuer"
+                                    },
+                                    "val": {
+                                      "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
+                                    }
+                                  }
+                                ]
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "created_at"
+                              },
+                              "val": {
+                                "u64": 1000
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "deposited_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 1000
+                                }
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "escrow_id"
+                              },
+                              "val": {
+                                "u64": 1
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "kyc_compliant"
+                              },
+                              "val": {
+                                "bool": false
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "last_deposit_at"
+                              },
+                              "val": {
+                                "u64": 1000
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "memo"
+                              },
+                              "val": {
+                                "string": "Test"
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "multi_party_enabled"
+                              },
+                              "val": {
+                                "bool": false
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "recipient"
+                              },
+                              "val": {
+                                "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "refund_timestamp"
+                              },
+                              "val": {
+                                "u64": 0
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "refunded_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 0
+                                }
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "release_conditions"
+                              },
+                              "val": {
+                                "map": [
+                                  {
+                                    "key": {
+                                      "symbol": "conditions"
+                                    },
+                                    "val": {
+                                      "vec": []
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "current_approvals"
+                                    },
+                                    "val": {
+                                      "u32": 0
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "expiration_timestamp"
+                                    },
+                                    "val": {
+                                      "u64": 2000
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "min_approvals"
+                                    },
+                                    "val": {
+                                      "u32": 1
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "operator"
+                                    },
+                                    "val": {
+                                      "vec": [
+                                        {
+                                          "symbol": "And"
+                                        }
+                                      ]
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "oracle_confirmation"
+                                    },
+                                    "val": {
+                                      "bool": false
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "recipient_approval"
+                                    },
+                                    "val": {
+                                      "bool": false
+                                    }
+                                  }
+                                ]
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "release_timestamp"
+                              },
+                              "val": {
+                                "u64": 1000
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "released_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 1000
+                                }
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "sender"
+                              },
+                              "val": {
+                                "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "status"
+                              },
+                              "val": {
+                                "vec": [
+                                  {
+                                    "symbol": "Released"
+                                  }
+                                ]
+                              }
+                            }
+                          ]
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
diff --git a/contracts/test_snapshots/payment_escrow/test/test_refund_blocked_without_quorum.1.json b/contracts/test_snapshots/payment_escrow/test/test_refund_blocked_without_quorum.1.json
index 56ec10c..68799b6 100644
--- a/contracts/test_snapshots/payment_escrow/test/test_refund_blocked_without_quorum.1.json
+++ b/contracts/test_snapshots/payment_escrow/test/test_refund_blocked_without_quorum.1.json
@@ -532,16 +532,7 @@
         {
           "contract_data": {
             "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-            "key": {
-              "vec": [
-                {
-                  "symbol": "Escrow"
-                },
-                {
-                  "u64": 1
-                }
-              ]
-            },
+            "key": "ledger_key_contract_instance",
             "durability": "persistent"
           }
         },
@@ -552,369 +543,350 @@
               "contract_data": {
                 "ext": "v0",
                 "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-                "key": {
-                  "vec": [
-                    {
-                      "symbol": "Escrow"
-                    },
-                    {
-                      "u64": 1
-                    }
-                  ]
-                },
+                "key": "ledger_key_contract_instance",
                 "durability": "persistent",
                 "val": {
-                  "map": [
-                    {
-                      "key": {
-                        "symbol": "amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 5000
-                        }
-                      }
+                  "contract_instance": {
+                    "executable": {
+                      "wasm": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
                     },
-                    {
-                      "key": {
-                        "symbol": "asset"
-                      },
-                      "val": {
-                        "map": [
-                          {
-                            "key": {
-                              "symbol": "code"
-                            },
-                            "val": {
-                              "string": "USDC"
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "issuer"
-                            },
-                            "val": {
-                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
+                    "storage": [
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "Admin"
                             }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "created_at"
-                      },
-                      "val": {
-                        "u64": 1000
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "deposited_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 5000
-                        }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "escrow_id"
-                      },
-                      "val": {
-                        "u64": 1
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "flags"
-                      },
-                      "val": {
-                        "u32": 2
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "last_deposit_at"
-                      },
-                      "val": {
-                        "u64": 1000
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "memo"
-                      },
-                      "val": {
-                        "string": "Multi-party test"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "recipient"
-                      },
-                      "val": {
-                        "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "refund_timestamp"
-                      },
-                      "val": {
-                        "u64": 0
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "refunded_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 0
+                          ]
+                        },
+                        "val": {
+                          "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "release_conditions"
                       },
-                      "val": {
-                        "map": [
-                          {
-                            "key": {
-                              "symbol": "conditions"
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "Escrow"
                             },
-                            "val": {
-                              "vec": []
+                            {
+                              "u64": 1
                             }
-                          },
-                          {
-                            "key": {
-                              "symbol": "current_approvals"
+                          ]
+                        },
+                        "val": {
+                          "map": [
+                            {
+                              "key": {
+                                "symbol": "allow_partial_release"
+                              },
+                              "val": {
+                                "bool": false
+                              }
                             },
-                            "val": {
-                              "u32": 0
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "expiration_timestamp"
+                            {
+                              "key": {
+                                "symbol": "amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 5000
+                                }
+                              }
                             },
-                            "val": {
-                              "u64": 10000
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "min_approvals"
+                            {
+                              "key": {
+                                "symbol": "asset"
+                              },
+                              "val": {
+                                "map": [
+                                  {
+                                    "key": {
+                                      "symbol": "code"
+                                    },
+                                    "val": {
+                                      "string": "USDC"
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "issuer"
+                                    },
+                                    "val": {
+                                      "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
+                                    }
+                                  }
+                                ]
+                              }
                             },
-                            "val": {
-                              "u32": 1
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "operator"
+                            {
+                              "key": {
+                                "symbol": "created_at"
+                              },
+                              "val": {
+                                "u64": 1000
+                              }
                             },
-                            "val": {
-                              "vec": [
-                                {
-                                  "symbol": "And"
+                            {
+                              "key": {
+                                "symbol": "deposited_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 5000
                                 }
-                              ]
-                            }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "release_timestamp"
-                      },
-                      "val": {
-                        "u64": 0
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "released_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 0
-                        }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "sender"
-                      },
-                      "val": {
-                        "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "status"
-                      },
-                      "val": {
-                        "vec": [
-                          {
-                            "symbol": "Funded"
-                          }
-                        ]
-                      }
-                    }
-                  ]
-                }
-              }
-            },
-            "ext": "v0"
-          },
-          4095
-        ]
-      ],
-      [
-        {
-          "contract_data": {
-            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-            "key": {
-              "vec": [
-                {
-                  "symbol": "EscrowApprovals"
-                },
-                {
-                  "u64": 1
-                }
-              ]
-            },
-            "durability": "persistent"
-          }
-        },
-        [
-          {
-            "last_modified_ledger_seq": 0,
-            "data": {
-              "contract_data": {
-                "ext": "v0",
-                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-                "key": {
-                  "vec": [
-                    {
-                      "symbol": "EscrowApprovals"
-                    },
-                    {
-                      "u64": 1
-                    }
-                  ]
-                },
-                "durability": "persistent",
-                "val": {
-                  "map": [
-                    {
-                      "key": {
-                        "symbol": "approval_timeout"
-                      },
-                      "val": {
-                        "u64": 5000
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "approvals"
-                      },
-                      "val": {
-                        "map": [
-                          {
-                            "key": {
-                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "escrow_id"
+                              },
+                              "val": {
+                                "u64": 1
+                              }
                             },
-                            "val": {
-                              "bool": true
+                            {
+                              "key": {
+                                "symbol": "kyc_compliant"
+                              },
+                              "val": {
+                                "bool": false
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "last_deposit_at"
+                              },
+                              "val": {
+                                "u64": 1000
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "memo"
+                              },
+                              "val": {
+                                "string": "Multi-party test"
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "multi_party_enabled"
+                              },
+                              "val": {
+                                "bool": true
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "recipient"
+                              },
+                              "val": {
+                                "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "refund_timestamp"
+                              },
+                              "val": {
+                                "u64": 0
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "refunded_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 0
+                                }
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "release_conditions"
+                              },
+                              "val": {
+                                "map": [
+                                  {
+                                    "key": {
+                                      "symbol": "conditions"
+                                    },
+                                    "val": {
+                                      "vec": []
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "current_approvals"
+                                    },
+                                    "val": {
+                                      "u32": 0
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "expiration_timestamp"
+                                    },
+                                    "val": {
+                                      "u64": 10000
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "min_approvals"
+                                    },
+                                    "val": {
+                                      "u32": 1
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "operator"
+                                    },
+                                    "val": {
+                                      "vec": [
+                                        {
+                                          "symbol": "And"
+                                        }
+                                      ]
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "oracle_confirmation"
+                                    },
+                                    "val": {
+                                      "bool": false
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "recipient_approval"
+                                    },
+                                    "val": {
+                                      "bool": false
+                                    }
+                                  }
+                                ]
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "release_timestamp"
+                              },
+                              "val": {
+                                "u64": 0
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "released_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 0
+                                }
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "sender"
+                              },
+                              "val": {
+                                "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "status"
+                              },
+                              "val": {
+                                "vec": [
+                                  {
+                                    "symbol": "Funded"
+                                  }
+                                ]
+                              }
                             }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "finalized"
-                      },
-                      "val": {
-                        "bool": false
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "required_approvals"
-                      },
-                      "val": {
-                        "u32": 2
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "whitelisted_approvers"
+                          ]
+                        }
                       },
-                      "val": {
-                        "vec": [
-                          {
-                            "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
-                          },
-                          {
-                            "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
-                          }
-                        ]
-                      }
-                    }
-                  ]
-                }
-              }
-            },
-            "ext": "v0"
-          },
-          4095
-        ]
-      ],
-      [
-        {
-          "contract_data": {
-            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-            "key": "ledger_key_contract_instance",
-            "durability": "persistent"
-          }
-        },
-        [
-          {
-            "last_modified_ledger_seq": 0,
-            "data": {
-              "contract_data": {
-                "ext": "v0",
-                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-                "key": "ledger_key_contract_instance",
-                "durability": "persistent",
-                "val": {
-                  "contract_instance": {
-                    "executable": {
-                      "wasm": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
-                    },
-                    "storage": [
                       {
                         "key": {
                           "vec": [
                             {
-                              "symbol": "Admin"
+                              "symbol": "EscrowApprovals"
+                            },
+                            {
+                              "u64": 1
                             }
                           ]
                         },
                         "val": {
-                          "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
+                          "map": [
+                            {
+                              "key": {
+                                "symbol": "approval_timeout"
+                              },
+                              "val": {
+                                "u64": 5000
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "approvals"
+                              },
+                              "val": {
+                                "map": [
+                                  {
+                                    "key": {
+                                      "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
+                                    },
+                                    "val": {
+                                      "bool": true
+                                    }
+                                  }
+                                ]
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "finalized"
+                              },
+                              "val": {
+                                "bool": false
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "required_approvals"
+                              },
+                              "val": {
+                                "u32": 2
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "whitelisted_approvers"
+                              },
+                              "val": {
+                                "vec": [
+                                  {
+                                    "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
+                                  },
+                                  {
+                                    "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
+                                  }
+                                ]
+                              }
+                            }
+                          ]
                         }
                       },
                       {
diff --git a/contracts/test_snapshots/payment_escrow/test/test_refund_by_admin.1.json b/contracts/test_snapshots/payment_escrow/test/test_refund_by_admin.1.json
index b5194a9..f145ee8 100644
--- a/contracts/test_snapshots/payment_escrow/test/test_refund_by_admin.1.json
+++ b/contracts/test_snapshots/payment_escrow/test/test_refund_by_admin.1.json
@@ -469,258 +469,6 @@
           6311999
         ]
       ],
-      [
-        {
-          "contract_data": {
-            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-            "key": {
-              "vec": [
-                {
-                  "symbol": "Escrow"
-                },
-                {
-                  "u64": 1
-                }
-              ]
-            },
-            "durability": "persistent"
-          }
-        },
-        [
-          {
-            "last_modified_ledger_seq": 0,
-            "data": {
-              "contract_data": {
-                "ext": "v0",
-                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-                "key": {
-                  "vec": [
-                    {
-                      "symbol": "Escrow"
-                    },
-                    {
-                      "u64": 1
-                    }
-                  ]
-                },
-                "durability": "persistent",
-                "val": {
-                  "map": [
-                    {
-                      "key": {
-                        "symbol": "amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 1000
-                        }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "asset"
-                      },
-                      "val": {
-                        "map": [
-                          {
-                            "key": {
-                              "symbol": "code"
-                            },
-                            "val": {
-                              "string": "USDC"
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "issuer"
-                            },
-                            "val": {
-                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
-                            }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "created_at"
-                      },
-                      "val": {
-                        "u64": 1000
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "deposited_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 1000
-                        }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "escrow_id"
-                      },
-                      "val": {
-                        "u64": 1
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "flags"
-                      },
-                      "val": {
-                        "u32": 0
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "last_deposit_at"
-                      },
-                      "val": {
-                        "u64": 1000
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "memo"
-                      },
-                      "val": {
-                        "string": "Test"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "recipient"
-                      },
-                      "val": {
-                        "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "refund_timestamp"
-                      },
-                      "val": {
-                        "u64": 1000
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "refunded_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 1000
-                        }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "release_conditions"
-                      },
-                      "val": {
-                        "map": [
-                          {
-                            "key": {
-                              "symbol": "conditions"
-                            },
-                            "val": {
-                              "vec": []
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "current_approvals"
-                            },
-                            "val": {
-                              "u32": 0
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "expiration_timestamp"
-                            },
-                            "val": {
-                              "u64": 2000
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "min_approvals"
-                            },
-                            "val": {
-                              "u32": 1
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "operator"
-                            },
-                            "val": {
-                              "vec": [
-                                {
-                                  "symbol": "And"
-                                }
-                              ]
-                            }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "release_timestamp"
-                      },
-                      "val": {
-                        "u64": 0
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "released_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 0
-                        }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "sender"
-                      },
-                      "val": {
-                        "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "status"
-                      },
-                      "val": {
-                        "vec": [
-                          {
-                            "symbol": "Refunded"
-                          }
-                        ]
-                      }
-                    }
-                  ]
-                }
-              }
-            },
-            "ext": "v0"
-          },
-          4095
-        ]
-      ],
       [
         {
           "contract_data": {
@@ -756,6 +504,260 @@
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "Escrow"
+                            },
+                            {
+                              "u64": 1
+                            }
+                          ]
+                        },
+                        "val": {
+                          "map": [
+                            {
+                              "key": {
+                                "symbol": "allow_partial_release"
+                              },
+                              "val": {
+                                "bool": false
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 1000
+                                }
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "asset"
+                              },
+                              "val": {
+                                "map": [
+                                  {
+                                    "key": {
+                                      "symbol": "code"
+                                    },
+                                    "val": {
+                                      "string": "USDC"
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "issuer"
+                                    },
+                                    "val": {
+                                      "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
+                                    }
+                                  }
+                                ]
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "created_at"
+                              },
+                              "val": {
+                                "u64": 1000
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "deposited_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 1000
+                                }
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "escrow_id"
+                              },
+                              "val": {
+                                "u64": 1
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "kyc_compliant"
+                              },
+                              "val": {
+                                "bool": false
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "last_deposit_at"
+                              },
+                              "val": {
+                                "u64": 1000
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "memo"
+                              },
+                              "val": {
+                                "string": "Test"
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "multi_party_enabled"
+                              },
+                              "val": {
+                                "bool": false
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "recipient"
+                              },
+                              "val": {
+                                "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "refund_timestamp"
+                              },
+                              "val": {
+                                "u64": 1000
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "refunded_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 1000
+                                }
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "release_conditions"
+                              },
+                              "val": {
+                                "map": [
+                                  {
+                                    "key": {
+                                      "symbol": "conditions"
+                                    },
+                                    "val": {
+                                      "vec": []
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "current_approvals"
+                                    },
+                                    "val": {
+                                      "u32": 0
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "expiration_timestamp"
+                                    },
+                                    "val": {
+                                      "u64": 2000
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "min_approvals"
+                                    },
+                                    "val": {
+                                      "u32": 1
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "operator"
+                                    },
+                                    "val": {
+                                      "vec": [
+                                        {
+                                          "symbol": "And"
+                                        }
+                                      ]
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "oracle_confirmation"
+                                    },
+                                    "val": {
+                                      "bool": false
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "recipient_approval"
+                                    },
+                                    "val": {
+                                      "bool": false
+                                    }
+                                  }
+                                ]
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "release_timestamp"
+                              },
+                              "val": {
+                                "u64": 0
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "released_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 0
+                                }
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "sender"
+                              },
+                              "val": {
+                                "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "status"
+                              },
+                              "val": {
+                                "vec": [
+                                  {
+                                    "symbol": "Refunded"
+                                  }
+                                ]
+                              }
+                            }
+                          ]
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -2180,6 +2182,14 @@
             ],
             "data": {
               "map": [
+                {
+                  "key": {
+                    "symbol": "allow_partial_release"
+                  },
+                  "val": {
+                    "bool": false
+                  }
+                },
                 {
                   "key": {
                     "symbol": "amount"
@@ -2245,10 +2255,10 @@
                 },
                 {
                   "key": {
-                    "symbol": "flags"
+                    "symbol": "kyc_compliant"
                   },
                   "val": {
-                    "u32": 0
+                    "bool": false
                   }
                 },
                 {
@@ -2267,6 +2277,14 @@
                     "string": "Test"
                   }
                 },
+                {
+                  "key": {
+                    "symbol": "multi_party_enabled"
+                  },
+                  "val": {
+                    "bool": false
+                  }
+                },
                 {
                   "key": {
                     "symbol": "recipient"
@@ -2343,6 +2361,22 @@
                             }
                           ]
                         }
+                      },
+                      {
+                        "key": {
+                          "symbol": "oracle_confirmation"
+                        },
+                        "val": {
+                          "bool": false
+                        }
+                      },
+                      {
+                        "key": {
+                          "symbol": "recipient_approval"
+                        },
+                        "val": {
+                          "bool": false
+                        }
                       }
                     ]
                   }
diff --git a/contracts/test_snapshots/payment_escrow/test/test_refund_finalized_after_quorum.1.json b/contracts/test_snapshots/payment_escrow/test/test_refund_finalized_after_quorum.1.json
index 04934f8..bc98830 100644
--- a/contracts/test_snapshots/payment_escrow/test/test_refund_finalized_after_quorum.1.json
+++ b/contracts/test_snapshots/payment_escrow/test/test_refund_finalized_after_quorum.1.json
@@ -652,16 +652,7 @@
         {
           "contract_data": {
             "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-            "key": {
-              "vec": [
-                {
-                  "symbol": "Escrow"
-                },
-                {
-                  "u64": 1
-                }
-              ]
-            },
+            "key": "ledger_key_contract_instance",
             "durability": "persistent"
           }
         },
@@ -672,377 +663,358 @@
               "contract_data": {
                 "ext": "v0",
                 "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-                "key": {
-                  "vec": [
-                    {
-                      "symbol": "Escrow"
-                    },
-                    {
-                      "u64": 1
-                    }
-                  ]
-                },
+                "key": "ledger_key_contract_instance",
                 "durability": "persistent",
                 "val": {
-                  "map": [
-                    {
-                      "key": {
-                        "symbol": "amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 5000
-                        }
-                      }
+                  "contract_instance": {
+                    "executable": {
+                      "wasm": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
                     },
-                    {
-                      "key": {
-                        "symbol": "asset"
-                      },
-                      "val": {
-                        "map": [
-                          {
-                            "key": {
-                              "symbol": "code"
-                            },
-                            "val": {
-                              "string": "USDC"
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "issuer"
-                            },
-                            "val": {
-                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
+                    "storage": [
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "Admin"
                             }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "created_at"
-                      },
-                      "val": {
-                        "u64": 1000
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "deposited_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 5000
-                        }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "escrow_id"
-                      },
-                      "val": {
-                        "u64": 1
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "flags"
-                      },
-                      "val": {
-                        "u32": 2
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "last_deposit_at"
-                      },
-                      "val": {
-                        "u64": 1000
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "memo"
-                      },
-                      "val": {
-                        "string": "Multi-party test"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "recipient"
-                      },
-                      "val": {
-                        "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "refund_timestamp"
-                      },
-                      "val": {
-                        "u64": 1000
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "refunded_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 5000
+                          ]
+                        },
+                        "val": {
+                          "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "release_conditions"
                       },
-                      "val": {
-                        "map": [
-                          {
-                            "key": {
-                              "symbol": "conditions"
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "Escrow"
                             },
-                            "val": {
-                              "vec": []
+                            {
+                              "u64": 1
                             }
-                          },
-                          {
-                            "key": {
-                              "symbol": "current_approvals"
+                          ]
+                        },
+                        "val": {
+                          "map": [
+                            {
+                              "key": {
+                                "symbol": "allow_partial_release"
+                              },
+                              "val": {
+                                "bool": false
+                              }
                             },
-                            "val": {
-                              "u32": 0
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "expiration_timestamp"
+                            {
+                              "key": {
+                                "symbol": "amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 5000
+                                }
+                              }
                             },
-                            "val": {
-                              "u64": 10000
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "min_approvals"
+                            {
+                              "key": {
+                                "symbol": "asset"
+                              },
+                              "val": {
+                                "map": [
+                                  {
+                                    "key": {
+                                      "symbol": "code"
+                                    },
+                                    "val": {
+                                      "string": "USDC"
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "issuer"
+                                    },
+                                    "val": {
+                                      "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
+                                    }
+                                  }
+                                ]
+                              }
                             },
-                            "val": {
-                              "u32": 1
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "operator"
+                            {
+                              "key": {
+                                "symbol": "created_at"
+                              },
+                              "val": {
+                                "u64": 1000
+                              }
                             },
-                            "val": {
-                              "vec": [
-                                {
-                                  "symbol": "And"
+                            {
+                              "key": {
+                                "symbol": "deposited_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 5000
                                 }
-                              ]
-                            }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "release_timestamp"
-                      },
-                      "val": {
-                        "u64": 0
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "released_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 0
-                        }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "sender"
-                      },
-                      "val": {
-                        "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "status"
-                      },
-                      "val": {
-                        "vec": [
-                          {
-                            "symbol": "Refunded"
-                          }
-                        ]
-                      }
-                    }
-                  ]
-                }
-              }
-            },
-            "ext": "v0"
-          },
-          4095
-        ]
-      ],
-      [
-        {
-          "contract_data": {
-            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-            "key": {
-              "vec": [
-                {
-                  "symbol": "EscrowApprovals"
-                },
-                {
-                  "u64": 1
-                }
-              ]
-            },
-            "durability": "persistent"
-          }
-        },
-        [
-          {
-            "last_modified_ledger_seq": 0,
-            "data": {
-              "contract_data": {
-                "ext": "v0",
-                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-                "key": {
-                  "vec": [
-                    {
-                      "symbol": "EscrowApprovals"
-                    },
-                    {
-                      "u64": 1
-                    }
-                  ]
-                },
-                "durability": "persistent",
-                "val": {
-                  "map": [
-                    {
-                      "key": {
-                        "symbol": "approval_timeout"
-                      },
-                      "val": {
-                        "u64": 5000
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "approvals"
-                      },
-                      "val": {
-                        "map": [
-                          {
-                            "key": {
-                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
+                              }
                             },
-                            "val": {
-                              "bool": true
-                            }
-                          },
-                          {
-                            "key": {
-                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
+                            {
+                              "key": {
+                                "symbol": "escrow_id"
+                              },
+                              "val": {
+                                "u64": 1
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "kyc_compliant"
+                              },
+                              "val": {
+                                "bool": false
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "last_deposit_at"
+                              },
+                              "val": {
+                                "u64": 1000
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "memo"
+                              },
+                              "val": {
+                                "string": "Multi-party test"
+                              }
                             },
-                            "val": {
-                              "bool": true
+                            {
+                              "key": {
+                                "symbol": "multi_party_enabled"
+                              },
+                              "val": {
+                                "bool": true
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "recipient"
+                              },
+                              "val": {
+                                "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "refund_timestamp"
+                              },
+                              "val": {
+                                "u64": 1000
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "refunded_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 5000
+                                }
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "release_conditions"
+                              },
+                              "val": {
+                                "map": [
+                                  {
+                                    "key": {
+                                      "symbol": "conditions"
+                                    },
+                                    "val": {
+                                      "vec": []
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "current_approvals"
+                                    },
+                                    "val": {
+                                      "u32": 0
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "expiration_timestamp"
+                                    },
+                                    "val": {
+                                      "u64": 10000
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "min_approvals"
+                                    },
+                                    "val": {
+                                      "u32": 1
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "operator"
+                                    },
+                                    "val": {
+                                      "vec": [
+                                        {
+                                          "symbol": "And"
+                                        }
+                                      ]
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "oracle_confirmation"
+                                    },
+                                    "val": {
+                                      "bool": false
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "recipient_approval"
+                                    },
+                                    "val": {
+                                      "bool": false
+                                    }
+                                  }
+                                ]
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "release_timestamp"
+                              },
+                              "val": {
+                                "u64": 0
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "released_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 0
+                                }
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "sender"
+                              },
+                              "val": {
+                                "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "status"
+                              },
+                              "val": {
+                                "vec": [
+                                  {
+                                    "symbol": "Refunded"
+                                  }
+                                ]
+                              }
                             }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "finalized"
-                      },
-                      "val": {
-                        "bool": true
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "required_approvals"
-                      },
-                      "val": {
-                        "u32": 2
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "whitelisted_approvers"
+                          ]
+                        }
                       },
-                      "val": {
-                        "vec": [
-                          {
-                            "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
-                          },
-                          {
-                            "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
-                          }
-                        ]
-                      }
-                    }
-                  ]
-                }
-              }
-            },
-            "ext": "v0"
-          },
-          4095
-        ]
-      ],
-      [
-        {
-          "contract_data": {
-            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-            "key": "ledger_key_contract_instance",
-            "durability": "persistent"
-          }
-        },
-        [
-          {
-            "last_modified_ledger_seq": 0,
-            "data": {
-              "contract_data": {
-                "ext": "v0",
-                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-                "key": "ledger_key_contract_instance",
-                "durability": "persistent",
-                "val": {
-                  "contract_instance": {
-                    "executable": {
-                      "wasm": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
-                    },
-                    "storage": [
                       {
                         "key": {
                           "vec": [
                             {
-                              "symbol": "Admin"
+                              "symbol": "EscrowApprovals"
+                            },
+                            {
+                              "u64": 1
                             }
                           ]
                         },
                         "val": {
-                          "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
+                          "map": [
+                            {
+                              "key": {
+                                "symbol": "approval_timeout"
+                              },
+                              "val": {
+                                "u64": 5000
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "approvals"
+                              },
+                              "val": {
+                                "map": [
+                                  {
+                                    "key": {
+                                      "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
+                                    },
+                                    "val": {
+                                      "bool": true
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
+                                    },
+                                    "val": {
+                                      "bool": true
+                                    }
+                                  }
+                                ]
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "finalized"
+                              },
+                              "val": {
+                                "bool": true
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "required_approvals"
+                              },
+                              "val": {
+                                "u32": 2
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "whitelisted_approvers"
+                              },
+                              "val": {
+                                "vec": [
+                                  {
+                                    "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
+                                  },
+                                  {
+                                    "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
+                                  }
+                                ]
+                              }
+                            }
+                          ]
                         }
                       },
                       {
diff --git a/contracts/test_snapshots/payment_escrow/test/test_refund_succeeds_with_quorum.1.json b/contracts/test_snapshots/payment_escrow/test/test_refund_succeeds_with_quorum.1.json
index af0da7d..48e4f7f 100644
--- a/contracts/test_snapshots/payment_escrow/test/test_refund_succeeds_with_quorum.1.json
+++ b/contracts/test_snapshots/payment_escrow/test/test_refund_succeeds_with_quorum.1.json
@@ -654,16 +654,7 @@
         {
           "contract_data": {
             "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-            "key": {
-              "vec": [
-                {
-                  "symbol": "Escrow"
-                },
-                {
-                  "u64": 1
-                }
-              ]
-            },
+            "key": "ledger_key_contract_instance",
             "durability": "persistent"
           }
         },
@@ -674,377 +665,358 @@
               "contract_data": {
                 "ext": "v0",
                 "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-                "key": {
-                  "vec": [
-                    {
-                      "symbol": "Escrow"
-                    },
-                    {
-                      "u64": 1
-                    }
-                  ]
-                },
+                "key": "ledger_key_contract_instance",
                 "durability": "persistent",
                 "val": {
-                  "map": [
-                    {
-                      "key": {
-                        "symbol": "amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 5000
-                        }
-                      }
+                  "contract_instance": {
+                    "executable": {
+                      "wasm": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
                     },
-                    {
-                      "key": {
-                        "symbol": "asset"
-                      },
-                      "val": {
-                        "map": [
-                          {
-                            "key": {
-                              "symbol": "code"
-                            },
-                            "val": {
-                              "string": "USDC"
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "issuer"
-                            },
-                            "val": {
-                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
+                    "storage": [
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "Admin"
                             }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "created_at"
-                      },
-                      "val": {
-                        "u64": 1000
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "deposited_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 5000
-                        }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "escrow_id"
-                      },
-                      "val": {
-                        "u64": 1
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "flags"
-                      },
-                      "val": {
-                        "u32": 2
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "last_deposit_at"
-                      },
-                      "val": {
-                        "u64": 1000
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "memo"
-                      },
-                      "val": {
-                        "string": "Multi-party test"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "recipient"
-                      },
-                      "val": {
-                        "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "refund_timestamp"
-                      },
-                      "val": {
-                        "u64": 1000
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "refunded_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 5000
+                          ]
+                        },
+                        "val": {
+                          "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "release_conditions"
                       },
-                      "val": {
-                        "map": [
-                          {
-                            "key": {
-                              "symbol": "conditions"
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "Escrow"
                             },
-                            "val": {
-                              "vec": []
+                            {
+                              "u64": 1
                             }
-                          },
-                          {
-                            "key": {
-                              "symbol": "current_approvals"
+                          ]
+                        },
+                        "val": {
+                          "map": [
+                            {
+                              "key": {
+                                "symbol": "allow_partial_release"
+                              },
+                              "val": {
+                                "bool": false
+                              }
                             },
-                            "val": {
-                              "u32": 0
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "expiration_timestamp"
+                            {
+                              "key": {
+                                "symbol": "amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 5000
+                                }
+                              }
                             },
-                            "val": {
-                              "u64": 10000
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "min_approvals"
+                            {
+                              "key": {
+                                "symbol": "asset"
+                              },
+                              "val": {
+                                "map": [
+                                  {
+                                    "key": {
+                                      "symbol": "code"
+                                    },
+                                    "val": {
+                                      "string": "USDC"
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "issuer"
+                                    },
+                                    "val": {
+                                      "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
+                                    }
+                                  }
+                                ]
+                              }
                             },
-                            "val": {
-                              "u32": 1
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "operator"
+                            {
+                              "key": {
+                                "symbol": "created_at"
+                              },
+                              "val": {
+                                "u64": 1000
+                              }
                             },
-                            "val": {
-                              "vec": [
-                                {
-                                  "symbol": "And"
+                            {
+                              "key": {
+                                "symbol": "deposited_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 5000
                                 }
-                              ]
-                            }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "release_timestamp"
-                      },
-                      "val": {
-                        "u64": 0
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "released_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 0
-                        }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "sender"
-                      },
-                      "val": {
-                        "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "status"
-                      },
-                      "val": {
-                        "vec": [
-                          {
-                            "symbol": "Refunded"
-                          }
-                        ]
-                      }
-                    }
-                  ]
-                }
-              }
-            },
-            "ext": "v0"
-          },
-          4095
-        ]
-      ],
-      [
-        {
-          "contract_data": {
-            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-            "key": {
-              "vec": [
-                {
-                  "symbol": "EscrowApprovals"
-                },
-                {
-                  "u64": 1
-                }
-              ]
-            },
-            "durability": "persistent"
-          }
-        },
-        [
-          {
-            "last_modified_ledger_seq": 0,
-            "data": {
-              "contract_data": {
-                "ext": "v0",
-                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-                "key": {
-                  "vec": [
-                    {
-                      "symbol": "EscrowApprovals"
-                    },
-                    {
-                      "u64": 1
-                    }
-                  ]
-                },
-                "durability": "persistent",
-                "val": {
-                  "map": [
-                    {
-                      "key": {
-                        "symbol": "approval_timeout"
-                      },
-                      "val": {
-                        "u64": 5000
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "approvals"
-                      },
-                      "val": {
-                        "map": [
-                          {
-                            "key": {
-                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
+                              }
                             },
-                            "val": {
-                              "bool": true
-                            }
-                          },
-                          {
-                            "key": {
-                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
+                            {
+                              "key": {
+                                "symbol": "escrow_id"
+                              },
+                              "val": {
+                                "u64": 1
+                              }
                             },
-                            "val": {
-                              "bool": true
+                            {
+                              "key": {
+                                "symbol": "kyc_compliant"
+                              },
+                              "val": {
+                                "bool": false
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "last_deposit_at"
+                              },
+                              "val": {
+                                "u64": 1000
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "memo"
+                              },
+                              "val": {
+                                "string": "Multi-party test"
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "multi_party_enabled"
+                              },
+                              "val": {
+                                "bool": true
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "recipient"
+                              },
+                              "val": {
+                                "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "refund_timestamp"
+                              },
+                              "val": {
+                                "u64": 1000
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "refunded_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 5000
+                                }
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "release_conditions"
+                              },
+                              "val": {
+                                "map": [
+                                  {
+                                    "key": {
+                                      "symbol": "conditions"
+                                    },
+                                    "val": {
+                                      "vec": []
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "current_approvals"
+                                    },
+                                    "val": {
+                                      "u32": 0
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "expiration_timestamp"
+                                    },
+                                    "val": {
+                                      "u64": 10000
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "min_approvals"
+                                    },
+                                    "val": {
+                                      "u32": 1
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "operator"
+                                    },
+                                    "val": {
+                                      "vec": [
+                                        {
+                                          "symbol": "And"
+                                        }
+                                      ]
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "oracle_confirmation"
+                                    },
+                                    "val": {
+                                      "bool": false
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "recipient_approval"
+                                    },
+                                    "val": {
+                                      "bool": false
+                                    }
+                                  }
+                                ]
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "release_timestamp"
+                              },
+                              "val": {
+                                "u64": 0
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "released_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 0
+                                }
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "sender"
+                              },
+                              "val": {
+                                "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "status"
+                              },
+                              "val": {
+                                "vec": [
+                                  {
+                                    "symbol": "Refunded"
+                                  }
+                                ]
+                              }
                             }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "finalized"
-                      },
-                      "val": {
-                        "bool": true
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "required_approvals"
-                      },
-                      "val": {
-                        "u32": 2
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "whitelisted_approvers"
+                          ]
+                        }
                       },
-                      "val": {
-                        "vec": [
-                          {
-                            "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
-                          },
-                          {
-                            "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
-                          }
-                        ]
-                      }
-                    }
-                  ]
-                }
-              }
-            },
-            "ext": "v0"
-          },
-          4095
-        ]
-      ],
-      [
-        {
-          "contract_data": {
-            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-            "key": "ledger_key_contract_instance",
-            "durability": "persistent"
-          }
-        },
-        [
-          {
-            "last_modified_ledger_seq": 0,
-            "data": {
-              "contract_data": {
-                "ext": "v0",
-                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-                "key": "ledger_key_contract_instance",
-                "durability": "persistent",
-                "val": {
-                  "contract_instance": {
-                    "executable": {
-                      "wasm": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
-                    },
-                    "storage": [
                       {
                         "key": {
                           "vec": [
                             {
-                              "symbol": "Admin"
+                              "symbol": "EscrowApprovals"
+                            },
+                            {
+                              "u64": 1
                             }
                           ]
                         },
                         "val": {
-                          "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
+                          "map": [
+                            {
+                              "key": {
+                                "symbol": "approval_timeout"
+                              },
+                              "val": {
+                                "u64": 5000
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "approvals"
+                              },
+                              "val": {
+                                "map": [
+                                  {
+                                    "key": {
+                                      "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
+                                    },
+                                    "val": {
+                                      "bool": true
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
+                                    },
+                                    "val": {
+                                      "bool": true
+                                    }
+                                  }
+                                ]
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "finalized"
+                              },
+                              "val": {
+                                "bool": true
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "required_approvals"
+                              },
+                              "val": {
+                                "u32": 2
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "whitelisted_approvers"
+                              },
+                              "val": {
+                                "vec": [
+                                  {
+                                    "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
+                                  },
+                                  {
+                                    "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
+                                  }
+                                ]
+                              }
+                            }
+                          ]
                         }
                       },
                       {
@@ -2773,6 +2745,14 @@
             ],
             "data": {
               "map": [
+                {
+                  "key": {
+                    "symbol": "allow_partial_release"
+                  },
+                  "val": {
+                    "bool": false
+                  }
+                },
                 {
                   "key": {
                     "symbol": "amount"
@@ -2838,10 +2818,10 @@
                 },
                 {
                   "key": {
-                    "symbol": "flags"
+                    "symbol": "kyc_compliant"
                   },
                   "val": {
-                    "u32": 2
+                    "bool": false
                   }
                 },
                 {
@@ -2860,6 +2840,14 @@
                     "string": "Multi-party test"
                   }
                 },
+                {
+                  "key": {
+                    "symbol": "multi_party_enabled"
+                  },
+                  "val": {
+                    "bool": true
+                  }
+                },
                 {
                   "key": {
                     "symbol": "recipient"
@@ -2936,6 +2924,22 @@
                             }
                           ]
                         }
+                      },
+                      {
+                        "key": {
+                          "symbol": "oracle_confirmation"
+                        },
+                        "val": {
+                          "bool": false
+                        }
+                      },
+                      {
+                        "key": {
+                          "symbol": "recipient_approval"
+                        },
+                        "val": {
+                          "bool": false
+                        }
                       }
                     ]
                   }
diff --git a/contracts/test_snapshots/payment_escrow/test/test_refund_unauthorized.1.json b/contracts/test_snapshots/payment_escrow/test/test_refund_unauthorized.1.json
index 83ccd1c..5a129c2 100644
--- a/contracts/test_snapshots/payment_escrow/test/test_refund_unauthorized.1.json
+++ b/contracts/test_snapshots/payment_escrow/test/test_refund_unauthorized.1.json
@@ -402,258 +402,6 @@
           6311999
         ]
       ],
-      [
-        {
-          "contract_data": {
-            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMDR4",
-            "key": {
-              "vec": [
-                {
-                  "symbol": "Escrow"
-                },
-                {
-                  "u64": 1
-                }
-              ]
-            },
-            "durability": "persistent"
-          }
-        },
-        [
-          {
-            "last_modified_ledger_seq": 0,
-            "data": {
-              "contract_data": {
-                "ext": "v0",
-                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMDR4",
-                "key": {
-                  "vec": [
-                    {
-                      "symbol": "Escrow"
-                    },
-                    {
-                      "u64": 1
-                    }
-                  ]
-                },
-                "durability": "persistent",
-                "val": {
-                  "map": [
-                    {
-                      "key": {
-                        "symbol": "amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 1000
-                        }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "asset"
-                      },
-                      "val": {
-                        "map": [
-                          {
-                            "key": {
-                              "symbol": "code"
-                            },
-                            "val": {
-                              "string": "USDC"
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "issuer"
-                            },
-                            "val": {
-                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
-                            }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "created_at"
-                      },
-                      "val": {
-                        "u64": 1000
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "deposited_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 1000
-                        }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "escrow_id"
-                      },
-                      "val": {
-                        "u64": 1
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "flags"
-                      },
-                      "val": {
-                        "u32": 0
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "last_deposit_at"
-                      },
-                      "val": {
-                        "u64": 1000
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "memo"
-                      },
-                      "val": {
-                        "string": "Test"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "recipient"
-                      },
-                      "val": {
-                        "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "refund_timestamp"
-                      },
-                      "val": {
-                        "u64": 0
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "refunded_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 0
-                        }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "release_conditions"
-                      },
-                      "val": {
-                        "map": [
-                          {
-                            "key": {
-                              "symbol": "conditions"
-                            },
-                            "val": {
-                              "vec": []
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "current_approvals"
-                            },
-                            "val": {
-                              "u32": 0
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "expiration_timestamp"
-                            },
-                            "val": {
-                              "u64": 2000
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "min_approvals"
-                            },
-                            "val": {
-                              "u32": 1
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "operator"
-                            },
-                            "val": {
-                              "vec": [
-                                {
-                                  "symbol": "And"
-                                }
-                              ]
-                            }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "release_timestamp"
-                      },
-                      "val": {
-                        "u64": 0
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "released_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 0
-                        }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "sender"
-                      },
-                      "val": {
-                        "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "status"
-                      },
-                      "val": {
-                        "vec": [
-                          {
-                            "symbol": "Funded"
-                          }
-                        ]
-                      }
-                    }
-                  ]
-                }
-              }
-            },
-            "ext": "v0"
-          },
-          4095
-        ]
-      ],
       [
         {
           "contract_data": {
@@ -689,6 +437,260 @@
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "Escrow"
+                            },
+                            {
+                              "u64": 1
+                            }
+                          ]
+                        },
+                        "val": {
+                          "map": [
+                            {
+                              "key": {
+                                "symbol": "allow_partial_release"
+                              },
+                              "val": {
+                                "bool": false
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 1000
+                                }
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "asset"
+                              },
+                              "val": {
+                                "map": [
+                                  {
+                                    "key": {
+                                      "symbol": "code"
+                                    },
+                                    "val": {
+                                      "string": "USDC"
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "issuer"
+                                    },
+                                    "val": {
+                                      "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
+                                    }
+                                  }
+                                ]
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "created_at"
+                              },
+                              "val": {
+                                "u64": 1000
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "deposited_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 1000
+                                }
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "escrow_id"
+                              },
+                              "val": {
+                                "u64": 1
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "kyc_compliant"
+                              },
+                              "val": {
+                                "bool": false
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "last_deposit_at"
+                              },
+                              "val": {
+                                "u64": 1000
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "memo"
+                              },
+                              "val": {
+                                "string": "Test"
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "multi_party_enabled"
+                              },
+                              "val": {
+                                "bool": false
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "recipient"
+                              },
+                              "val": {
+                                "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "refund_timestamp"
+                              },
+                              "val": {
+                                "u64": 0
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "refunded_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 0
+                                }
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "release_conditions"
+                              },
+                              "val": {
+                                "map": [
+                                  {
+                                    "key": {
+                                      "symbol": "conditions"
+                                    },
+                                    "val": {
+                                      "vec": []
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "current_approvals"
+                                    },
+                                    "val": {
+                                      "u32": 0
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "expiration_timestamp"
+                                    },
+                                    "val": {
+                                      "u64": 2000
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "min_approvals"
+                                    },
+                                    "val": {
+                                      "u32": 1
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "operator"
+                                    },
+                                    "val": {
+                                      "vec": [
+                                        {
+                                          "symbol": "And"
+                                        }
+                                      ]
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "oracle_confirmation"
+                                    },
+                                    "val": {
+                                      "bool": false
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "recipient_approval"
+                                    },
+                                    "val": {
+                                      "bool": false
+                                    }
+                                  }
+                                ]
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "release_timestamp"
+                              },
+                              "val": {
+                                "u64": 0
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "released_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 0
+                                }
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "sender"
+                              },
+                              "val": {
+                                "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "status"
+                              },
+                              "val": {
+                                "vec": [
+                                  {
+                                    "symbol": "Funded"
+                                  }
+                                ]
+                              }
+                            }
+                          ]
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
diff --git a/contracts/test_snapshots/payment_escrow/test/test_refund_with_processing_fee.1.json b/contracts/test_snapshots/payment_escrow/test/test_refund_with_processing_fee.1.json
index e9d8166..9860e73 100644
--- a/contracts/test_snapshots/payment_escrow/test/test_refund_with_processing_fee.1.json
+++ b/contracts/test_snapshots/payment_escrow/test/test_refund_with_processing_fee.1.json
@@ -529,258 +529,6 @@
           6311999
         ]
       ],
-      [
-        {
-          "contract_data": {
-            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-            "key": {
-              "vec": [
-                {
-                  "symbol": "Escrow"
-                },
-                {
-                  "u64": 1
-                }
-              ]
-            },
-            "durability": "persistent"
-          }
-        },
-        [
-          {
-            "last_modified_ledger_seq": 0,
-            "data": {
-              "contract_data": {
-                "ext": "v0",
-                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-                "key": {
-                  "vec": [
-                    {
-                      "symbol": "Escrow"
-                    },
-                    {
-                      "u64": 1
-                    }
-                  ]
-                },
-                "durability": "persistent",
-                "val": {
-                  "map": [
-                    {
-                      "key": {
-                        "symbol": "amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 1000
-                        }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "asset"
-                      },
-                      "val": {
-                        "map": [
-                          {
-                            "key": {
-                              "symbol": "code"
-                            },
-                            "val": {
-                              "string": "USDC"
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "issuer"
-                            },
-                            "val": {
-                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
-                            }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "created_at"
-                      },
-                      "val": {
-                        "u64": 1000
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "deposited_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 1000
-                        }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "escrow_id"
-                      },
-                      "val": {
-                        "u64": 1
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "flags"
-                      },
-                      "val": {
-                        "u32": 0
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "last_deposit_at"
-                      },
-                      "val": {
-                        "u64": 1000
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "memo"
-                      },
-                      "val": {
-                        "string": "Test"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "recipient"
-                      },
-                      "val": {
-                        "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "refund_timestamp"
-                      },
-                      "val": {
-                        "u64": 2500
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "refunded_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 1000
-                        }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "release_conditions"
-                      },
-                      "val": {
-                        "map": [
-                          {
-                            "key": {
-                              "symbol": "conditions"
-                            },
-                            "val": {
-                              "vec": []
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "current_approvals"
-                            },
-                            "val": {
-                              "u32": 0
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "expiration_timestamp"
-                            },
-                            "val": {
-                              "u64": 2000
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "min_approvals"
-                            },
-                            "val": {
-                              "u32": 1
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "operator"
-                            },
-                            "val": {
-                              "vec": [
-                                {
-                                  "symbol": "And"
-                                }
-                              ]
-                            }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "release_timestamp"
-                      },
-                      "val": {
-                        "u64": 0
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "released_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 0
-                        }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "sender"
-                      },
-                      "val": {
-                        "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "status"
-                      },
-                      "val": {
-                        "vec": [
-                          {
-                            "symbol": "Refunded"
-                          }
-                        ]
-                      }
-                    }
-                  ]
-                }
-              }
-            },
-            "ext": "v0"
-          },
-          4095
-        ]
-      ],
       [
         {
           "contract_data": {
@@ -816,6 +564,260 @@
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "Escrow"
+                            },
+                            {
+                              "u64": 1
+                            }
+                          ]
+                        },
+                        "val": {
+                          "map": [
+                            {
+                              "key": {
+                                "symbol": "allow_partial_release"
+                              },
+                              "val": {
+                                "bool": false
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 1000
+                                }
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "asset"
+                              },
+                              "val": {
+                                "map": [
+                                  {
+                                    "key": {
+                                      "symbol": "code"
+                                    },
+                                    "val": {
+                                      "string": "USDC"
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "issuer"
+                                    },
+                                    "val": {
+                                      "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
+                                    }
+                                  }
+                                ]
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "created_at"
+                              },
+                              "val": {
+                                "u64": 1000
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "deposited_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 1000
+                                }
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "escrow_id"
+                              },
+                              "val": {
+                                "u64": 1
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "kyc_compliant"
+                              },
+                              "val": {
+                                "bool": false
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "last_deposit_at"
+                              },
+                              "val": {
+                                "u64": 1000
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "memo"
+                              },
+                              "val": {
+                                "string": "Test"
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "multi_party_enabled"
+                              },
+                              "val": {
+                                "bool": false
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "recipient"
+                              },
+                              "val": {
+                                "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "refund_timestamp"
+                              },
+                              "val": {
+                                "u64": 2500
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "refunded_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 1000
+                                }
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "release_conditions"
+                              },
+                              "val": {
+                                "map": [
+                                  {
+                                    "key": {
+                                      "symbol": "conditions"
+                                    },
+                                    "val": {
+                                      "vec": []
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "current_approvals"
+                                    },
+                                    "val": {
+                                      "u32": 0
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "expiration_timestamp"
+                                    },
+                                    "val": {
+                                      "u64": 2000
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "min_approvals"
+                                    },
+                                    "val": {
+                                      "u32": 1
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "operator"
+                                    },
+                                    "val": {
+                                      "vec": [
+                                        {
+                                          "symbol": "And"
+                                        }
+                                      ]
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "oracle_confirmation"
+                                    },
+                                    "val": {
+                                      "bool": false
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "recipient_approval"
+                                    },
+                                    "val": {
+                                      "bool": false
+                                    }
+                                  }
+                                ]
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "release_timestamp"
+                              },
+                              "val": {
+                                "u64": 0
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "released_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 0
+                                }
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "sender"
+                              },
+                              "val": {
+                                "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "status"
+                              },
+                              "val": {
+                                "vec": [
+                                  {
+                                    "symbol": "Refunded"
+                                  }
+                                ]
+                              }
+                            }
+                          ]
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -2537,6 +2539,14 @@
             ],
             "data": {
               "map": [
+                {
+                  "key": {
+                    "symbol": "allow_partial_release"
+                  },
+                  "val": {
+                    "bool": false
+                  }
+                },
                 {
                   "key": {
                     "symbol": "amount"
@@ -2602,10 +2612,10 @@
                 },
                 {
                   "key": {
-                    "symbol": "flags"
+                    "symbol": "kyc_compliant"
                   },
                   "val": {
-                    "u32": 0
+                    "bool": false
                   }
                 },
                 {
@@ -2624,6 +2634,14 @@
                     "string": "Test"
                   }
                 },
+                {
+                  "key": {
+                    "symbol": "multi_party_enabled"
+                  },
+                  "val": {
+                    "bool": false
+                  }
+                },
                 {
                   "key": {
                     "symbol": "recipient"
@@ -2700,6 +2718,22 @@
                             }
                           ]
                         }
+                      },
+                      {
+                        "key": {
+                          "symbol": "oracle_confirmation"
+                        },
+                        "val": {
+                          "bool": false
+                        }
+                      },
+                      {
+                        "key": {
+                          "symbol": "recipient_approval"
+                        },
+                        "val": {
+                          "bool": false
+                        }
                       }
                     ]
                   }
diff --git a/contracts/test_snapshots/payment_escrow/test/test_release_blocked_without_quorum.1.json b/contracts/test_snapshots/payment_escrow/test/test_release_blocked_without_quorum.1.json
index 545cea5..d665a7a 100644
--- a/contracts/test_snapshots/payment_escrow/test/test_release_blocked_without_quorum.1.json
+++ b/contracts/test_snapshots/payment_escrow/test/test_release_blocked_without_quorum.1.json
@@ -590,16 +590,7 @@
         {
           "contract_data": {
             "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-            "key": {
-              "vec": [
-                {
-                  "symbol": "Escrow"
-                },
-                {
-                  "u64": 1
-                }
-              ]
-            },
+            "key": "ledger_key_contract_instance",
             "durability": "persistent"
           }
         },
@@ -610,372 +601,353 @@
               "contract_data": {
                 "ext": "v0",
                 "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-                "key": {
-                  "vec": [
-                    {
-                      "symbol": "Escrow"
-                    },
-                    {
-                      "u64": 1
-                    }
-                  ]
-                },
+                "key": "ledger_key_contract_instance",
                 "durability": "persistent",
                 "val": {
-                  "map": [
-                    {
-                      "key": {
-                        "symbol": "amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 5000
-                        }
-                      }
+                  "contract_instance": {
+                    "executable": {
+                      "wasm": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
                     },
-                    {
-                      "key": {
-                        "symbol": "asset"
-                      },
-                      "val": {
-                        "map": [
-                          {
-                            "key": {
-                              "symbol": "code"
-                            },
-                            "val": {
-                              "string": "USDC"
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "issuer"
-                            },
-                            "val": {
-                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
+                    "storage": [
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "Admin"
                             }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "created_at"
-                      },
-                      "val": {
-                        "u64": 1000
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "deposited_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 5000
-                        }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "escrow_id"
-                      },
-                      "val": {
-                        "u64": 1
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "flags"
-                      },
-                      "val": {
-                        "u32": 2
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "last_deposit_at"
-                      },
-                      "val": {
-                        "u64": 1000
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "memo"
-                      },
-                      "val": {
-                        "string": "Multi-party test"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "recipient"
-                      },
-                      "val": {
-                        "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "refund_timestamp"
-                      },
-                      "val": {
-                        "u64": 0
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "refunded_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 0
+                          ]
+                        },
+                        "val": {
+                          "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "release_conditions"
                       },
-                      "val": {
-                        "map": [
-                          {
-                            "key": {
-                              "symbol": "conditions"
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "Escrow"
                             },
-                            "val": {
-                              "vec": []
+                            {
+                              "u64": 1
                             }
-                          },
-                          {
-                            "key": {
-                              "symbol": "current_approvals"
+                          ]
+                        },
+                        "val": {
+                          "map": [
+                            {
+                              "key": {
+                                "symbol": "allow_partial_release"
+                              },
+                              "val": {
+                                "bool": false
+                              }
                             },
-                            "val": {
-                              "u32": 0
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "expiration_timestamp"
+                            {
+                              "key": {
+                                "symbol": "amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 5000
+                                }
+                              }
                             },
-                            "val": {
-                              "u64": 10000
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "min_approvals"
+                            {
+                              "key": {
+                                "symbol": "asset"
+                              },
+                              "val": {
+                                "map": [
+                                  {
+                                    "key": {
+                                      "symbol": "code"
+                                    },
+                                    "val": {
+                                      "string": "USDC"
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "issuer"
+                                    },
+                                    "val": {
+                                      "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
+                                    }
+                                  }
+                                ]
+                              }
                             },
-                            "val": {
-                              "u32": 1
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "operator"
+                            {
+                              "key": {
+                                "symbol": "created_at"
+                              },
+                              "val": {
+                                "u64": 1000
+                              }
                             },
-                            "val": {
-                              "vec": [
-                                {
-                                  "symbol": "And"
+                            {
+                              "key": {
+                                "symbol": "deposited_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 5000
                                 }
-                              ]
-                            }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "release_timestamp"
-                      },
-                      "val": {
-                        "u64": 0
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "released_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 0
-                        }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "sender"
-                      },
-                      "val": {
-                        "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "status"
-                      },
-                      "val": {
-                        "vec": [
-                          {
-                            "symbol": "Approved"
-                          }
-                        ]
-                      }
-                    }
-                  ]
-                }
-              }
-            },
-            "ext": "v0"
-          },
-          4095
-        ]
-      ],
-      [
-        {
-          "contract_data": {
-            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-            "key": {
-              "vec": [
-                {
-                  "symbol": "EscrowApprovals"
-                },
-                {
-                  "u64": 1
-                }
-              ]
-            },
-            "durability": "persistent"
-          }
-        },
-        [
-          {
-            "last_modified_ledger_seq": 0,
-            "data": {
-              "contract_data": {
-                "ext": "v0",
-                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-                "key": {
-                  "vec": [
-                    {
-                      "symbol": "EscrowApprovals"
-                    },
-                    {
-                      "u64": 1
-                    }
-                  ]
-                },
-                "durability": "persistent",
-                "val": {
-                  "map": [
-                    {
-                      "key": {
-                        "symbol": "approval_timeout"
-                      },
-                      "val": {
-                        "u64": 5000
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "approvals"
-                      },
-                      "val": {
-                        "map": [
-                          {
-                            "key": {
-                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "escrow_id"
+                              },
+                              "val": {
+                                "u64": 1
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "kyc_compliant"
+                              },
+                              "val": {
+                                "bool": false
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "last_deposit_at"
+                              },
+                              "val": {
+                                "u64": 1000
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "memo"
+                              },
+                              "val": {
+                                "string": "Multi-party test"
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "multi_party_enabled"
+                              },
+                              "val": {
+                                "bool": true
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "recipient"
+                              },
+                              "val": {
+                                "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "refund_timestamp"
+                              },
+                              "val": {
+                                "u64": 0
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "refunded_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 0
+                                }
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "release_conditions"
+                              },
+                              "val": {
+                                "map": [
+                                  {
+                                    "key": {
+                                      "symbol": "conditions"
+                                    },
+                                    "val": {
+                                      "vec": []
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "current_approvals"
+                                    },
+                                    "val": {
+                                      "u32": 0
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "expiration_timestamp"
+                                    },
+                                    "val": {
+                                      "u64": 10000
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "min_approvals"
+                                    },
+                                    "val": {
+                                      "u32": 1
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "operator"
+                                    },
+                                    "val": {
+                                      "vec": [
+                                        {
+                                          "symbol": "And"
+                                        }
+                                      ]
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "oracle_confirmation"
+                                    },
+                                    "val": {
+                                      "bool": false
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "recipient_approval"
+                                    },
+                                    "val": {
+                                      "bool": false
+                                    }
+                                  }
+                                ]
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "release_timestamp"
+                              },
+                              "val": {
+                                "u64": 0
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "released_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 0
+                                }
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "sender"
+                              },
+                              "val": {
+                                "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
+                              }
                             },
-                            "val": {
-                              "bool": true
+                            {
+                              "key": {
+                                "symbol": "status"
+                              },
+                              "val": {
+                                "vec": [
+                                  {
+                                    "symbol": "Approved"
+                                  }
+                                ]
+                              }
                             }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "finalized"
-                      },
-                      "val": {
-                        "bool": false
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "required_approvals"
-                      },
-                      "val": {
-                        "u32": 2
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "whitelisted_approvers"
+                          ]
+                        }
                       },
-                      "val": {
-                        "vec": [
-                          {
-                            "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
-                          },
-                          {
-                            "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
-                          },
-                          {
-                            "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
-                          }
-                        ]
-                      }
-                    }
-                  ]
-                }
-              }
-            },
-            "ext": "v0"
-          },
-          4095
-        ]
-      ],
-      [
-        {
-          "contract_data": {
-            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-            "key": "ledger_key_contract_instance",
-            "durability": "persistent"
-          }
-        },
-        [
-          {
-            "last_modified_ledger_seq": 0,
-            "data": {
-              "contract_data": {
-                "ext": "v0",
-                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-                "key": "ledger_key_contract_instance",
-                "durability": "persistent",
-                "val": {
-                  "contract_instance": {
-                    "executable": {
-                      "wasm": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
-                    },
-                    "storage": [
                       {
                         "key": {
                           "vec": [
                             {
-                              "symbol": "Admin"
+                              "symbol": "EscrowApprovals"
+                            },
+                            {
+                              "u64": 1
                             }
                           ]
                         },
                         "val": {
-                          "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
+                          "map": [
+                            {
+                              "key": {
+                                "symbol": "approval_timeout"
+                              },
+                              "val": {
+                                "u64": 5000
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "approvals"
+                              },
+                              "val": {
+                                "map": [
+                                  {
+                                    "key": {
+                                      "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
+                                    },
+                                    "val": {
+                                      "bool": true
+                                    }
+                                  }
+                                ]
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "finalized"
+                              },
+                              "val": {
+                                "bool": false
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "required_approvals"
+                              },
+                              "val": {
+                                "u32": 2
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "whitelisted_approvers"
+                              },
+                              "val": {
+                                "vec": [
+                                  {
+                                    "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
+                                  },
+                                  {
+                                    "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
+                                  },
+                                  {
+                                    "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
+                                  }
+                                ]
+                              }
+                            }
+                          ]
                         }
                       },
                       {
diff --git a/contracts/test_snapshots/payment_escrow/test/test_release_revoke_breaks_quorum.1.json b/contracts/test_snapshots/payment_escrow/test/test_release_revoke_breaks_quorum.1.json
index 93d60db..32ce0fe 100644
--- a/contracts/test_snapshots/payment_escrow/test/test_release_revoke_breaks_quorum.1.json
+++ b/contracts/test_snapshots/payment_escrow/test/test_release_revoke_breaks_quorum.1.json
@@ -811,16 +811,7 @@
         {
           "contract_data": {
             "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-            "key": {
-              "vec": [
-                {
-                  "symbol": "Escrow"
-                },
-                {
-                  "u64": 1
-                }
-              ]
-            },
+            "key": "ledger_key_contract_instance",
             "durability": "persistent"
           }
         },
@@ -831,377 +822,358 @@
               "contract_data": {
                 "ext": "v0",
                 "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-                "key": {
-                  "vec": [
-                    {
-                      "symbol": "Escrow"
-                    },
-                    {
-                      "u64": 1
-                    }
-                  ]
-                },
+                "key": "ledger_key_contract_instance",
                 "durability": "persistent",
                 "val": {
-                  "map": [
-                    {
-                      "key": {
-                        "symbol": "amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 5000
-                        }
-                      }
+                  "contract_instance": {
+                    "executable": {
+                      "wasm": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
                     },
-                    {
-                      "key": {
-                        "symbol": "asset"
-                      },
-                      "val": {
-                        "map": [
-                          {
-                            "key": {
-                              "symbol": "code"
-                            },
-                            "val": {
-                              "string": "USDC"
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "issuer"
-                            },
-                            "val": {
-                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
+                    "storage": [
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "Admin"
                             }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "created_at"
-                      },
-                      "val": {
-                        "u64": 1000
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "deposited_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 5000
-                        }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "escrow_id"
-                      },
-                      "val": {
-                        "u64": 1
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "flags"
-                      },
-                      "val": {
-                        "u32": 2
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "last_deposit_at"
-                      },
-                      "val": {
-                        "u64": 1000
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "memo"
-                      },
-                      "val": {
-                        "string": "Multi-party test"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "recipient"
-                      },
-                      "val": {
-                        "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "refund_timestamp"
-                      },
-                      "val": {
-                        "u64": 0
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "refunded_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 0
+                          ]
+                        },
+                        "val": {
+                          "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "release_conditions"
                       },
-                      "val": {
-                        "map": [
-                          {
-                            "key": {
-                              "symbol": "conditions"
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "Escrow"
                             },
-                            "val": {
-                              "vec": []
+                            {
+                              "u64": 1
                             }
-                          },
-                          {
-                            "key": {
-                              "symbol": "current_approvals"
+                          ]
+                        },
+                        "val": {
+                          "map": [
+                            {
+                              "key": {
+                                "symbol": "allow_partial_release"
+                              },
+                              "val": {
+                                "bool": false
+                              }
                             },
-                            "val": {
-                              "u32": 0
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "expiration_timestamp"
+                            {
+                              "key": {
+                                "symbol": "amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 5000
+                                }
+                              }
                             },
-                            "val": {
-                              "u64": 10000
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "min_approvals"
+                            {
+                              "key": {
+                                "symbol": "asset"
+                              },
+                              "val": {
+                                "map": [
+                                  {
+                                    "key": {
+                                      "symbol": "code"
+                                    },
+                                    "val": {
+                                      "string": "USDC"
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "issuer"
+                                    },
+                                    "val": {
+                                      "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
+                                    }
+                                  }
+                                ]
+                              }
                             },
-                            "val": {
-                              "u32": 1
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "operator"
+                            {
+                              "key": {
+                                "symbol": "created_at"
+                              },
+                              "val": {
+                                "u64": 1000
+                              }
                             },
-                            "val": {
-                              "vec": [
-                                {
-                                  "symbol": "And"
+                            {
+                              "key": {
+                                "symbol": "deposited_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 5000
                                 }
-                              ]
-                            }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "release_timestamp"
-                      },
-                      "val": {
-                        "u64": 1000
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "released_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 5000
-                        }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "sender"
-                      },
-                      "val": {
-                        "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "status"
-                      },
-                      "val": {
-                        "vec": [
-                          {
-                            "symbol": "Released"
-                          }
-                        ]
-                      }
-                    }
-                  ]
-                }
-              }
-            },
-            "ext": "v0"
-          },
-          4095
-        ]
-      ],
-      [
-        {
-          "contract_data": {
-            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-            "key": {
-              "vec": [
-                {
-                  "symbol": "EscrowApprovals"
-                },
-                {
-                  "u64": 1
-                }
-              ]
-            },
-            "durability": "persistent"
-          }
-        },
-        [
-          {
-            "last_modified_ledger_seq": 0,
-            "data": {
-              "contract_data": {
-                "ext": "v0",
-                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-                "key": {
-                  "vec": [
-                    {
-                      "symbol": "EscrowApprovals"
-                    },
-                    {
-                      "u64": 1
-                    }
-                  ]
-                },
-                "durability": "persistent",
-                "val": {
-                  "map": [
-                    {
-                      "key": {
-                        "symbol": "approval_timeout"
-                      },
-                      "val": {
-                        "u64": 5000
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "approvals"
-                      },
-                      "val": {
-                        "map": [
-                          {
-                            "key": {
-                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
+                              }
                             },
-                            "val": {
-                              "bool": true
-                            }
-                          },
-                          {
-                            "key": {
-                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
+                            {
+                              "key": {
+                                "symbol": "escrow_id"
+                              },
+                              "val": {
+                                "u64": 1
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "kyc_compliant"
+                              },
+                              "val": {
+                                "bool": false
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "last_deposit_at"
+                              },
+                              "val": {
+                                "u64": 1000
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "memo"
+                              },
+                              "val": {
+                                "string": "Multi-party test"
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "multi_party_enabled"
+                              },
+                              "val": {
+                                "bool": true
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "recipient"
+                              },
+                              "val": {
+                                "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "refund_timestamp"
+                              },
+                              "val": {
+                                "u64": 0
+                              }
                             },
-                            "val": {
-                              "bool": true
+                            {
+                              "key": {
+                                "symbol": "refunded_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 0
+                                }
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "release_conditions"
+                              },
+                              "val": {
+                                "map": [
+                                  {
+                                    "key": {
+                                      "symbol": "conditions"
+                                    },
+                                    "val": {
+                                      "vec": []
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "current_approvals"
+                                    },
+                                    "val": {
+                                      "u32": 0
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "expiration_timestamp"
+                                    },
+                                    "val": {
+                                      "u64": 10000
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "min_approvals"
+                                    },
+                                    "val": {
+                                      "u32": 1
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "operator"
+                                    },
+                                    "val": {
+                                      "vec": [
+                                        {
+                                          "symbol": "And"
+                                        }
+                                      ]
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "oracle_confirmation"
+                                    },
+                                    "val": {
+                                      "bool": false
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "recipient_approval"
+                                    },
+                                    "val": {
+                                      "bool": false
+                                    }
+                                  }
+                                ]
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "release_timestamp"
+                              },
+                              "val": {
+                                "u64": 1000
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "released_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 5000
+                                }
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "sender"
+                              },
+                              "val": {
+                                "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "status"
+                              },
+                              "val": {
+                                "vec": [
+                                  {
+                                    "symbol": "Released"
+                                  }
+                                ]
+                              }
                             }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "finalized"
-                      },
-                      "val": {
-                        "bool": true
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "required_approvals"
-                      },
-                      "val": {
-                        "u32": 2
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "whitelisted_approvers"
+                          ]
+                        }
                       },
-                      "val": {
-                        "vec": [
-                          {
-                            "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
-                          },
-                          {
-                            "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
-                          }
-                        ]
-                      }
-                    }
-                  ]
-                }
-              }
-            },
-            "ext": "v0"
-          },
-          4095
-        ]
-      ],
-      [
-        {
-          "contract_data": {
-            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-            "key": "ledger_key_contract_instance",
-            "durability": "persistent"
-          }
-        },
-        [
-          {
-            "last_modified_ledger_seq": 0,
-            "data": {
-              "contract_data": {
-                "ext": "v0",
-                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-                "key": "ledger_key_contract_instance",
-                "durability": "persistent",
-                "val": {
-                  "contract_instance": {
-                    "executable": {
-                      "wasm": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
-                    },
-                    "storage": [
                       {
                         "key": {
                           "vec": [
                             {
-                              "symbol": "Admin"
+                              "symbol": "EscrowApprovals"
+                            },
+                            {
+                              "u64": 1
                             }
                           ]
                         },
                         "val": {
-                          "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
+                          "map": [
+                            {
+                              "key": {
+                                "symbol": "approval_timeout"
+                              },
+                              "val": {
+                                "u64": 5000
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "approvals"
+                              },
+                              "val": {
+                                "map": [
+                                  {
+                                    "key": {
+                                      "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
+                                    },
+                                    "val": {
+                                      "bool": true
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
+                                    },
+                                    "val": {
+                                      "bool": true
+                                    }
+                                  }
+                                ]
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "finalized"
+                              },
+                              "val": {
+                                "bool": true
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "required_approvals"
+                              },
+                              "val": {
+                                "u32": 2
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "whitelisted_approvers"
+                              },
+                              "val": {
+                                "vec": [
+                                  {
+                                    "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
+                                  },
+                                  {
+                                    "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
+                                  }
+                                ]
+                              }
+                            }
+                          ]
                         }
                       },
                       {
@@ -3381,6 +3353,14 @@
             ],
             "data": {
               "map": [
+                {
+                  "key": {
+                    "symbol": "allow_partial_release"
+                  },
+                  "val": {
+                    "bool": false
+                  }
+                },
                 {
                   "key": {
                     "symbol": "amount"
@@ -3446,10 +3426,10 @@
                 },
                 {
                   "key": {
-                    "symbol": "flags"
+                    "symbol": "kyc_compliant"
                   },
                   "val": {
-                    "u32": 2
+                    "bool": false
                   }
                 },
                 {
@@ -3468,6 +3448,14 @@
                     "string": "Multi-party test"
                   }
                 },
+                {
+                  "key": {
+                    "symbol": "multi_party_enabled"
+                  },
+                  "val": {
+                    "bool": true
+                  }
+                },
                 {
                   "key": {
                     "symbol": "recipient"
@@ -3544,6 +3532,22 @@
                             }
                           ]
                         }
+                      },
+                      {
+                        "key": {
+                          "symbol": "oracle_confirmation"
+                        },
+                        "val": {
+                          "bool": false
+                        }
+                      },
+                      {
+                        "key": {
+                          "symbol": "recipient_approval"
+                        },
+                        "val": {
+                          "bool": false
+                        }
                       }
                     ]
                   }
diff --git a/contracts/test_snapshots/payment_escrow/test/test_release_succeeds_with_quorum.1.json b/contracts/test_snapshots/payment_escrow/test/test_release_succeeds_with_quorum.1.json
index 3aa8a97..81911a3 100644
--- a/contracts/test_snapshots/payment_escrow/test/test_release_succeeds_with_quorum.1.json
+++ b/contracts/test_snapshots/payment_escrow/test/test_release_succeeds_with_quorum.1.json
@@ -705,16 +705,7 @@
         {
           "contract_data": {
             "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-            "key": {
-              "vec": [
-                {
-                  "symbol": "Escrow"
-                },
-                {
-                  "u64": 1
-                }
-              ]
-            },
+            "key": "ledger_key_contract_instance",
             "durability": "persistent"
           }
         },
@@ -725,380 +716,361 @@
               "contract_data": {
                 "ext": "v0",
                 "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-                "key": {
-                  "vec": [
-                    {
-                      "symbol": "Escrow"
-                    },
-                    {
-                      "u64": 1
-                    }
-                  ]
-                },
+                "key": "ledger_key_contract_instance",
                 "durability": "persistent",
                 "val": {
-                  "map": [
-                    {
-                      "key": {
-                        "symbol": "amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 5000
-                        }
-                      }
+                  "contract_instance": {
+                    "executable": {
+                      "wasm": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
                     },
-                    {
-                      "key": {
-                        "symbol": "asset"
-                      },
-                      "val": {
-                        "map": [
-                          {
-                            "key": {
-                              "symbol": "code"
-                            },
-                            "val": {
-                              "string": "USDC"
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "issuer"
-                            },
-                            "val": {
-                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
+                    "storage": [
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "Admin"
                             }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "created_at"
-                      },
-                      "val": {
-                        "u64": 1000
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "deposited_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 5000
-                        }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "escrow_id"
-                      },
-                      "val": {
-                        "u64": 1
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "flags"
-                      },
-                      "val": {
-                        "u32": 2
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "last_deposit_at"
-                      },
-                      "val": {
-                        "u64": 1000
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "memo"
-                      },
-                      "val": {
-                        "string": "Multi-party test"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "recipient"
-                      },
-                      "val": {
-                        "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "refund_timestamp"
-                      },
-                      "val": {
-                        "u64": 0
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "refunded_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 0
+                          ]
+                        },
+                        "val": {
+                          "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "release_conditions"
                       },
-                      "val": {
-                        "map": [
-                          {
-                            "key": {
-                              "symbol": "conditions"
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "Escrow"
                             },
-                            "val": {
-                              "vec": []
+                            {
+                              "u64": 1
                             }
-                          },
-                          {
-                            "key": {
-                              "symbol": "current_approvals"
+                          ]
+                        },
+                        "val": {
+                          "map": [
+                            {
+                              "key": {
+                                "symbol": "allow_partial_release"
+                              },
+                              "val": {
+                                "bool": false
+                              }
                             },
-                            "val": {
-                              "u32": 0
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "expiration_timestamp"
+                            {
+                              "key": {
+                                "symbol": "amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 5000
+                                }
+                              }
                             },
-                            "val": {
-                              "u64": 10000
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "min_approvals"
+                            {
+                              "key": {
+                                "symbol": "asset"
+                              },
+                              "val": {
+                                "map": [
+                                  {
+                                    "key": {
+                                      "symbol": "code"
+                                    },
+                                    "val": {
+                                      "string": "USDC"
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "issuer"
+                                    },
+                                    "val": {
+                                      "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
+                                    }
+                                  }
+                                ]
+                              }
                             },
-                            "val": {
-                              "u32": 1
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "operator"
+                            {
+                              "key": {
+                                "symbol": "created_at"
+                              },
+                              "val": {
+                                "u64": 1000
+                              }
                             },
-                            "val": {
-                              "vec": [
-                                {
-                                  "symbol": "And"
+                            {
+                              "key": {
+                                "symbol": "deposited_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 5000
                                 }
-                              ]
-                            }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "release_timestamp"
-                      },
-                      "val": {
-                        "u64": 1000
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "released_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 5000
-                        }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "sender"
-                      },
-                      "val": {
-                        "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "status"
-                      },
-                      "val": {
-                        "vec": [
-                          {
-                            "symbol": "Released"
-                          }
-                        ]
-                      }
-                    }
-                  ]
-                }
-              }
-            },
-            "ext": "v0"
-          },
-          4095
-        ]
-      ],
-      [
-        {
-          "contract_data": {
-            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-            "key": {
-              "vec": [
-                {
-                  "symbol": "EscrowApprovals"
-                },
-                {
-                  "u64": 1
-                }
-              ]
-            },
-            "durability": "persistent"
-          }
-        },
-        [
-          {
-            "last_modified_ledger_seq": 0,
-            "data": {
-              "contract_data": {
-                "ext": "v0",
-                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-                "key": {
-                  "vec": [
-                    {
-                      "symbol": "EscrowApprovals"
-                    },
-                    {
-                      "u64": 1
-                    }
-                  ]
-                },
-                "durability": "persistent",
-                "val": {
-                  "map": [
-                    {
-                      "key": {
-                        "symbol": "approval_timeout"
-                      },
-                      "val": {
-                        "u64": 5000
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "approvals"
-                      },
-                      "val": {
-                        "map": [
-                          {
-                            "key": {
-                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
+                              }
                             },
-                            "val": {
-                              "bool": true
-                            }
-                          },
-                          {
-                            "key": {
-                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
+                            {
+                              "key": {
+                                "symbol": "escrow_id"
+                              },
+                              "val": {
+                                "u64": 1
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "kyc_compliant"
+                              },
+                              "val": {
+                                "bool": false
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "last_deposit_at"
+                              },
+                              "val": {
+                                "u64": 1000
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "memo"
+                              },
+                              "val": {
+                                "string": "Multi-party test"
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "multi_party_enabled"
+                              },
+                              "val": {
+                                "bool": true
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "recipient"
+                              },
+                              "val": {
+                                "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "refund_timestamp"
+                              },
+                              "val": {
+                                "u64": 0
+                              }
                             },
-                            "val": {
-                              "bool": true
+                            {
+                              "key": {
+                                "symbol": "refunded_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 0
+                                }
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "release_conditions"
+                              },
+                              "val": {
+                                "map": [
+                                  {
+                                    "key": {
+                                      "symbol": "conditions"
+                                    },
+                                    "val": {
+                                      "vec": []
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "current_approvals"
+                                    },
+                                    "val": {
+                                      "u32": 0
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "expiration_timestamp"
+                                    },
+                                    "val": {
+                                      "u64": 10000
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "min_approvals"
+                                    },
+                                    "val": {
+                                      "u32": 1
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "operator"
+                                    },
+                                    "val": {
+                                      "vec": [
+                                        {
+                                          "symbol": "And"
+                                        }
+                                      ]
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "oracle_confirmation"
+                                    },
+                                    "val": {
+                                      "bool": false
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "recipient_approval"
+                                    },
+                                    "val": {
+                                      "bool": false
+                                    }
+                                  }
+                                ]
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "release_timestamp"
+                              },
+                              "val": {
+                                "u64": 1000
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "released_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 5000
+                                }
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "sender"
+                              },
+                              "val": {
+                                "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "status"
+                              },
+                              "val": {
+                                "vec": [
+                                  {
+                                    "symbol": "Released"
+                                  }
+                                ]
+                              }
                             }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "finalized"
-                      },
-                      "val": {
-                        "bool": true
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "required_approvals"
-                      },
-                      "val": {
-                        "u32": 2
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "whitelisted_approvers"
+                          ]
+                        }
                       },
-                      "val": {
-                        "vec": [
-                          {
-                            "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
-                          },
-                          {
-                            "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
-                          },
-                          {
-                            "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
-                          }
-                        ]
-                      }
-                    }
-                  ]
-                }
-              }
-            },
-            "ext": "v0"
-          },
-          4095
-        ]
-      ],
-      [
-        {
-          "contract_data": {
-            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-            "key": "ledger_key_contract_instance",
-            "durability": "persistent"
-          }
-        },
-        [
-          {
-            "last_modified_ledger_seq": 0,
-            "data": {
-              "contract_data": {
-                "ext": "v0",
-                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-                "key": "ledger_key_contract_instance",
-                "durability": "persistent",
-                "val": {
-                  "contract_instance": {
-                    "executable": {
-                      "wasm": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
-                    },
-                    "storage": [
                       {
                         "key": {
                           "vec": [
                             {
-                              "symbol": "Admin"
+                              "symbol": "EscrowApprovals"
+                            },
+                            {
+                              "u64": 1
                             }
                           ]
                         },
                         "val": {
-                          "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
+                          "map": [
+                            {
+                              "key": {
+                                "symbol": "approval_timeout"
+                              },
+                              "val": {
+                                "u64": 5000
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "approvals"
+                              },
+                              "val": {
+                                "map": [
+                                  {
+                                    "key": {
+                                      "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
+                                    },
+                                    "val": {
+                                      "bool": true
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
+                                    },
+                                    "val": {
+                                      "bool": true
+                                    }
+                                  }
+                                ]
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "finalized"
+                              },
+                              "val": {
+                                "bool": true
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "required_approvals"
+                              },
+                              "val": {
+                                "u32": 2
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "whitelisted_approvers"
+                              },
+                              "val": {
+                                "vec": [
+                                  {
+                                    "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
+                                  },
+                                  {
+                                    "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
+                                  },
+                                  {
+                                    "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
+                                  }
+                                ]
+                              }
+                            }
+                          ]
                         }
                       },
                       {
@@ -3009,6 +2981,14 @@
             ],
             "data": {
               "map": [
+                {
+                  "key": {
+                    "symbol": "allow_partial_release"
+                  },
+                  "val": {
+                    "bool": false
+                  }
+                },
                 {
                   "key": {
                     "symbol": "amount"
@@ -3074,10 +3054,10 @@
                 },
                 {
                   "key": {
-                    "symbol": "flags"
+                    "symbol": "kyc_compliant"
                   },
                   "val": {
-                    "u32": 2
+                    "bool": false
                   }
                 },
                 {
@@ -3096,6 +3076,14 @@
                     "string": "Multi-party test"
                   }
                 },
+                {
+                  "key": {
+                    "symbol": "multi_party_enabled"
+                  },
+                  "val": {
+                    "bool": true
+                  }
+                },
                 {
                   "key": {
                     "symbol": "recipient"
@@ -3172,6 +3160,22 @@
                             }
                           ]
                         }
+                      },
+                      {
+                        "key": {
+                          "symbol": "oracle_confirmation"
+                        },
+                        "val": {
+                          "bool": false
+                        }
+                      },
+                      {
+                        "key": {
+                          "symbol": "recipient_approval"
+                        },
+                        "val": {
+                          "bool": false
+                        }
                       }
                     ]
                   }
diff --git a/contracts/test_snapshots/payment_escrow/test/test_release_unauthorized_caller.1.json b/contracts/test_snapshots/payment_escrow/test/test_release_unauthorized_caller.1.json
index 65ddbe4..9ff5478 100644
--- a/contracts/test_snapshots/payment_escrow/test/test_release_unauthorized_caller.1.json
+++ b/contracts/test_snapshots/payment_escrow/test/test_release_unauthorized_caller.1.json
@@ -457,258 +457,6 @@
           6311999
         ]
       ],
-      [
-        {
-          "contract_data": {
-            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMDR4",
-            "key": {
-              "vec": [
-                {
-                  "symbol": "Escrow"
-                },
-                {
-                  "u64": 1
-                }
-              ]
-            },
-            "durability": "persistent"
-          }
-        },
-        [
-          {
-            "last_modified_ledger_seq": 0,
-            "data": {
-              "contract_data": {
-                "ext": "v0",
-                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMDR4",
-                "key": {
-                  "vec": [
-                    {
-                      "symbol": "Escrow"
-                    },
-                    {
-                      "u64": 1
-                    }
-                  ]
-                },
-                "durability": "persistent",
-                "val": {
-                  "map": [
-                    {
-                      "key": {
-                        "symbol": "amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 1000
-                        }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "asset"
-                      },
-                      "val": {
-                        "map": [
-                          {
-                            "key": {
-                              "symbol": "code"
-                            },
-                            "val": {
-                              "string": "USDC"
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "issuer"
-                            },
-                            "val": {
-                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
-                            }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "created_at"
-                      },
-                      "val": {
-                        "u64": 1000
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "deposited_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 1000
-                        }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "escrow_id"
-                      },
-                      "val": {
-                        "u64": 1
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "flags"
-                      },
-                      "val": {
-                        "u32": 0
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "last_deposit_at"
-                      },
-                      "val": {
-                        "u64": 1000
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "memo"
-                      },
-                      "val": {
-                        "string": "Test"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "recipient"
-                      },
-                      "val": {
-                        "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "refund_timestamp"
-                      },
-                      "val": {
-                        "u64": 0
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "refunded_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 0
-                        }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "release_conditions"
-                      },
-                      "val": {
-                        "map": [
-                          {
-                            "key": {
-                              "symbol": "conditions"
-                            },
-                            "val": {
-                              "vec": []
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "current_approvals"
-                            },
-                            "val": {
-                              "u32": 0
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "expiration_timestamp"
-                            },
-                            "val": {
-                              "u64": 2000
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "min_approvals"
-                            },
-                            "val": {
-                              "u32": 1
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "operator"
-                            },
-                            "val": {
-                              "vec": [
-                                {
-                                  "symbol": "And"
-                                }
-                              ]
-                            }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "release_timestamp"
-                      },
-                      "val": {
-                        "u64": 0
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "released_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 0
-                        }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "sender"
-                      },
-                      "val": {
-                        "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "status"
-                      },
-                      "val": {
-                        "vec": [
-                          {
-                            "symbol": "Approved"
-                          }
-                        ]
-                      }
-                    }
-                  ]
-                }
-              }
-            },
-            "ext": "v0"
-          },
-          4095
-        ]
-      ],
       [
         {
           "contract_data": {
@@ -744,6 +492,260 @@
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "Escrow"
+                            },
+                            {
+                              "u64": 1
+                            }
+                          ]
+                        },
+                        "val": {
+                          "map": [
+                            {
+                              "key": {
+                                "symbol": "allow_partial_release"
+                              },
+                              "val": {
+                                "bool": false
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 1000
+                                }
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "asset"
+                              },
+                              "val": {
+                                "map": [
+                                  {
+                                    "key": {
+                                      "symbol": "code"
+                                    },
+                                    "val": {
+                                      "string": "USDC"
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "issuer"
+                                    },
+                                    "val": {
+                                      "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
+                                    }
+                                  }
+                                ]
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "created_at"
+                              },
+                              "val": {
+                                "u64": 1000
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "deposited_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 1000
+                                }
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "escrow_id"
+                              },
+                              "val": {
+                                "u64": 1
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "kyc_compliant"
+                              },
+                              "val": {
+                                "bool": false
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "last_deposit_at"
+                              },
+                              "val": {
+                                "u64": 1000
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "memo"
+                              },
+                              "val": {
+                                "string": "Test"
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "multi_party_enabled"
+                              },
+                              "val": {
+                                "bool": false
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "recipient"
+                              },
+                              "val": {
+                                "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "refund_timestamp"
+                              },
+                              "val": {
+                                "u64": 0
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "refunded_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 0
+                                }
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "release_conditions"
+                              },
+                              "val": {
+                                "map": [
+                                  {
+                                    "key": {
+                                      "symbol": "conditions"
+                                    },
+                                    "val": {
+                                      "vec": []
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "current_approvals"
+                                    },
+                                    "val": {
+                                      "u32": 0
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "expiration_timestamp"
+                                    },
+                                    "val": {
+                                      "u64": 2000
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "min_approvals"
+                                    },
+                                    "val": {
+                                      "u32": 1
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "operator"
+                                    },
+                                    "val": {
+                                      "vec": [
+                                        {
+                                          "symbol": "And"
+                                        }
+                                      ]
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "oracle_confirmation"
+                                    },
+                                    "val": {
+                                      "bool": false
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "recipient_approval"
+                                    },
+                                    "val": {
+                                      "bool": false
+                                    }
+                                  }
+                                ]
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "release_timestamp"
+                              },
+                              "val": {
+                                "u64": 0
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "released_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 0
+                                }
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "sender"
+                              },
+                              "val": {
+                                "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "status"
+                              },
+                              "val": {
+                                "vec": [
+                                  {
+                                    "symbol": "Approved"
+                                  }
+                                ]
+                              }
+                            }
+                          ]
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
diff --git a/contracts/test_snapshots/payment_escrow/test/test_release_with_fee.1.json b/contracts/test_snapshots/payment_escrow/test/test_release_with_fee.1.json
index 072c816..d84ca2b 100644
--- a/contracts/test_snapshots/payment_escrow/test/test_release_with_fee.1.json
+++ b/contracts/test_snapshots/payment_escrow/test/test_release_with_fee.1.json
@@ -577,258 +577,6 @@
           6311999
         ]
       ],
-      [
-        {
-          "contract_data": {
-            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-            "key": {
-              "vec": [
-                {
-                  "symbol": "Escrow"
-                },
-                {
-                  "u64": 1
-                }
-              ]
-            },
-            "durability": "persistent"
-          }
-        },
-        [
-          {
-            "last_modified_ledger_seq": 0,
-            "data": {
-              "contract_data": {
-                "ext": "v0",
-                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-                "key": {
-                  "vec": [
-                    {
-                      "symbol": "Escrow"
-                    },
-                    {
-                      "u64": 1
-                    }
-                  ]
-                },
-                "durability": "persistent",
-                "val": {
-                  "map": [
-                    {
-                      "key": {
-                        "symbol": "amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 1000
-                        }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "asset"
-                      },
-                      "val": {
-                        "map": [
-                          {
-                            "key": {
-                              "symbol": "code"
-                            },
-                            "val": {
-                              "string": "USDC"
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "issuer"
-                            },
-                            "val": {
-                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
-                            }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "created_at"
-                      },
-                      "val": {
-                        "u64": 1000
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "deposited_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 1000
-                        }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "escrow_id"
-                      },
-                      "val": {
-                        "u64": 1
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "flags"
-                      },
-                      "val": {
-                        "u32": 0
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "last_deposit_at"
-                      },
-                      "val": {
-                        "u64": 1000
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "memo"
-                      },
-                      "val": {
-                        "string": "Test"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "recipient"
-                      },
-                      "val": {
-                        "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "refund_timestamp"
-                      },
-                      "val": {
-                        "u64": 0
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "refunded_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 0
-                        }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "release_conditions"
-                      },
-                      "val": {
-                        "map": [
-                          {
-                            "key": {
-                              "symbol": "conditions"
-                            },
-                            "val": {
-                              "vec": []
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "current_approvals"
-                            },
-                            "val": {
-                              "u32": 0
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "expiration_timestamp"
-                            },
-                            "val": {
-                              "u64": 2000
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "min_approvals"
-                            },
-                            "val": {
-                              "u32": 1
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "operator"
-                            },
-                            "val": {
-                              "vec": [
-                                {
-                                  "symbol": "And"
-                                }
-                              ]
-                            }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "release_timestamp"
-                      },
-                      "val": {
-                        "u64": 1000
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "released_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 1000
-                        }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "sender"
-                      },
-                      "val": {
-                        "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "status"
-                      },
-                      "val": {
-                        "vec": [
-                          {
-                            "symbol": "Released"
-                          }
-                        ]
-                      }
-                    }
-                  ]
-                }
-              }
-            },
-            "ext": "v0"
-          },
-          4095
-        ]
-      ],
       [
         {
           "contract_data": {
@@ -864,6 +612,260 @@
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "Escrow"
+                            },
+                            {
+                              "u64": 1
+                            }
+                          ]
+                        },
+                        "val": {
+                          "map": [
+                            {
+                              "key": {
+                                "symbol": "allow_partial_release"
+                              },
+                              "val": {
+                                "bool": false
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 1000
+                                }
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "asset"
+                              },
+                              "val": {
+                                "map": [
+                                  {
+                                    "key": {
+                                      "symbol": "code"
+                                    },
+                                    "val": {
+                                      "string": "USDC"
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "issuer"
+                                    },
+                                    "val": {
+                                      "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
+                                    }
+                                  }
+                                ]
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "created_at"
+                              },
+                              "val": {
+                                "u64": 1000
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "deposited_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 1000
+                                }
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "escrow_id"
+                              },
+                              "val": {
+                                "u64": 1
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "kyc_compliant"
+                              },
+                              "val": {
+                                "bool": false
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "last_deposit_at"
+                              },
+                              "val": {
+                                "u64": 1000
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "memo"
+                              },
+                              "val": {
+                                "string": "Test"
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "multi_party_enabled"
+                              },
+                              "val": {
+                                "bool": false
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "recipient"
+                              },
+                              "val": {
+                                "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "refund_timestamp"
+                              },
+                              "val": {
+                                "u64": 0
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "refunded_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 0
+                                }
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "release_conditions"
+                              },
+                              "val": {
+                                "map": [
+                                  {
+                                    "key": {
+                                      "symbol": "conditions"
+                                    },
+                                    "val": {
+                                      "vec": []
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "current_approvals"
+                                    },
+                                    "val": {
+                                      "u32": 0
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "expiration_timestamp"
+                                    },
+                                    "val": {
+                                      "u64": 2000
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "min_approvals"
+                                    },
+                                    "val": {
+                                      "u32": 1
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "operator"
+                                    },
+                                    "val": {
+                                      "vec": [
+                                        {
+                                          "symbol": "And"
+                                        }
+                                      ]
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "oracle_confirmation"
+                                    },
+                                    "val": {
+                                      "bool": false
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "recipient_approval"
+                                    },
+                                    "val": {
+                                      "bool": false
+                                    }
+                                  }
+                                ]
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "release_timestamp"
+                              },
+                              "val": {
+                                "u64": 1000
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "released_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 1000
+                                }
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "sender"
+                              },
+                              "val": {
+                                "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "status"
+                              },
+                              "val": {
+                                "vec": [
+                                  {
+                                    "symbol": "Released"
+                                  }
+                                ]
+                              }
+                            }
+                          ]
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -2764,6 +2766,14 @@
             ],
             "data": {
               "map": [
+                {
+                  "key": {
+                    "symbol": "allow_partial_release"
+                  },
+                  "val": {
+                    "bool": false
+                  }
+                },
                 {
                   "key": {
                     "symbol": "amount"
@@ -2829,10 +2839,10 @@
                 },
                 {
                   "key": {
-                    "symbol": "flags"
+                    "symbol": "kyc_compliant"
                   },
                   "val": {
-                    "u32": 0
+                    "bool": false
                   }
                 },
                 {
@@ -2851,6 +2861,14 @@
                     "string": "Test"
                   }
                 },
+                {
+                  "key": {
+                    "symbol": "multi_party_enabled"
+                  },
+                  "val": {
+                    "bool": false
+                  }
+                },
                 {
                   "key": {
                     "symbol": "recipient"
@@ -2927,6 +2945,22 @@
                             }
                           ]
                         }
+                      },
+                      {
+                        "key": {
+                          "symbol": "oracle_confirmation"
+                        },
+                        "val": {
+                          "bool": false
+                        }
+                      },
+                      {
+                        "key": {
+                          "symbol": "recipient_approval"
+                        },
+                        "val": {
+                          "bool": false
+                        }
                       }
                     ]
                   }
diff --git a/contracts/test_snapshots/payment_escrow/test/test_remove_approver.1.json b/contracts/test_snapshots/payment_escrow/test/test_remove_approver.1.json
index 49d7885..86d4a36 100644
--- a/contracts/test_snapshots/payment_escrow/test/test_remove_approver.1.json
+++ b/contracts/test_snapshots/payment_escrow/test/test_remove_approver.1.json
@@ -539,16 +539,7 @@
         {
           "contract_data": {
             "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-            "key": {
-              "vec": [
-                {
-                  "symbol": "Escrow"
-                },
-                {
-                  "u64": 1
-                }
-              ]
-            },
+            "key": "ledger_key_contract_instance",
             "durability": "persistent"
           }
         },
@@ -559,360 +550,341 @@
               "contract_data": {
                 "ext": "v0",
                 "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-                "key": {
-                  "vec": [
-                    {
-                      "symbol": "Escrow"
-                    },
-                    {
-                      "u64": 1
-                    }
-                  ]
-                },
+                "key": "ledger_key_contract_instance",
                 "durability": "persistent",
                 "val": {
-                  "map": [
-                    {
-                      "key": {
-                        "symbol": "amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 5000
-                        }
-                      }
+                  "contract_instance": {
+                    "executable": {
+                      "wasm": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
                     },
-                    {
-                      "key": {
-                        "symbol": "asset"
-                      },
-                      "val": {
-                        "map": [
-                          {
-                            "key": {
-                              "symbol": "code"
-                            },
-                            "val": {
-                              "string": "USDC"
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "issuer"
-                            },
-                            "val": {
-                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
+                    "storage": [
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "Admin"
                             }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "created_at"
-                      },
-                      "val": {
-                        "u64": 1000
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "deposited_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 5000
-                        }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "escrow_id"
-                      },
-                      "val": {
-                        "u64": 1
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "flags"
-                      },
-                      "val": {
-                        "u32": 2
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "last_deposit_at"
-                      },
-                      "val": {
-                        "u64": 1000
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "memo"
-                      },
-                      "val": {
-                        "string": "Multi-party test"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "recipient"
-                      },
-                      "val": {
-                        "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "refund_timestamp"
-                      },
-                      "val": {
-                        "u64": 0
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "refunded_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 0
+                          ]
+                        },
+                        "val": {
+                          "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "release_conditions"
                       },
-                      "val": {
-                        "map": [
-                          {
-                            "key": {
-                              "symbol": "conditions"
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "Escrow"
                             },
-                            "val": {
-                              "vec": []
+                            {
+                              "u64": 1
                             }
-                          },
-                          {
-                            "key": {
-                              "symbol": "current_approvals"
+                          ]
+                        },
+                        "val": {
+                          "map": [
+                            {
+                              "key": {
+                                "symbol": "allow_partial_release"
+                              },
+                              "val": {
+                                "bool": false
+                              }
                             },
-                            "val": {
-                              "u32": 0
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "expiration_timestamp"
+                            {
+                              "key": {
+                                "symbol": "amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 5000
+                                }
+                              }
                             },
-                            "val": {
-                              "u64": 10000
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "min_approvals"
+                            {
+                              "key": {
+                                "symbol": "asset"
+                              },
+                              "val": {
+                                "map": [
+                                  {
+                                    "key": {
+                                      "symbol": "code"
+                                    },
+                                    "val": {
+                                      "string": "USDC"
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "issuer"
+                                    },
+                                    "val": {
+                                      "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
+                                    }
+                                  }
+                                ]
+                              }
                             },
-                            "val": {
-                              "u32": 1
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "operator"
+                            {
+                              "key": {
+                                "symbol": "created_at"
+                              },
+                              "val": {
+                                "u64": 1000
+                              }
                             },
-                            "val": {
-                              "vec": [
-                                {
-                                  "symbol": "And"
+                            {
+                              "key": {
+                                "symbol": "deposited_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 5000
                                 }
-                              ]
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "escrow_id"
+                              },
+                              "val": {
+                                "u64": 1
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "kyc_compliant"
+                              },
+                              "val": {
+                                "bool": false
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "last_deposit_at"
+                              },
+                              "val": {
+                                "u64": 1000
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "memo"
+                              },
+                              "val": {
+                                "string": "Multi-party test"
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "multi_party_enabled"
+                              },
+                              "val": {
+                                "bool": true
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "recipient"
+                              },
+                              "val": {
+                                "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "refund_timestamp"
+                              },
+                              "val": {
+                                "u64": 0
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "refunded_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 0
+                                }
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "release_conditions"
+                              },
+                              "val": {
+                                "map": [
+                                  {
+                                    "key": {
+                                      "symbol": "conditions"
+                                    },
+                                    "val": {
+                                      "vec": []
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "current_approvals"
+                                    },
+                                    "val": {
+                                      "u32": 0
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "expiration_timestamp"
+                                    },
+                                    "val": {
+                                      "u64": 10000
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "min_approvals"
+                                    },
+                                    "val": {
+                                      "u32": 1
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "operator"
+                                    },
+                                    "val": {
+                                      "vec": [
+                                        {
+                                          "symbol": "And"
+                                        }
+                                      ]
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "oracle_confirmation"
+                                    },
+                                    "val": {
+                                      "bool": false
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "recipient_approval"
+                                    },
+                                    "val": {
+                                      "bool": false
+                                    }
+                                  }
+                                ]
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "release_timestamp"
+                              },
+                              "val": {
+                                "u64": 0
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "released_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 0
+                                }
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "sender"
+                              },
+                              "val": {
+                                "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "status"
+                              },
+                              "val": {
+                                "vec": [
+                                  {
+                                    "symbol": "Funded"
+                                  }
+                                ]
+                              }
                             }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "release_timestamp"
-                      },
-                      "val": {
-                        "u64": 0
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "released_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 0
+                          ]
                         }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "sender"
-                      },
-                      "val": {
-                        "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "status"
-                      },
-                      "val": {
-                        "vec": [
-                          {
-                            "symbol": "Funded"
-                          }
-                        ]
-                      }
-                    }
-                  ]
-                }
-              }
-            },
-            "ext": "v0"
-          },
-          4095
-        ]
-      ],
-      [
-        {
-          "contract_data": {
-            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-            "key": {
-              "vec": [
-                {
-                  "symbol": "EscrowApprovals"
-                },
-                {
-                  "u64": 1
-                }
-              ]
-            },
-            "durability": "persistent"
-          }
-        },
-        [
-          {
-            "last_modified_ledger_seq": 0,
-            "data": {
-              "contract_data": {
-                "ext": "v0",
-                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-                "key": {
-                  "vec": [
-                    {
-                      "symbol": "EscrowApprovals"
-                    },
-                    {
-                      "u64": 1
-                    }
-                  ]
-                },
-                "durability": "persistent",
-                "val": {
-                  "map": [
-                    {
-                      "key": {
-                        "symbol": "approval_timeout"
                       },
-                      "val": {
-                        "u64": 5000
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "approvals"
-                      },
-                      "val": {
-                        "map": []
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "finalized"
-                      },
-                      "val": {
-                        "bool": false
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "required_approvals"
-                      },
-                      "val": {
-                        "u32": 2
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "whitelisted_approvers"
-                      },
-                      "val": {
-                        "vec": [
-                          {
-                            "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
-                          },
-                          {
-                            "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
-                          }
-                        ]
-                      }
-                    }
-                  ]
-                }
-              }
-            },
-            "ext": "v0"
-          },
-          4095
-        ]
-      ],
-      [
-        {
-          "contract_data": {
-            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-            "key": "ledger_key_contract_instance",
-            "durability": "persistent"
-          }
-        },
-        [
-          {
-            "last_modified_ledger_seq": 0,
-            "data": {
-              "contract_data": {
-                "ext": "v0",
-                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-                "key": "ledger_key_contract_instance",
-                "durability": "persistent",
-                "val": {
-                  "contract_instance": {
-                    "executable": {
-                      "wasm": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
-                    },
-                    "storage": [
                       {
                         "key": {
                           "vec": [
                             {
-                              "symbol": "Admin"
+                              "symbol": "EscrowApprovals"
+                            },
+                            {
+                              "u64": 1
                             }
                           ]
                         },
                         "val": {
-                          "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
+                          "map": [
+                            {
+                              "key": {
+                                "symbol": "approval_timeout"
+                              },
+                              "val": {
+                                "u64": 5000
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "approvals"
+                              },
+                              "val": {
+                                "map": []
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "finalized"
+                              },
+                              "val": {
+                                "bool": false
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "required_approvals"
+                              },
+                              "val": {
+                                "u32": 2
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "whitelisted_approvers"
+                              },
+                              "val": {
+                                "vec": [
+                                  {
+                                    "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
+                                  },
+                                  {
+                                    "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
+                                  }
+                                ]
+                              }
+                            }
+                          ]
                         }
                       },
                       {
diff --git a/contracts/test_snapshots/payment_escrow/test/test_remove_approver_clears_existing_approval.1.json b/contracts/test_snapshots/payment_escrow/test/test_remove_approver_clears_existing_approval.1.json
index 8e88838..038f7e1 100644
--- a/contracts/test_snapshots/payment_escrow/test/test_remove_approver_clears_existing_approval.1.json
+++ b/contracts/test_snapshots/payment_escrow/test/test_remove_approver_clears_existing_approval.1.json
@@ -561,16 +561,7 @@
         {
           "contract_data": {
             "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-            "key": {
-              "vec": [
-                {
-                  "symbol": "Escrow"
-                },
-                {
-                  "u64": 1
-                }
-              ]
-            },
+            "key": "ledger_key_contract_instance",
             "durability": "persistent"
           }
         },
@@ -581,360 +572,341 @@
               "contract_data": {
                 "ext": "v0",
                 "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-                "key": {
-                  "vec": [
-                    {
-                      "symbol": "Escrow"
-                    },
-                    {
-                      "u64": 1
-                    }
-                  ]
-                },
+                "key": "ledger_key_contract_instance",
                 "durability": "persistent",
                 "val": {
-                  "map": [
-                    {
-                      "key": {
-                        "symbol": "amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 5000
-                        }
-                      }
+                  "contract_instance": {
+                    "executable": {
+                      "wasm": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
                     },
-                    {
-                      "key": {
-                        "symbol": "asset"
-                      },
-                      "val": {
-                        "map": [
-                          {
-                            "key": {
-                              "symbol": "code"
-                            },
-                            "val": {
-                              "string": "USDC"
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "issuer"
-                            },
-                            "val": {
-                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
+                    "storage": [
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "Admin"
                             }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "created_at"
-                      },
-                      "val": {
-                        "u64": 1000
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "deposited_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 5000
-                        }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "escrow_id"
-                      },
-                      "val": {
-                        "u64": 1
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "flags"
-                      },
-                      "val": {
-                        "u32": 2
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "last_deposit_at"
-                      },
-                      "val": {
-                        "u64": 1000
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "memo"
-                      },
-                      "val": {
-                        "string": "Multi-party test"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "recipient"
-                      },
-                      "val": {
-                        "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "refund_timestamp"
-                      },
-                      "val": {
-                        "u64": 0
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "refunded_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 0
+                          ]
+                        },
+                        "val": {
+                          "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "release_conditions"
                       },
-                      "val": {
-                        "map": [
-                          {
-                            "key": {
-                              "symbol": "conditions"
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "Escrow"
                             },
-                            "val": {
-                              "vec": []
+                            {
+                              "u64": 1
                             }
-                          },
-                          {
-                            "key": {
-                              "symbol": "current_approvals"
+                          ]
+                        },
+                        "val": {
+                          "map": [
+                            {
+                              "key": {
+                                "symbol": "allow_partial_release"
+                              },
+                              "val": {
+                                "bool": false
+                              }
                             },
-                            "val": {
-                              "u32": 0
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "expiration_timestamp"
+                            {
+                              "key": {
+                                "symbol": "amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 5000
+                                }
+                              }
                             },
-                            "val": {
-                              "u64": 10000
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "min_approvals"
+                            {
+                              "key": {
+                                "symbol": "asset"
+                              },
+                              "val": {
+                                "map": [
+                                  {
+                                    "key": {
+                                      "symbol": "code"
+                                    },
+                                    "val": {
+                                      "string": "USDC"
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "issuer"
+                                    },
+                                    "val": {
+                                      "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
+                                    }
+                                  }
+                                ]
+                              }
                             },
-                            "val": {
-                              "u32": 1
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "operator"
+                            {
+                              "key": {
+                                "symbol": "created_at"
+                              },
+                              "val": {
+                                "u64": 1000
+                              }
                             },
-                            "val": {
-                              "vec": [
-                                {
-                                  "symbol": "And"
+                            {
+                              "key": {
+                                "symbol": "deposited_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 5000
                                 }
-                              ]
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "escrow_id"
+                              },
+                              "val": {
+                                "u64": 1
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "kyc_compliant"
+                              },
+                              "val": {
+                                "bool": false
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "last_deposit_at"
+                              },
+                              "val": {
+                                "u64": 1000
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "memo"
+                              },
+                              "val": {
+                                "string": "Multi-party test"
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "multi_party_enabled"
+                              },
+                              "val": {
+                                "bool": true
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "recipient"
+                              },
+                              "val": {
+                                "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "refund_timestamp"
+                              },
+                              "val": {
+                                "u64": 0
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "refunded_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 0
+                                }
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "release_conditions"
+                              },
+                              "val": {
+                                "map": [
+                                  {
+                                    "key": {
+                                      "symbol": "conditions"
+                                    },
+                                    "val": {
+                                      "vec": []
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "current_approvals"
+                                    },
+                                    "val": {
+                                      "u32": 0
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "expiration_timestamp"
+                                    },
+                                    "val": {
+                                      "u64": 10000
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "min_approvals"
+                                    },
+                                    "val": {
+                                      "u32": 1
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "operator"
+                                    },
+                                    "val": {
+                                      "vec": [
+                                        {
+                                          "symbol": "And"
+                                        }
+                                      ]
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "oracle_confirmation"
+                                    },
+                                    "val": {
+                                      "bool": false
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "recipient_approval"
+                                    },
+                                    "val": {
+                                      "bool": false
+                                    }
+                                  }
+                                ]
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "release_timestamp"
+                              },
+                              "val": {
+                                "u64": 0
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "released_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 0
+                                }
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "sender"
+                              },
+                              "val": {
+                                "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "status"
+                              },
+                              "val": {
+                                "vec": [
+                                  {
+                                    "symbol": "Funded"
+                                  }
+                                ]
+                              }
                             }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "release_timestamp"
-                      },
-                      "val": {
-                        "u64": 0
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "released_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 0
+                          ]
                         }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "sender"
-                      },
-                      "val": {
-                        "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "status"
                       },
-                      "val": {
-                        "vec": [
-                          {
-                            "symbol": "Funded"
-                          }
-                        ]
-                      }
-                    }
-                  ]
-                }
-              }
-            },
-            "ext": "v0"
-          },
-          4095
-        ]
-      ],
-      [
-        {
-          "contract_data": {
-            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-            "key": {
-              "vec": [
-                {
-                  "symbol": "EscrowApprovals"
-                },
-                {
-                  "u64": 1
-                }
-              ]
-            },
-            "durability": "persistent"
-          }
-        },
-        [
-          {
-            "last_modified_ledger_seq": 0,
-            "data": {
-              "contract_data": {
-                "ext": "v0",
-                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-                "key": {
-                  "vec": [
-                    {
-                      "symbol": "EscrowApprovals"
-                    },
-                    {
-                      "u64": 1
-                    }
-                  ]
-                },
-                "durability": "persistent",
-                "val": {
-                  "map": [
-                    {
-                      "key": {
-                        "symbol": "approval_timeout"
-                      },
-                      "val": {
-                        "u64": 5000
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "approvals"
-                      },
-                      "val": {
-                        "map": []
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "finalized"
-                      },
-                      "val": {
-                        "bool": false
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "required_approvals"
-                      },
-                      "val": {
-                        "u32": 2
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "whitelisted_approvers"
-                      },
-                      "val": {
-                        "vec": [
-                          {
-                            "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
-                          },
-                          {
-                            "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
-                          }
-                        ]
-                      }
-                    }
-                  ]
-                }
-              }
-            },
-            "ext": "v0"
-          },
-          4095
-        ]
-      ],
-      [
-        {
-          "contract_data": {
-            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-            "key": "ledger_key_contract_instance",
-            "durability": "persistent"
-          }
-        },
-        [
-          {
-            "last_modified_ledger_seq": 0,
-            "data": {
-              "contract_data": {
-                "ext": "v0",
-                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-                "key": "ledger_key_contract_instance",
-                "durability": "persistent",
-                "val": {
-                  "contract_instance": {
-                    "executable": {
-                      "wasm": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
-                    },
-                    "storage": [
                       {
                         "key": {
                           "vec": [
                             {
-                              "symbol": "Admin"
+                              "symbol": "EscrowApprovals"
+                            },
+                            {
+                              "u64": 1
                             }
                           ]
                         },
                         "val": {
-                          "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
+                          "map": [
+                            {
+                              "key": {
+                                "symbol": "approval_timeout"
+                              },
+                              "val": {
+                                "u64": 5000
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "approvals"
+                              },
+                              "val": {
+                                "map": []
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "finalized"
+                              },
+                              "val": {
+                                "bool": false
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "required_approvals"
+                              },
+                              "val": {
+                                "u32": 2
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "whitelisted_approvers"
+                              },
+                              "val": {
+                                "vec": [
+                                  {
+                                    "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
+                                  },
+                                  {
+                                    "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
+                                  }
+                                ]
+                              }
+                            }
+                          ]
                         }
                       },
                       {
diff --git a/contracts/test_snapshots/payment_escrow/test/test_remove_approver_violating_quorum_rejected.1.json b/contracts/test_snapshots/payment_escrow/test/test_remove_approver_violating_quorum_rejected.1.json
index a6b6fa4..c25b4e0 100644
--- a/contracts/test_snapshots/payment_escrow/test/test_remove_approver_violating_quorum_rejected.1.json
+++ b/contracts/test_snapshots/payment_escrow/test/test_remove_approver_violating_quorum_rejected.1.json
@@ -477,16 +477,7 @@
         {
           "contract_data": {
             "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-            "key": {
-              "vec": [
-                {
-                  "symbol": "Escrow"
-                },
-                {
-                  "u64": 1
-                }
-              ]
-            },
+            "key": "ledger_key_contract_instance",
             "durability": "persistent"
           }
         },
@@ -497,360 +488,341 @@
               "contract_data": {
                 "ext": "v0",
                 "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-                "key": {
-                  "vec": [
-                    {
-                      "symbol": "Escrow"
-                    },
-                    {
-                      "u64": 1
-                    }
-                  ]
-                },
+                "key": "ledger_key_contract_instance",
                 "durability": "persistent",
                 "val": {
-                  "map": [
-                    {
-                      "key": {
-                        "symbol": "amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 5000
-                        }
-                      }
+                  "contract_instance": {
+                    "executable": {
+                      "wasm": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
                     },
-                    {
-                      "key": {
-                        "symbol": "asset"
-                      },
-                      "val": {
-                        "map": [
-                          {
-                            "key": {
-                              "symbol": "code"
-                            },
-                            "val": {
-                              "string": "USDC"
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "issuer"
-                            },
-                            "val": {
-                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
+                    "storage": [
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "Admin"
                             }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "created_at"
-                      },
-                      "val": {
-                        "u64": 1000
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "deposited_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 5000
-                        }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "escrow_id"
-                      },
-                      "val": {
-                        "u64": 1
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "flags"
-                      },
-                      "val": {
-                        "u32": 2
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "last_deposit_at"
-                      },
-                      "val": {
-                        "u64": 1000
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "memo"
-                      },
-                      "val": {
-                        "string": "Multi-party test"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "recipient"
-                      },
-                      "val": {
-                        "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "refund_timestamp"
-                      },
-                      "val": {
-                        "u64": 0
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "refunded_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 0
+                          ]
+                        },
+                        "val": {
+                          "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "release_conditions"
                       },
-                      "val": {
-                        "map": [
-                          {
-                            "key": {
-                              "symbol": "conditions"
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "Escrow"
                             },
-                            "val": {
-                              "vec": []
+                            {
+                              "u64": 1
                             }
-                          },
-                          {
-                            "key": {
-                              "symbol": "current_approvals"
+                          ]
+                        },
+                        "val": {
+                          "map": [
+                            {
+                              "key": {
+                                "symbol": "allow_partial_release"
+                              },
+                              "val": {
+                                "bool": false
+                              }
                             },
-                            "val": {
-                              "u32": 0
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "expiration_timestamp"
+                            {
+                              "key": {
+                                "symbol": "amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 5000
+                                }
+                              }
                             },
-                            "val": {
-                              "u64": 10000
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "min_approvals"
+                            {
+                              "key": {
+                                "symbol": "asset"
+                              },
+                              "val": {
+                                "map": [
+                                  {
+                                    "key": {
+                                      "symbol": "code"
+                                    },
+                                    "val": {
+                                      "string": "USDC"
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "issuer"
+                                    },
+                                    "val": {
+                                      "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
+                                    }
+                                  }
+                                ]
+                              }
                             },
-                            "val": {
-                              "u32": 1
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "operator"
+                            {
+                              "key": {
+                                "symbol": "created_at"
+                              },
+                              "val": {
+                                "u64": 1000
+                              }
                             },
-                            "val": {
-                              "vec": [
-                                {
-                                  "symbol": "And"
+                            {
+                              "key": {
+                                "symbol": "deposited_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 5000
                                 }
-                              ]
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "escrow_id"
+                              },
+                              "val": {
+                                "u64": 1
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "kyc_compliant"
+                              },
+                              "val": {
+                                "bool": false
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "last_deposit_at"
+                              },
+                              "val": {
+                                "u64": 1000
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "memo"
+                              },
+                              "val": {
+                                "string": "Multi-party test"
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "multi_party_enabled"
+                              },
+                              "val": {
+                                "bool": true
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "recipient"
+                              },
+                              "val": {
+                                "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "refund_timestamp"
+                              },
+                              "val": {
+                                "u64": 0
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "refunded_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 0
+                                }
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "release_conditions"
+                              },
+                              "val": {
+                                "map": [
+                                  {
+                                    "key": {
+                                      "symbol": "conditions"
+                                    },
+                                    "val": {
+                                      "vec": []
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "current_approvals"
+                                    },
+                                    "val": {
+                                      "u32": 0
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "expiration_timestamp"
+                                    },
+                                    "val": {
+                                      "u64": 10000
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "min_approvals"
+                                    },
+                                    "val": {
+                                      "u32": 1
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "operator"
+                                    },
+                                    "val": {
+                                      "vec": [
+                                        {
+                                          "symbol": "And"
+                                        }
+                                      ]
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "oracle_confirmation"
+                                    },
+                                    "val": {
+                                      "bool": false
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "recipient_approval"
+                                    },
+                                    "val": {
+                                      "bool": false
+                                    }
+                                  }
+                                ]
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "release_timestamp"
+                              },
+                              "val": {
+                                "u64": 0
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "released_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 0
+                                }
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "sender"
+                              },
+                              "val": {
+                                "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "status"
+                              },
+                              "val": {
+                                "vec": [
+                                  {
+                                    "symbol": "Funded"
+                                  }
+                                ]
+                              }
                             }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "release_timestamp"
-                      },
-                      "val": {
-                        "u64": 0
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "released_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 0
+                          ]
                         }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "sender"
-                      },
-                      "val": {
-                        "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "status"
                       },
-                      "val": {
-                        "vec": [
-                          {
-                            "symbol": "Funded"
-                          }
-                        ]
-                      }
-                    }
-                  ]
-                }
-              }
-            },
-            "ext": "v0"
-          },
-          4095
-        ]
-      ],
-      [
-        {
-          "contract_data": {
-            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-            "key": {
-              "vec": [
-                {
-                  "symbol": "EscrowApprovals"
-                },
-                {
-                  "u64": 1
-                }
-              ]
-            },
-            "durability": "persistent"
-          }
-        },
-        [
-          {
-            "last_modified_ledger_seq": 0,
-            "data": {
-              "contract_data": {
-                "ext": "v0",
-                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-                "key": {
-                  "vec": [
-                    {
-                      "symbol": "EscrowApprovals"
-                    },
-                    {
-                      "u64": 1
-                    }
-                  ]
-                },
-                "durability": "persistent",
-                "val": {
-                  "map": [
-                    {
-                      "key": {
-                        "symbol": "approval_timeout"
-                      },
-                      "val": {
-                        "u64": 5000
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "approvals"
-                      },
-                      "val": {
-                        "map": []
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "finalized"
-                      },
-                      "val": {
-                        "bool": false
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "required_approvals"
-                      },
-                      "val": {
-                        "u32": 2
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "whitelisted_approvers"
-                      },
-                      "val": {
-                        "vec": [
-                          {
-                            "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
-                          },
-                          {
-                            "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
-                          }
-                        ]
-                      }
-                    }
-                  ]
-                }
-              }
-            },
-            "ext": "v0"
-          },
-          4095
-        ]
-      ],
-      [
-        {
-          "contract_data": {
-            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-            "key": "ledger_key_contract_instance",
-            "durability": "persistent"
-          }
-        },
-        [
-          {
-            "last_modified_ledger_seq": 0,
-            "data": {
-              "contract_data": {
-                "ext": "v0",
-                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-                "key": "ledger_key_contract_instance",
-                "durability": "persistent",
-                "val": {
-                  "contract_instance": {
-                    "executable": {
-                      "wasm": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
-                    },
-                    "storage": [
                       {
                         "key": {
                           "vec": [
                             {
-                              "symbol": "Admin"
+                              "symbol": "EscrowApprovals"
+                            },
+                            {
+                              "u64": 1
                             }
                           ]
                         },
                         "val": {
-                          "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
+                          "map": [
+                            {
+                              "key": {
+                                "symbol": "approval_timeout"
+                              },
+                              "val": {
+                                "u64": 5000
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "approvals"
+                              },
+                              "val": {
+                                "map": []
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "finalized"
+                              },
+                              "val": {
+                                "bool": false
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "required_approvals"
+                              },
+                              "val": {
+                                "u32": 2
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "whitelisted_approvers"
+                              },
+                              "val": {
+                                "vec": [
+                                  {
+                                    "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
+                                  },
+                                  {
+                                    "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
+                                  }
+                                ]
+                              }
+                            }
+                          ]
                         }
                       },
                       {
diff --git a/contracts/test_snapshots/payment_escrow/test/test_revoke_after_finalized_rejected.1.json b/contracts/test_snapshots/payment_escrow/test/test_revoke_after_finalized_rejected.1.json
index 097c6b9..290144c 100644
--- a/contracts/test_snapshots/payment_escrow/test/test_revoke_after_finalized_rejected.1.json
+++ b/contracts/test_snapshots/payment_escrow/test/test_revoke_after_finalized_rejected.1.json
@@ -701,16 +701,7 @@
         {
           "contract_data": {
             "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-            "key": {
-              "vec": [
-                {
-                  "symbol": "Escrow"
-                },
-                {
-                  "u64": 1
-                }
-              ]
-            },
+            "key": "ledger_key_contract_instance",
             "durability": "persistent"
           }
         },
@@ -721,377 +712,358 @@
               "contract_data": {
                 "ext": "v0",
                 "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-                "key": {
-                  "vec": [
-                    {
-                      "symbol": "Escrow"
-                    },
-                    {
-                      "u64": 1
-                    }
-                  ]
-                },
+                "key": "ledger_key_contract_instance",
                 "durability": "persistent",
                 "val": {
-                  "map": [
-                    {
-                      "key": {
-                        "symbol": "amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 5000
-                        }
-                      }
+                  "contract_instance": {
+                    "executable": {
+                      "wasm": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
                     },
-                    {
-                      "key": {
-                        "symbol": "asset"
-                      },
-                      "val": {
-                        "map": [
-                          {
-                            "key": {
-                              "symbol": "code"
-                            },
-                            "val": {
-                              "string": "USDC"
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "issuer"
-                            },
-                            "val": {
-                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
+                    "storage": [
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "Admin"
                             }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "created_at"
-                      },
-                      "val": {
-                        "u64": 1000
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "deposited_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 5000
-                        }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "escrow_id"
-                      },
-                      "val": {
-                        "u64": 1
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "flags"
-                      },
-                      "val": {
-                        "u32": 2
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "last_deposit_at"
-                      },
-                      "val": {
-                        "u64": 1000
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "memo"
-                      },
-                      "val": {
-                        "string": "Multi-party test"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "recipient"
-                      },
-                      "val": {
-                        "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "refund_timestamp"
-                      },
-                      "val": {
-                        "u64": 0
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "refunded_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 0
+                          ]
+                        },
+                        "val": {
+                          "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "release_conditions"
                       },
-                      "val": {
-                        "map": [
-                          {
-                            "key": {
-                              "symbol": "conditions"
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "Escrow"
                             },
-                            "val": {
-                              "vec": []
+                            {
+                              "u64": 1
                             }
-                          },
-                          {
-                            "key": {
-                              "symbol": "current_approvals"
+                          ]
+                        },
+                        "val": {
+                          "map": [
+                            {
+                              "key": {
+                                "symbol": "allow_partial_release"
+                              },
+                              "val": {
+                                "bool": false
+                              }
                             },
-                            "val": {
-                              "u32": 0
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "expiration_timestamp"
+                            {
+                              "key": {
+                                "symbol": "amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 5000
+                                }
+                              }
                             },
-                            "val": {
-                              "u64": 10000
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "min_approvals"
+                            {
+                              "key": {
+                                "symbol": "asset"
+                              },
+                              "val": {
+                                "map": [
+                                  {
+                                    "key": {
+                                      "symbol": "code"
+                                    },
+                                    "val": {
+                                      "string": "USDC"
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "issuer"
+                                    },
+                                    "val": {
+                                      "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
+                                    }
+                                  }
+                                ]
+                              }
                             },
-                            "val": {
-                              "u32": 1
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "operator"
+                            {
+                              "key": {
+                                "symbol": "created_at"
+                              },
+                              "val": {
+                                "u64": 1000
+                              }
                             },
-                            "val": {
-                              "vec": [
-                                {
-                                  "symbol": "And"
+                            {
+                              "key": {
+                                "symbol": "deposited_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 5000
                                 }
-                              ]
-                            }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "release_timestamp"
-                      },
-                      "val": {
-                        "u64": 1000
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "released_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 5000
-                        }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "sender"
-                      },
-                      "val": {
-                        "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "status"
-                      },
-                      "val": {
-                        "vec": [
-                          {
-                            "symbol": "Released"
-                          }
-                        ]
-                      }
-                    }
-                  ]
-                }
-              }
-            },
-            "ext": "v0"
-          },
-          4095
-        ]
-      ],
-      [
-        {
-          "contract_data": {
-            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-            "key": {
-              "vec": [
-                {
-                  "symbol": "EscrowApprovals"
-                },
-                {
-                  "u64": 1
-                }
-              ]
-            },
-            "durability": "persistent"
-          }
-        },
-        [
-          {
-            "last_modified_ledger_seq": 0,
-            "data": {
-              "contract_data": {
-                "ext": "v0",
-                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-                "key": {
-                  "vec": [
-                    {
-                      "symbol": "EscrowApprovals"
-                    },
-                    {
-                      "u64": 1
-                    }
-                  ]
-                },
-                "durability": "persistent",
-                "val": {
-                  "map": [
-                    {
-                      "key": {
-                        "symbol": "approval_timeout"
-                      },
-                      "val": {
-                        "u64": 5000
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "approvals"
-                      },
-                      "val": {
-                        "map": [
-                          {
-                            "key": {
-                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
+                              }
                             },
-                            "val": {
-                              "bool": true
-                            }
-                          },
-                          {
-                            "key": {
-                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
+                            {
+                              "key": {
+                                "symbol": "escrow_id"
+                              },
+                              "val": {
+                                "u64": 1
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "kyc_compliant"
+                              },
+                              "val": {
+                                "bool": false
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "last_deposit_at"
+                              },
+                              "val": {
+                                "u64": 1000
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "memo"
+                              },
+                              "val": {
+                                "string": "Multi-party test"
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "multi_party_enabled"
+                              },
+                              "val": {
+                                "bool": true
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "recipient"
+                              },
+                              "val": {
+                                "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "refund_timestamp"
+                              },
+                              "val": {
+                                "u64": 0
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "refunded_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 0
+                                }
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "release_conditions"
+                              },
+                              "val": {
+                                "map": [
+                                  {
+                                    "key": {
+                                      "symbol": "conditions"
+                                    },
+                                    "val": {
+                                      "vec": []
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "current_approvals"
+                                    },
+                                    "val": {
+                                      "u32": 0
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "expiration_timestamp"
+                                    },
+                                    "val": {
+                                      "u64": 10000
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "min_approvals"
+                                    },
+                                    "val": {
+                                      "u32": 1
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "operator"
+                                    },
+                                    "val": {
+                                      "vec": [
+                                        {
+                                          "symbol": "And"
+                                        }
+                                      ]
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "oracle_confirmation"
+                                    },
+                                    "val": {
+                                      "bool": false
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "recipient_approval"
+                                    },
+                                    "val": {
+                                      "bool": false
+                                    }
+                                  }
+                                ]
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "release_timestamp"
+                              },
+                              "val": {
+                                "u64": 1000
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "released_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 5000
+                                }
+                              }
                             },
-                            "val": {
-                              "bool": true
+                            {
+                              "key": {
+                                "symbol": "sender"
+                              },
+                              "val": {
+                                "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "status"
+                              },
+                              "val": {
+                                "vec": [
+                                  {
+                                    "symbol": "Released"
+                                  }
+                                ]
+                              }
                             }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "finalized"
-                      },
-                      "val": {
-                        "bool": true
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "required_approvals"
-                      },
-                      "val": {
-                        "u32": 2
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "whitelisted_approvers"
+                          ]
+                        }
                       },
-                      "val": {
-                        "vec": [
-                          {
-                            "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
-                          },
-                          {
-                            "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
-                          }
-                        ]
-                      }
-                    }
-                  ]
-                }
-              }
-            },
-            "ext": "v0"
-          },
-          4095
-        ]
-      ],
-      [
-        {
-          "contract_data": {
-            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-            "key": "ledger_key_contract_instance",
-            "durability": "persistent"
-          }
-        },
-        [
-          {
-            "last_modified_ledger_seq": 0,
-            "data": {
-              "contract_data": {
-                "ext": "v0",
-                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-                "key": "ledger_key_contract_instance",
-                "durability": "persistent",
-                "val": {
-                  "contract_instance": {
-                    "executable": {
-                      "wasm": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
-                    },
-                    "storage": [
                       {
                         "key": {
                           "vec": [
                             {
-                              "symbol": "Admin"
+                              "symbol": "EscrowApprovals"
+                            },
+                            {
+                              "u64": 1
                             }
                           ]
                         },
                         "val": {
-                          "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
+                          "map": [
+                            {
+                              "key": {
+                                "symbol": "approval_timeout"
+                              },
+                              "val": {
+                                "u64": 5000
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "approvals"
+                              },
+                              "val": {
+                                "map": [
+                                  {
+                                    "key": {
+                                      "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
+                                    },
+                                    "val": {
+                                      "bool": true
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
+                                    },
+                                    "val": {
+                                      "bool": true
+                                    }
+                                  }
+                                ]
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "finalized"
+                              },
+                              "val": {
+                                "bool": true
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "required_approvals"
+                              },
+                              "val": {
+                                "u32": 2
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "whitelisted_approvers"
+                              },
+                              "val": {
+                                "vec": [
+                                  {
+                                    "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
+                                  },
+                                  {
+                                    "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
+                                  }
+                                ]
+                              }
+                            }
+                          ]
                         }
                       },
                       {
diff --git a/contracts/test_snapshots/payment_escrow/test/test_revoke_approval.1.json b/contracts/test_snapshots/payment_escrow/test/test_revoke_approval.1.json
index 7366e94..1deaf23 100644
--- a/contracts/test_snapshots/payment_escrow/test/test_revoke_approval.1.json
+++ b/contracts/test_snapshots/payment_escrow/test/test_revoke_approval.1.json
@@ -646,16 +646,7 @@
         {
           "contract_data": {
             "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-            "key": {
-              "vec": [
-                {
-                  "symbol": "Escrow"
-                },
-                {
-                  "u64": 1
-                }
-              ]
-            },
+            "key": "ledger_key_contract_instance",
             "durability": "persistent"
           }
         },
@@ -666,372 +657,353 @@
               "contract_data": {
                 "ext": "v0",
                 "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-                "key": {
-                  "vec": [
-                    {
-                      "symbol": "Escrow"
-                    },
-                    {
-                      "u64": 1
-                    }
-                  ]
-                },
+                "key": "ledger_key_contract_instance",
                 "durability": "persistent",
                 "val": {
-                  "map": [
-                    {
-                      "key": {
-                        "symbol": "amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 5000
-                        }
-                      }
+                  "contract_instance": {
+                    "executable": {
+                      "wasm": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
                     },
-                    {
-                      "key": {
-                        "symbol": "asset"
-                      },
-                      "val": {
-                        "map": [
-                          {
-                            "key": {
-                              "symbol": "code"
-                            },
-                            "val": {
-                              "string": "USDC"
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "issuer"
-                            },
-                            "val": {
-                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
+                    "storage": [
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "Admin"
                             }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "created_at"
-                      },
-                      "val": {
-                        "u64": 1000
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "deposited_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 5000
-                        }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "escrow_id"
-                      },
-                      "val": {
-                        "u64": 1
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "flags"
-                      },
-                      "val": {
-                        "u32": 2
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "last_deposit_at"
-                      },
-                      "val": {
-                        "u64": 1000
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "memo"
-                      },
-                      "val": {
-                        "string": "Multi-party test"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "recipient"
-                      },
-                      "val": {
-                        "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "refund_timestamp"
-                      },
-                      "val": {
-                        "u64": 0
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "refunded_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 0
+                          ]
+                        },
+                        "val": {
+                          "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "release_conditions"
                       },
-                      "val": {
-                        "map": [
-                          {
-                            "key": {
-                              "symbol": "conditions"
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "Escrow"
                             },
-                            "val": {
-                              "vec": []
+                            {
+                              "u64": 1
                             }
-                          },
-                          {
-                            "key": {
-                              "symbol": "current_approvals"
+                          ]
+                        },
+                        "val": {
+                          "map": [
+                            {
+                              "key": {
+                                "symbol": "allow_partial_release"
+                              },
+                              "val": {
+                                "bool": false
+                              }
                             },
-                            "val": {
-                              "u32": 0
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "expiration_timestamp"
+                            {
+                              "key": {
+                                "symbol": "amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 5000
+                                }
+                              }
                             },
-                            "val": {
-                              "u64": 10000
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "min_approvals"
+                            {
+                              "key": {
+                                "symbol": "asset"
+                              },
+                              "val": {
+                                "map": [
+                                  {
+                                    "key": {
+                                      "symbol": "code"
+                                    },
+                                    "val": {
+                                      "string": "USDC"
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "issuer"
+                                    },
+                                    "val": {
+                                      "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
+                                    }
+                                  }
+                                ]
+                              }
                             },
-                            "val": {
-                              "u32": 1
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "operator"
+                            {
+                              "key": {
+                                "symbol": "created_at"
+                              },
+                              "val": {
+                                "u64": 1000
+                              }
                             },
-                            "val": {
-                              "vec": [
-                                {
-                                  "symbol": "And"
+                            {
+                              "key": {
+                                "symbol": "deposited_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 5000
                                 }
-                              ]
-                            }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "release_timestamp"
-                      },
-                      "val": {
-                        "u64": 0
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "released_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 0
-                        }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "sender"
-                      },
-                      "val": {
-                        "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "status"
-                      },
-                      "val": {
-                        "vec": [
-                          {
-                            "symbol": "Funded"
-                          }
-                        ]
-                      }
-                    }
-                  ]
-                }
-              }
-            },
-            "ext": "v0"
-          },
-          4095
-        ]
-      ],
-      [
-        {
-          "contract_data": {
-            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-            "key": {
-              "vec": [
-                {
-                  "symbol": "EscrowApprovals"
-                },
-                {
-                  "u64": 1
-                }
-              ]
-            },
-            "durability": "persistent"
-          }
-        },
-        [
-          {
-            "last_modified_ledger_seq": 0,
-            "data": {
-              "contract_data": {
-                "ext": "v0",
-                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-                "key": {
-                  "vec": [
-                    {
-                      "symbol": "EscrowApprovals"
-                    },
-                    {
-                      "u64": 1
-                    }
-                  ]
-                },
-                "durability": "persistent",
-                "val": {
-                  "map": [
-                    {
-                      "key": {
-                        "symbol": "approval_timeout"
-                      },
-                      "val": {
-                        "u64": 5000
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "approvals"
-                      },
-                      "val": {
-                        "map": [
-                          {
-                            "key": {
-                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "escrow_id"
+                              },
+                              "val": {
+                                "u64": 1
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "kyc_compliant"
+                              },
+                              "val": {
+                                "bool": false
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "last_deposit_at"
+                              },
+                              "val": {
+                                "u64": 1000
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "memo"
+                              },
+                              "val": {
+                                "string": "Multi-party test"
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "multi_party_enabled"
+                              },
+                              "val": {
+                                "bool": true
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "recipient"
+                              },
+                              "val": {
+                                "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "refund_timestamp"
+                              },
+                              "val": {
+                                "u64": 0
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "refunded_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 0
+                                }
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "release_conditions"
+                              },
+                              "val": {
+                                "map": [
+                                  {
+                                    "key": {
+                                      "symbol": "conditions"
+                                    },
+                                    "val": {
+                                      "vec": []
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "current_approvals"
+                                    },
+                                    "val": {
+                                      "u32": 0
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "expiration_timestamp"
+                                    },
+                                    "val": {
+                                      "u64": 10000
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "min_approvals"
+                                    },
+                                    "val": {
+                                      "u32": 1
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "operator"
+                                    },
+                                    "val": {
+                                      "vec": [
+                                        {
+                                          "symbol": "And"
+                                        }
+                                      ]
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "oracle_confirmation"
+                                    },
+                                    "val": {
+                                      "bool": false
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "recipient_approval"
+                                    },
+                                    "val": {
+                                      "bool": false
+                                    }
+                                  }
+                                ]
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "release_timestamp"
+                              },
+                              "val": {
+                                "u64": 0
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "released_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 0
+                                }
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "sender"
+                              },
+                              "val": {
+                                "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
+                              }
                             },
-                            "val": {
-                              "bool": true
+                            {
+                              "key": {
+                                "symbol": "status"
+                              },
+                              "val": {
+                                "vec": [
+                                  {
+                                    "symbol": "Funded"
+                                  }
+                                ]
+                              }
                             }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "finalized"
-                      },
-                      "val": {
-                        "bool": false
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "required_approvals"
-                      },
-                      "val": {
-                        "u32": 2
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "whitelisted_approvers"
+                          ]
+                        }
                       },
-                      "val": {
-                        "vec": [
-                          {
-                            "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
-                          },
-                          {
-                            "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
-                          },
-                          {
-                            "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
-                          }
-                        ]
-                      }
-                    }
-                  ]
-                }
-              }
-            },
-            "ext": "v0"
-          },
-          4095
-        ]
-      ],
-      [
-        {
-          "contract_data": {
-            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-            "key": "ledger_key_contract_instance",
-            "durability": "persistent"
-          }
-        },
-        [
-          {
-            "last_modified_ledger_seq": 0,
-            "data": {
-              "contract_data": {
-                "ext": "v0",
-                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-                "key": "ledger_key_contract_instance",
-                "durability": "persistent",
-                "val": {
-                  "contract_instance": {
-                    "executable": {
-                      "wasm": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
-                    },
-                    "storage": [
                       {
                         "key": {
                           "vec": [
                             {
-                              "symbol": "Admin"
+                              "symbol": "EscrowApprovals"
+                            },
+                            {
+                              "u64": 1
                             }
                           ]
                         },
                         "val": {
-                          "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
+                          "map": [
+                            {
+                              "key": {
+                                "symbol": "approval_timeout"
+                              },
+                              "val": {
+                                "u64": 5000
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "approvals"
+                              },
+                              "val": {
+                                "map": [
+                                  {
+                                    "key": {
+                                      "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
+                                    },
+                                    "val": {
+                                      "bool": true
+                                    }
+                                  }
+                                ]
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "finalized"
+                              },
+                              "val": {
+                                "bool": false
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "required_approvals"
+                              },
+                              "val": {
+                                "u32": 2
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "whitelisted_approvers"
+                              },
+                              "val": {
+                                "vec": [
+                                  {
+                                    "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
+                                  },
+                                  {
+                                    "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
+                                  },
+                                  {
+                                    "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
+                                  }
+                                ]
+                              }
+                            }
+                          ]
                         }
                       },
                       {
diff --git a/contracts/test_snapshots/payment_escrow/test/test_revoke_approval_not_found.1.json b/contracts/test_snapshots/payment_escrow/test/test_revoke_approval_not_found.1.json
index 427692c..ce9e4cb 100644
--- a/contracts/test_snapshots/payment_escrow/test/test_revoke_approval_not_found.1.json
+++ b/contracts/test_snapshots/payment_escrow/test/test_revoke_approval_not_found.1.json
@@ -477,16 +477,7 @@
         {
           "contract_data": {
             "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-            "key": {
-              "vec": [
-                {
-                  "symbol": "Escrow"
-                },
-                {
-                  "u64": 1
-                }
-              ]
-            },
+            "key": "ledger_key_contract_instance",
             "durability": "persistent"
           }
         },
@@ -497,360 +488,341 @@
               "contract_data": {
                 "ext": "v0",
                 "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-                "key": {
-                  "vec": [
-                    {
-                      "symbol": "Escrow"
-                    },
-                    {
-                      "u64": 1
-                    }
-                  ]
-                },
+                "key": "ledger_key_contract_instance",
                 "durability": "persistent",
                 "val": {
-                  "map": [
-                    {
-                      "key": {
-                        "symbol": "amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 5000
-                        }
-                      }
+                  "contract_instance": {
+                    "executable": {
+                      "wasm": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
                     },
-                    {
-                      "key": {
-                        "symbol": "asset"
-                      },
-                      "val": {
-                        "map": [
-                          {
-                            "key": {
-                              "symbol": "code"
-                            },
-                            "val": {
-                              "string": "USDC"
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "issuer"
-                            },
-                            "val": {
-                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
+                    "storage": [
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "Admin"
                             }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "created_at"
-                      },
-                      "val": {
-                        "u64": 1000
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "deposited_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 5000
-                        }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "escrow_id"
-                      },
-                      "val": {
-                        "u64": 1
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "flags"
-                      },
-                      "val": {
-                        "u32": 2
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "last_deposit_at"
-                      },
-                      "val": {
-                        "u64": 1000
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "memo"
-                      },
-                      "val": {
-                        "string": "Multi-party test"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "recipient"
-                      },
-                      "val": {
-                        "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "refund_timestamp"
-                      },
-                      "val": {
-                        "u64": 0
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "refunded_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 0
+                          ]
+                        },
+                        "val": {
+                          "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "release_conditions"
                       },
-                      "val": {
-                        "map": [
-                          {
-                            "key": {
-                              "symbol": "conditions"
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "Escrow"
                             },
-                            "val": {
-                              "vec": []
+                            {
+                              "u64": 1
                             }
-                          },
-                          {
-                            "key": {
-                              "symbol": "current_approvals"
+                          ]
+                        },
+                        "val": {
+                          "map": [
+                            {
+                              "key": {
+                                "symbol": "allow_partial_release"
+                              },
+                              "val": {
+                                "bool": false
+                              }
                             },
-                            "val": {
-                              "u32": 0
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "expiration_timestamp"
+                            {
+                              "key": {
+                                "symbol": "amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 5000
+                                }
+                              }
                             },
-                            "val": {
-                              "u64": 10000
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "min_approvals"
+                            {
+                              "key": {
+                                "symbol": "asset"
+                              },
+                              "val": {
+                                "map": [
+                                  {
+                                    "key": {
+                                      "symbol": "code"
+                                    },
+                                    "val": {
+                                      "string": "USDC"
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "issuer"
+                                    },
+                                    "val": {
+                                      "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
+                                    }
+                                  }
+                                ]
+                              }
                             },
-                            "val": {
-                              "u32": 1
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "operator"
+                            {
+                              "key": {
+                                "symbol": "created_at"
+                              },
+                              "val": {
+                                "u64": 1000
+                              }
                             },
-                            "val": {
-                              "vec": [
-                                {
-                                  "symbol": "And"
+                            {
+                              "key": {
+                                "symbol": "deposited_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 5000
                                 }
-                              ]
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "escrow_id"
+                              },
+                              "val": {
+                                "u64": 1
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "kyc_compliant"
+                              },
+                              "val": {
+                                "bool": false
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "last_deposit_at"
+                              },
+                              "val": {
+                                "u64": 1000
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "memo"
+                              },
+                              "val": {
+                                "string": "Multi-party test"
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "multi_party_enabled"
+                              },
+                              "val": {
+                                "bool": true
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "recipient"
+                              },
+                              "val": {
+                                "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "refund_timestamp"
+                              },
+                              "val": {
+                                "u64": 0
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "refunded_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 0
+                                }
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "release_conditions"
+                              },
+                              "val": {
+                                "map": [
+                                  {
+                                    "key": {
+                                      "symbol": "conditions"
+                                    },
+                                    "val": {
+                                      "vec": []
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "current_approvals"
+                                    },
+                                    "val": {
+                                      "u32": 0
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "expiration_timestamp"
+                                    },
+                                    "val": {
+                                      "u64": 10000
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "min_approvals"
+                                    },
+                                    "val": {
+                                      "u32": 1
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "operator"
+                                    },
+                                    "val": {
+                                      "vec": [
+                                        {
+                                          "symbol": "And"
+                                        }
+                                      ]
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "oracle_confirmation"
+                                    },
+                                    "val": {
+                                      "bool": false
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "recipient_approval"
+                                    },
+                                    "val": {
+                                      "bool": false
+                                    }
+                                  }
+                                ]
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "release_timestamp"
+                              },
+                              "val": {
+                                "u64": 0
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "released_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 0
+                                }
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "sender"
+                              },
+                              "val": {
+                                "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "status"
+                              },
+                              "val": {
+                                "vec": [
+                                  {
+                                    "symbol": "Funded"
+                                  }
+                                ]
+                              }
                             }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "release_timestamp"
-                      },
-                      "val": {
-                        "u64": 0
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "released_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 0
+                          ]
                         }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "sender"
-                      },
-                      "val": {
-                        "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "status"
                       },
-                      "val": {
-                        "vec": [
-                          {
-                            "symbol": "Funded"
-                          }
-                        ]
-                      }
-                    }
-                  ]
-                }
-              }
-            },
-            "ext": "v0"
-          },
-          4095
-        ]
-      ],
-      [
-        {
-          "contract_data": {
-            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-            "key": {
-              "vec": [
-                {
-                  "symbol": "EscrowApprovals"
-                },
-                {
-                  "u64": 1
-                }
-              ]
-            },
-            "durability": "persistent"
-          }
-        },
-        [
-          {
-            "last_modified_ledger_seq": 0,
-            "data": {
-              "contract_data": {
-                "ext": "v0",
-                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-                "key": {
-                  "vec": [
-                    {
-                      "symbol": "EscrowApprovals"
-                    },
-                    {
-                      "u64": 1
-                    }
-                  ]
-                },
-                "durability": "persistent",
-                "val": {
-                  "map": [
-                    {
-                      "key": {
-                        "symbol": "approval_timeout"
-                      },
-                      "val": {
-                        "u64": 5000
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "approvals"
-                      },
-                      "val": {
-                        "map": []
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "finalized"
-                      },
-                      "val": {
-                        "bool": false
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "required_approvals"
-                      },
-                      "val": {
-                        "u32": 2
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "whitelisted_approvers"
-                      },
-                      "val": {
-                        "vec": [
-                          {
-                            "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
-                          },
-                          {
-                            "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
-                          }
-                        ]
-                      }
-                    }
-                  ]
-                }
-              }
-            },
-            "ext": "v0"
-          },
-          4095
-        ]
-      ],
-      [
-        {
-          "contract_data": {
-            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-            "key": "ledger_key_contract_instance",
-            "durability": "persistent"
-          }
-        },
-        [
-          {
-            "last_modified_ledger_seq": 0,
-            "data": {
-              "contract_data": {
-                "ext": "v0",
-                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-                "key": "ledger_key_contract_instance",
-                "durability": "persistent",
-                "val": {
-                  "contract_instance": {
-                    "executable": {
-                      "wasm": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
-                    },
-                    "storage": [
                       {
                         "key": {
                           "vec": [
                             {
-                              "symbol": "Admin"
+                              "symbol": "EscrowApprovals"
+                            },
+                            {
+                              "u64": 1
                             }
                           ]
                         },
                         "val": {
-                          "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
+                          "map": [
+                            {
+                              "key": {
+                                "symbol": "approval_timeout"
+                              },
+                              "val": {
+                                "u64": 5000
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "approvals"
+                              },
+                              "val": {
+                                "map": []
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "finalized"
+                              },
+                              "val": {
+                                "bool": false
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "required_approvals"
+                              },
+                              "val": {
+                                "u32": 2
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "whitelisted_approvers"
+                              },
+                              "val": {
+                                "vec": [
+                                  {
+                                    "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
+                                  },
+                                  {
+                                    "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
+                                  }
+                                ]
+                              }
+                            }
+                          ]
                         }
                       },
                       {
diff --git a/contracts/test_snapshots/payment_escrow/test/test_revoke_on_non_multi_party_escrow_rejected.1.json b/contracts/test_snapshots/payment_escrow/test/test_revoke_on_non_multi_party_escrow_rejected.1.json
index 20ec3f3..ac9a77b 100644
--- a/contracts/test_snapshots/payment_escrow/test/test_revoke_on_non_multi_party_escrow_rejected.1.json
+++ b/contracts/test_snapshots/payment_escrow/test/test_revoke_on_non_multi_party_escrow_rejected.1.json
@@ -402,258 +402,6 @@
           6311999
         ]
       ],
-      [
-        {
-          "contract_data": {
-            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-            "key": {
-              "vec": [
-                {
-                  "symbol": "Escrow"
-                },
-                {
-                  "u64": 1
-                }
-              ]
-            },
-            "durability": "persistent"
-          }
-        },
-        [
-          {
-            "last_modified_ledger_seq": 0,
-            "data": {
-              "contract_data": {
-                "ext": "v0",
-                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-                "key": {
-                  "vec": [
-                    {
-                      "symbol": "Escrow"
-                    },
-                    {
-                      "u64": 1
-                    }
-                  ]
-                },
-                "durability": "persistent",
-                "val": {
-                  "map": [
-                    {
-                      "key": {
-                        "symbol": "amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 5000
-                        }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "asset"
-                      },
-                      "val": {
-                        "map": [
-                          {
-                            "key": {
-                              "symbol": "code"
-                            },
-                            "val": {
-                              "string": "USDC"
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "issuer"
-                            },
-                            "val": {
-                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
-                            }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "created_at"
-                      },
-                      "val": {
-                        "u64": 1000
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "deposited_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 5000
-                        }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "escrow_id"
-                      },
-                      "val": {
-                        "u64": 1
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "flags"
-                      },
-                      "val": {
-                        "u32": 0
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "last_deposit_at"
-                      },
-                      "val": {
-                        "u64": 1000
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "memo"
-                      },
-                      "val": {
-                        "string": "Multi-party test"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "recipient"
-                      },
-                      "val": {
-                        "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "refund_timestamp"
-                      },
-                      "val": {
-                        "u64": 0
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "refunded_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 0
-                        }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "release_conditions"
-                      },
-                      "val": {
-                        "map": [
-                          {
-                            "key": {
-                              "symbol": "conditions"
-                            },
-                            "val": {
-                              "vec": []
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "current_approvals"
-                            },
-                            "val": {
-                              "u32": 0
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "expiration_timestamp"
-                            },
-                            "val": {
-                              "u64": 10000
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "min_approvals"
-                            },
-                            "val": {
-                              "u32": 1
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "operator"
-                            },
-                            "val": {
-                              "vec": [
-                                {
-                                  "symbol": "And"
-                                }
-                              ]
-                            }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "release_timestamp"
-                      },
-                      "val": {
-                        "u64": 0
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "released_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 0
-                        }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "sender"
-                      },
-                      "val": {
-                        "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "status"
-                      },
-                      "val": {
-                        "vec": [
-                          {
-                            "symbol": "Funded"
-                          }
-                        ]
-                      }
-                    }
-                  ]
-                }
-              }
-            },
-            "ext": "v0"
-          },
-          4095
-        ]
-      ],
       [
         {
           "contract_data": {
@@ -689,6 +437,260 @@
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "Escrow"
+                            },
+                            {
+                              "u64": 1
+                            }
+                          ]
+                        },
+                        "val": {
+                          "map": [
+                            {
+                              "key": {
+                                "symbol": "allow_partial_release"
+                              },
+                              "val": {
+                                "bool": false
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 5000
+                                }
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "asset"
+                              },
+                              "val": {
+                                "map": [
+                                  {
+                                    "key": {
+                                      "symbol": "code"
+                                    },
+                                    "val": {
+                                      "string": "USDC"
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "issuer"
+                                    },
+                                    "val": {
+                                      "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
+                                    }
+                                  }
+                                ]
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "created_at"
+                              },
+                              "val": {
+                                "u64": 1000
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "deposited_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 5000
+                                }
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "escrow_id"
+                              },
+                              "val": {
+                                "u64": 1
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "kyc_compliant"
+                              },
+                              "val": {
+                                "bool": false
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "last_deposit_at"
+                              },
+                              "val": {
+                                "u64": 1000
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "memo"
+                              },
+                              "val": {
+                                "string": "Multi-party test"
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "multi_party_enabled"
+                              },
+                              "val": {
+                                "bool": false
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "recipient"
+                              },
+                              "val": {
+                                "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "refund_timestamp"
+                              },
+                              "val": {
+                                "u64": 0
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "refunded_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 0
+                                }
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "release_conditions"
+                              },
+                              "val": {
+                                "map": [
+                                  {
+                                    "key": {
+                                      "symbol": "conditions"
+                                    },
+                                    "val": {
+                                      "vec": []
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "current_approvals"
+                                    },
+                                    "val": {
+                                      "u32": 0
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "expiration_timestamp"
+                                    },
+                                    "val": {
+                                      "u64": 10000
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "min_approvals"
+                                    },
+                                    "val": {
+                                      "u32": 1
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "operator"
+                                    },
+                                    "val": {
+                                      "vec": [
+                                        {
+                                          "symbol": "And"
+                                        }
+                                      ]
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "oracle_confirmation"
+                                    },
+                                    "val": {
+                                      "bool": false
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "recipient_approval"
+                                    },
+                                    "val": {
+                                      "bool": false
+                                    }
+                                  }
+                                ]
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "release_timestamp"
+                              },
+                              "val": {
+                                "u64": 0
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "released_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 0
+                                }
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "sender"
+                              },
+                              "val": {
+                                "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "status"
+                              },
+                              "val": {
+                                "vec": [
+                                  {
+                                    "symbol": "Funded"
+                                  }
+                                ]
+                              }
+                            }
+                          ]
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
diff --git a/contracts/test_snapshots/payment_escrow/test/test_setup_multi_party_approval.1.json b/contracts/test_snapshots/payment_escrow/test/test_setup_multi_party_approval.1.json
index 204a560..7683348 100644
--- a/contracts/test_snapshots/payment_escrow/test/test_setup_multi_party_approval.1.json
+++ b/contracts/test_snapshots/payment_escrow/test/test_setup_multi_party_approval.1.json
@@ -481,16 +481,7 @@
         {
           "contract_data": {
             "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-            "key": {
-              "vec": [
-                {
-                  "symbol": "Escrow"
-                },
-                {
-                  "u64": 1
-                }
-              ]
-            },
+            "key": "ledger_key_contract_instance",
             "durability": "persistent"
           }
         },
@@ -501,363 +492,344 @@
               "contract_data": {
                 "ext": "v0",
                 "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-                "key": {
-                  "vec": [
-                    {
-                      "symbol": "Escrow"
-                    },
-                    {
-                      "u64": 1
-                    }
-                  ]
-                },
+                "key": "ledger_key_contract_instance",
                 "durability": "persistent",
                 "val": {
-                  "map": [
-                    {
-                      "key": {
-                        "symbol": "amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 5000
-                        }
-                      }
+                  "contract_instance": {
+                    "executable": {
+                      "wasm": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
                     },
-                    {
-                      "key": {
-                        "symbol": "asset"
-                      },
-                      "val": {
-                        "map": [
-                          {
-                            "key": {
-                              "symbol": "code"
-                            },
-                            "val": {
-                              "string": "USDC"
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "issuer"
-                            },
-                            "val": {
-                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
+                    "storage": [
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "Admin"
                             }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "created_at"
-                      },
-                      "val": {
-                        "u64": 1000
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "deposited_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 5000
+                          ]
+                        },
+                        "val": {
+                          "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "escrow_id"
                       },
-                      "val": {
-                        "u64": 1
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "flags"
-                      },
-                      "val": {
-                        "u32": 2
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "last_deposit_at"
-                      },
-                      "val": {
-                        "u64": 1000
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "memo"
-                      },
-                      "val": {
-                        "string": "Multi-party test"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "recipient"
-                      },
-                      "val": {
-                        "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "refund_timestamp"
-                      },
-                      "val": {
-                        "u64": 0
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "refunded_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 0
-                        }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "release_conditions"
-                      },
-                      "val": {
-                        "map": [
-                          {
-                            "key": {
-                              "symbol": "conditions"
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "Escrow"
                             },
-                            "val": {
-                              "vec": []
+                            {
+                              "u64": 1
                             }
-                          },
-                          {
-                            "key": {
-                              "symbol": "current_approvals"
+                          ]
+                        },
+                        "val": {
+                          "map": [
+                            {
+                              "key": {
+                                "symbol": "allow_partial_release"
+                              },
+                              "val": {
+                                "bool": false
+                              }
                             },
-                            "val": {
-                              "u32": 0
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "expiration_timestamp"
+                            {
+                              "key": {
+                                "symbol": "amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 5000
+                                }
+                              }
                             },
-                            "val": {
-                              "u64": 10000
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "min_approvals"
+                            {
+                              "key": {
+                                "symbol": "asset"
+                              },
+                              "val": {
+                                "map": [
+                                  {
+                                    "key": {
+                                      "symbol": "code"
+                                    },
+                                    "val": {
+                                      "string": "USDC"
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "issuer"
+                                    },
+                                    "val": {
+                                      "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
+                                    }
+                                  }
+                                ]
+                              }
                             },
-                            "val": {
-                              "u32": 1
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "operator"
+                            {
+                              "key": {
+                                "symbol": "created_at"
+                              },
+                              "val": {
+                                "u64": 1000
+                              }
                             },
-                            "val": {
-                              "vec": [
-                                {
-                                  "symbol": "And"
+                            {
+                              "key": {
+                                "symbol": "deposited_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 5000
                                 }
-                              ]
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "escrow_id"
+                              },
+                              "val": {
+                                "u64": 1
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "kyc_compliant"
+                              },
+                              "val": {
+                                "bool": false
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "last_deposit_at"
+                              },
+                              "val": {
+                                "u64": 1000
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "memo"
+                              },
+                              "val": {
+                                "string": "Multi-party test"
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "multi_party_enabled"
+                              },
+                              "val": {
+                                "bool": true
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "recipient"
+                              },
+                              "val": {
+                                "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "refund_timestamp"
+                              },
+                              "val": {
+                                "u64": 0
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "refunded_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 0
+                                }
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "release_conditions"
+                              },
+                              "val": {
+                                "map": [
+                                  {
+                                    "key": {
+                                      "symbol": "conditions"
+                                    },
+                                    "val": {
+                                      "vec": []
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "current_approvals"
+                                    },
+                                    "val": {
+                                      "u32": 0
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "expiration_timestamp"
+                                    },
+                                    "val": {
+                                      "u64": 10000
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "min_approvals"
+                                    },
+                                    "val": {
+                                      "u32": 1
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "operator"
+                                    },
+                                    "val": {
+                                      "vec": [
+                                        {
+                                          "symbol": "And"
+                                        }
+                                      ]
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "oracle_confirmation"
+                                    },
+                                    "val": {
+                                      "bool": false
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "recipient_approval"
+                                    },
+                                    "val": {
+                                      "bool": false
+                                    }
+                                  }
+                                ]
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "release_timestamp"
+                              },
+                              "val": {
+                                "u64": 0
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "released_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 0
+                                }
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "sender"
+                              },
+                              "val": {
+                                "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "status"
+                              },
+                              "val": {
+                                "vec": [
+                                  {
+                                    "symbol": "Funded"
+                                  }
+                                ]
+                              }
                             }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "release_timestamp"
-                      },
-                      "val": {
-                        "u64": 0
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "released_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 0
+                          ]
                         }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "sender"
-                      },
-                      "val": {
-                        "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "status"
-                      },
-                      "val": {
-                        "vec": [
-                          {
-                            "symbol": "Funded"
-                          }
-                        ]
-                      }
-                    }
-                  ]
-                }
-              }
-            },
-            "ext": "v0"
-          },
-          4095
-        ]
-      ],
-      [
-        {
-          "contract_data": {
-            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-            "key": {
-              "vec": [
-                {
-                  "symbol": "EscrowApprovals"
-                },
-                {
-                  "u64": 1
-                }
-              ]
-            },
-            "durability": "persistent"
-          }
-        },
-        [
-          {
-            "last_modified_ledger_seq": 0,
-            "data": {
-              "contract_data": {
-                "ext": "v0",
-                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-                "key": {
-                  "vec": [
-                    {
-                      "symbol": "EscrowApprovals"
-                    },
-                    {
-                      "u64": 1
-                    }
-                  ]
-                },
-                "durability": "persistent",
-                "val": {
-                  "map": [
-                    {
-                      "key": {
-                        "symbol": "approval_timeout"
-                      },
-                      "val": {
-                        "u64": 5000
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "approvals"
-                      },
-                      "val": {
-                        "map": []
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "finalized"
-                      },
-                      "val": {
-                        "bool": false
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "required_approvals"
                       },
-                      "val": {
-                        "u32": 2
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "whitelisted_approvers"
-                      },
-                      "val": {
-                        "vec": [
-                          {
-                            "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
-                          },
-                          {
-                            "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
-                          },
-                          {
-                            "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMDR4"
-                          }
-                        ]
-                      }
-                    }
-                  ]
-                }
-              }
-            },
-            "ext": "v0"
-          },
-          4095
-        ]
-      ],
-      [
-        {
-          "contract_data": {
-            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-            "key": "ledger_key_contract_instance",
-            "durability": "persistent"
-          }
-        },
-        [
-          {
-            "last_modified_ledger_seq": 0,
-            "data": {
-              "contract_data": {
-                "ext": "v0",
-                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-                "key": "ledger_key_contract_instance",
-                "durability": "persistent",
-                "val": {
-                  "contract_instance": {
-                    "executable": {
-                      "wasm": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
-                    },
-                    "storage": [
                       {
                         "key": {
                           "vec": [
                             {
-                              "symbol": "Admin"
+                              "symbol": "EscrowApprovals"
+                            },
+                            {
+                              "u64": 1
                             }
                           ]
                         },
                         "val": {
-                          "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
+                          "map": [
+                            {
+                              "key": {
+                                "symbol": "approval_timeout"
+                              },
+                              "val": {
+                                "u64": 5000
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "approvals"
+                              },
+                              "val": {
+                                "map": []
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "finalized"
+                              },
+                              "val": {
+                                "bool": false
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "required_approvals"
+                              },
+                              "val": {
+                                "u32": 2
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "whitelisted_approvers"
+                              },
+                              "val": {
+                                "vec": [
+                                  {
+                                    "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
+                                  },
+                                  {
+                                    "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
+                                  },
+                                  {
+                                    "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMDR4"
+                                  }
+                                ]
+                              }
+                            }
+                          ]
                         }
                       },
                       {
@@ -2133,6 +2105,14 @@
             ],
             "data": {
               "map": [
+                {
+                  "key": {
+                    "symbol": "allow_partial_release"
+                  },
+                  "val": {
+                    "bool": false
+                  }
+                },
                 {
                   "key": {
                     "symbol": "amount"
@@ -2198,10 +2178,10 @@
                 },
                 {
                   "key": {
-                    "symbol": "flags"
+                    "symbol": "kyc_compliant"
                   },
                   "val": {
-                    "u32": 2
+                    "bool": false
                   }
                 },
                 {
@@ -2220,6 +2200,14 @@
                     "string": "Multi-party test"
                   }
                 },
+                {
+                  "key": {
+                    "symbol": "multi_party_enabled"
+                  },
+                  "val": {
+                    "bool": true
+                  }
+                },
                 {
                   "key": {
                     "symbol": "recipient"
@@ -2296,6 +2284,22 @@
                             }
                           ]
                         }
+                      },
+                      {
+                        "key": {
+                          "symbol": "oracle_confirmation"
+                        },
+                        "val": {
+                          "bool": false
+                        }
+                      },
+                      {
+                        "key": {
+                          "symbol": "recipient_approval"
+                        },
+                        "val": {
+                          "bool": false
+                        }
                       }
                     ]
                   }
diff --git a/contracts/test_snapshots/payment_escrow/test/test_setup_multi_party_duplicate_rejected.1.json b/contracts/test_snapshots/payment_escrow/test/test_setup_multi_party_duplicate_rejected.1.json
index d77c346..696ef19 100644
--- a/contracts/test_snapshots/payment_escrow/test/test_setup_multi_party_duplicate_rejected.1.json
+++ b/contracts/test_snapshots/payment_escrow/test/test_setup_multi_party_duplicate_rejected.1.json
@@ -477,16 +477,7 @@
         {
           "contract_data": {
             "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-            "key": {
-              "vec": [
-                {
-                  "symbol": "Escrow"
-                },
-                {
-                  "u64": 1
-                }
-              ]
-            },
+            "key": "ledger_key_contract_instance",
             "durability": "persistent"
           }
         },
@@ -497,360 +488,341 @@
               "contract_data": {
                 "ext": "v0",
                 "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-                "key": {
-                  "vec": [
-                    {
-                      "symbol": "Escrow"
-                    },
-                    {
-                      "u64": 1
-                    }
-                  ]
-                },
+                "key": "ledger_key_contract_instance",
                 "durability": "persistent",
                 "val": {
-                  "map": [
-                    {
-                      "key": {
-                        "symbol": "amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 5000
-                        }
-                      }
+                  "contract_instance": {
+                    "executable": {
+                      "wasm": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
                     },
-                    {
-                      "key": {
-                        "symbol": "asset"
-                      },
-                      "val": {
-                        "map": [
-                          {
-                            "key": {
-                              "symbol": "code"
-                            },
-                            "val": {
-                              "string": "USDC"
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "issuer"
-                            },
-                            "val": {
-                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
+                    "storage": [
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "Admin"
                             }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "created_at"
-                      },
-                      "val": {
-                        "u64": 1000
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "deposited_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 5000
-                        }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "escrow_id"
-                      },
-                      "val": {
-                        "u64": 1
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "flags"
-                      },
-                      "val": {
-                        "u32": 2
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "last_deposit_at"
-                      },
-                      "val": {
-                        "u64": 1000
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "memo"
-                      },
-                      "val": {
-                        "string": "Multi-party test"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "recipient"
-                      },
-                      "val": {
-                        "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "refund_timestamp"
-                      },
-                      "val": {
-                        "u64": 0
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "refunded_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 0
+                          ]
+                        },
+                        "val": {
+                          "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "release_conditions"
                       },
-                      "val": {
-                        "map": [
-                          {
-                            "key": {
-                              "symbol": "conditions"
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "Escrow"
                             },
-                            "val": {
-                              "vec": []
+                            {
+                              "u64": 1
                             }
-                          },
-                          {
-                            "key": {
-                              "symbol": "current_approvals"
+                          ]
+                        },
+                        "val": {
+                          "map": [
+                            {
+                              "key": {
+                                "symbol": "allow_partial_release"
+                              },
+                              "val": {
+                                "bool": false
+                              }
                             },
-                            "val": {
-                              "u32": 0
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "expiration_timestamp"
+                            {
+                              "key": {
+                                "symbol": "amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 5000
+                                }
+                              }
                             },
-                            "val": {
-                              "u64": 10000
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "min_approvals"
+                            {
+                              "key": {
+                                "symbol": "asset"
+                              },
+                              "val": {
+                                "map": [
+                                  {
+                                    "key": {
+                                      "symbol": "code"
+                                    },
+                                    "val": {
+                                      "string": "USDC"
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "issuer"
+                                    },
+                                    "val": {
+                                      "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
+                                    }
+                                  }
+                                ]
+                              }
                             },
-                            "val": {
-                              "u32": 1
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "operator"
+                            {
+                              "key": {
+                                "symbol": "created_at"
+                              },
+                              "val": {
+                                "u64": 1000
+                              }
                             },
-                            "val": {
-                              "vec": [
-                                {
-                                  "symbol": "And"
+                            {
+                              "key": {
+                                "symbol": "deposited_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 5000
                                 }
-                              ]
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "escrow_id"
+                              },
+                              "val": {
+                                "u64": 1
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "kyc_compliant"
+                              },
+                              "val": {
+                                "bool": false
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "last_deposit_at"
+                              },
+                              "val": {
+                                "u64": 1000
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "memo"
+                              },
+                              "val": {
+                                "string": "Multi-party test"
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "multi_party_enabled"
+                              },
+                              "val": {
+                                "bool": true
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "recipient"
+                              },
+                              "val": {
+                                "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "refund_timestamp"
+                              },
+                              "val": {
+                                "u64": 0
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "refunded_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 0
+                                }
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "release_conditions"
+                              },
+                              "val": {
+                                "map": [
+                                  {
+                                    "key": {
+                                      "symbol": "conditions"
+                                    },
+                                    "val": {
+                                      "vec": []
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "current_approvals"
+                                    },
+                                    "val": {
+                                      "u32": 0
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "expiration_timestamp"
+                                    },
+                                    "val": {
+                                      "u64": 10000
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "min_approvals"
+                                    },
+                                    "val": {
+                                      "u32": 1
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "operator"
+                                    },
+                                    "val": {
+                                      "vec": [
+                                        {
+                                          "symbol": "And"
+                                        }
+                                      ]
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "oracle_confirmation"
+                                    },
+                                    "val": {
+                                      "bool": false
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "recipient_approval"
+                                    },
+                                    "val": {
+                                      "bool": false
+                                    }
+                                  }
+                                ]
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "release_timestamp"
+                              },
+                              "val": {
+                                "u64": 0
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "released_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 0
+                                }
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "sender"
+                              },
+                              "val": {
+                                "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "status"
+                              },
+                              "val": {
+                                "vec": [
+                                  {
+                                    "symbol": "Funded"
+                                  }
+                                ]
+                              }
                             }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "release_timestamp"
-                      },
-                      "val": {
-                        "u64": 0
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "released_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 0
+                          ]
                         }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "sender"
-                      },
-                      "val": {
-                        "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "status"
                       },
-                      "val": {
-                        "vec": [
-                          {
-                            "symbol": "Funded"
-                          }
-                        ]
-                      }
-                    }
-                  ]
-                }
-              }
-            },
-            "ext": "v0"
-          },
-          4095
-        ]
-      ],
-      [
-        {
-          "contract_data": {
-            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-            "key": {
-              "vec": [
-                {
-                  "symbol": "EscrowApprovals"
-                },
-                {
-                  "u64": 1
-                }
-              ]
-            },
-            "durability": "persistent"
-          }
-        },
-        [
-          {
-            "last_modified_ledger_seq": 0,
-            "data": {
-              "contract_data": {
-                "ext": "v0",
-                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-                "key": {
-                  "vec": [
-                    {
-                      "symbol": "EscrowApprovals"
-                    },
-                    {
-                      "u64": 1
-                    }
-                  ]
-                },
-                "durability": "persistent",
-                "val": {
-                  "map": [
-                    {
-                      "key": {
-                        "symbol": "approval_timeout"
-                      },
-                      "val": {
-                        "u64": 5000
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "approvals"
-                      },
-                      "val": {
-                        "map": []
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "finalized"
-                      },
-                      "val": {
-                        "bool": false
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "required_approvals"
-                      },
-                      "val": {
-                        "u32": 2
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "whitelisted_approvers"
-                      },
-                      "val": {
-                        "vec": [
-                          {
-                            "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
-                          },
-                          {
-                            "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
-                          }
-                        ]
-                      }
-                    }
-                  ]
-                }
-              }
-            },
-            "ext": "v0"
-          },
-          4095
-        ]
-      ],
-      [
-        {
-          "contract_data": {
-            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-            "key": "ledger_key_contract_instance",
-            "durability": "persistent"
-          }
-        },
-        [
-          {
-            "last_modified_ledger_seq": 0,
-            "data": {
-              "contract_data": {
-                "ext": "v0",
-                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-                "key": "ledger_key_contract_instance",
-                "durability": "persistent",
-                "val": {
-                  "contract_instance": {
-                    "executable": {
-                      "wasm": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
-                    },
-                    "storage": [
                       {
                         "key": {
                           "vec": [
                             {
-                              "symbol": "Admin"
+                              "symbol": "EscrowApprovals"
+                            },
+                            {
+                              "u64": 1
                             }
                           ]
                         },
                         "val": {
-                          "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
+                          "map": [
+                            {
+                              "key": {
+                                "symbol": "approval_timeout"
+                              },
+                              "val": {
+                                "u64": 5000
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "approvals"
+                              },
+                              "val": {
+                                "map": []
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "finalized"
+                              },
+                              "val": {
+                                "bool": false
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "required_approvals"
+                              },
+                              "val": {
+                                "u32": 2
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "whitelisted_approvers"
+                              },
+                              "val": {
+                                "vec": [
+                                  {
+                                    "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
+                                  },
+                                  {
+                                    "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
+                                  }
+                                ]
+                              }
+                            }
+                          ]
                         }
                       },
                       {
diff --git a/contracts/test_snapshots/payment_escrow/test/test_setup_multi_party_invalid_quorum.1.json b/contracts/test_snapshots/payment_escrow/test/test_setup_multi_party_invalid_quorum.1.json
index 328891c..dab7d8a 100644
--- a/contracts/test_snapshots/payment_escrow/test/test_setup_multi_party_invalid_quorum.1.json
+++ b/contracts/test_snapshots/payment_escrow/test/test_setup_multi_party_invalid_quorum.1.json
@@ -403,258 +403,6 @@
           6311999
         ]
       ],
-      [
-        {
-          "contract_data": {
-            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-            "key": {
-              "vec": [
-                {
-                  "symbol": "Escrow"
-                },
-                {
-                  "u64": 1
-                }
-              ]
-            },
-            "durability": "persistent"
-          }
-        },
-        [
-          {
-            "last_modified_ledger_seq": 0,
-            "data": {
-              "contract_data": {
-                "ext": "v0",
-                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-                "key": {
-                  "vec": [
-                    {
-                      "symbol": "Escrow"
-                    },
-                    {
-                      "u64": 1
-                    }
-                  ]
-                },
-                "durability": "persistent",
-                "val": {
-                  "map": [
-                    {
-                      "key": {
-                        "symbol": "amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 5000
-                        }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "asset"
-                      },
-                      "val": {
-                        "map": [
-                          {
-                            "key": {
-                              "symbol": "code"
-                            },
-                            "val": {
-                              "string": "USDC"
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "issuer"
-                            },
-                            "val": {
-                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
-                            }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "created_at"
-                      },
-                      "val": {
-                        "u64": 1000
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "deposited_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 5000
-                        }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "escrow_id"
-                      },
-                      "val": {
-                        "u64": 1
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "flags"
-                      },
-                      "val": {
-                        "u32": 0
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "last_deposit_at"
-                      },
-                      "val": {
-                        "u64": 1000
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "memo"
-                      },
-                      "val": {
-                        "string": "Multi-party test"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "recipient"
-                      },
-                      "val": {
-                        "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "refund_timestamp"
-                      },
-                      "val": {
-                        "u64": 0
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "refunded_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 0
-                        }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "release_conditions"
-                      },
-                      "val": {
-                        "map": [
-                          {
-                            "key": {
-                              "symbol": "conditions"
-                            },
-                            "val": {
-                              "vec": []
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "current_approvals"
-                            },
-                            "val": {
-                              "u32": 0
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "expiration_timestamp"
-                            },
-                            "val": {
-                              "u64": 10000
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "min_approvals"
-                            },
-                            "val": {
-                              "u32": 1
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "operator"
-                            },
-                            "val": {
-                              "vec": [
-                                {
-                                  "symbol": "And"
-                                }
-                              ]
-                            }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "release_timestamp"
-                      },
-                      "val": {
-                        "u64": 0
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "released_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 0
-                        }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "sender"
-                      },
-                      "val": {
-                        "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "status"
-                      },
-                      "val": {
-                        "vec": [
-                          {
-                            "symbol": "Funded"
-                          }
-                        ]
-                      }
-                    }
-                  ]
-                }
-              }
-            },
-            "ext": "v0"
-          },
-          4095
-        ]
-      ],
       [
         {
           "contract_data": {
@@ -690,6 +438,260 @@
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "Escrow"
+                            },
+                            {
+                              "u64": 1
+                            }
+                          ]
+                        },
+                        "val": {
+                          "map": [
+                            {
+                              "key": {
+                                "symbol": "allow_partial_release"
+                              },
+                              "val": {
+                                "bool": false
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 5000
+                                }
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "asset"
+                              },
+                              "val": {
+                                "map": [
+                                  {
+                                    "key": {
+                                      "symbol": "code"
+                                    },
+                                    "val": {
+                                      "string": "USDC"
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "issuer"
+                                    },
+                                    "val": {
+                                      "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
+                                    }
+                                  }
+                                ]
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "created_at"
+                              },
+                              "val": {
+                                "u64": 1000
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "deposited_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 5000
+                                }
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "escrow_id"
+                              },
+                              "val": {
+                                "u64": 1
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "kyc_compliant"
+                              },
+                              "val": {
+                                "bool": false
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "last_deposit_at"
+                              },
+                              "val": {
+                                "u64": 1000
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "memo"
+                              },
+                              "val": {
+                                "string": "Multi-party test"
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "multi_party_enabled"
+                              },
+                              "val": {
+                                "bool": false
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "recipient"
+                              },
+                              "val": {
+                                "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "refund_timestamp"
+                              },
+                              "val": {
+                                "u64": 0
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "refunded_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 0
+                                }
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "release_conditions"
+                              },
+                              "val": {
+                                "map": [
+                                  {
+                                    "key": {
+                                      "symbol": "conditions"
+                                    },
+                                    "val": {
+                                      "vec": []
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "current_approvals"
+                                    },
+                                    "val": {
+                                      "u32": 0
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "expiration_timestamp"
+                                    },
+                                    "val": {
+                                      "u64": 10000
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "min_approvals"
+                                    },
+                                    "val": {
+                                      "u32": 1
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "operator"
+                                    },
+                                    "val": {
+                                      "vec": [
+                                        {
+                                          "symbol": "And"
+                                        }
+                                      ]
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "oracle_confirmation"
+                                    },
+                                    "val": {
+                                      "bool": false
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "recipient_approval"
+                                    },
+                                    "val": {
+                                      "bool": false
+                                    }
+                                  }
+                                ]
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "release_timestamp"
+                              },
+                              "val": {
+                                "u64": 0
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "released_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 0
+                                }
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "sender"
+                              },
+                              "val": {
+                                "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "status"
+                              },
+                              "val": {
+                                "vec": [
+                                  {
+                                    "symbol": "Funded"
+                                  }
+                                ]
+                              }
+                            }
+                          ]
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
diff --git a/contracts/test_snapshots/payment_escrow/test/test_verify_conditions_and_operator.1.json b/contracts/test_snapshots/payment_escrow/test/test_verify_conditions_and_operator.1.json
index dd02d29..0a4d0b5 100644
--- a/contracts/test_snapshots/payment_escrow/test/test_verify_conditions_and_operator.1.json
+++ b/contracts/test_snapshots/payment_escrow/test/test_verify_conditions_and_operator.1.json
@@ -219,16 +219,7 @@
         {
           "contract_data": {
             "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM",
-            "key": {
-              "vec": [
-                {
-                  "symbol": "Escrow"
-                },
-                {
-                  "u64": 1
-                }
-              ]
-            },
+            "key": "ledger_key_contract_instance",
             "durability": "persistent"
           }
         },
@@ -239,354 +230,365 @@
               "contract_data": {
                 "ext": "v0",
                 "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM",
-                "key": {
-                  "vec": [
-                    {
-                      "symbol": "Escrow"
-                    },
-                    {
-                      "u64": 1
-                    }
-                  ]
-                },
+                "key": "ledger_key_contract_instance",
                 "durability": "persistent",
                 "val": {
-                  "map": [
-                    {
-                      "key": {
-                        "symbol": "amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 1000
-                        }
-                      }
+                  "contract_instance": {
+                    "executable": {
+                      "wasm": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
                     },
-                    {
-                      "key": {
-                        "symbol": "asset"
+                    "storage": [
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "Admin"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
+                        }
                       },
-                      "val": {
-                        "map": [
-                          {
-                            "key": {
-                              "symbol": "code"
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "Escrow"
                             },
-                            "val": {
-                              "string": "USDC"
+                            {
+                              "u64": 1
                             }
-                          },
-                          {
-                            "key": {
-                              "symbol": "issuer"
+                          ]
+                        },
+                        "val": {
+                          "map": [
+                            {
+                              "key": {
+                                "symbol": "allow_partial_release"
+                              },
+                              "val": {
+                                "bool": false
+                              }
                             },
-                            "val": {
-                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
-                            }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "created_at"
-                      },
-                      "val": {
-                        "u64": 1000
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "deposited_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 0
-                        }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "escrow_id"
-                      },
-                      "val": {
-                        "u64": 1
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "flags"
-                      },
-                      "val": {
-                        "u32": 0
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "last_deposit_at"
-                      },
-                      "val": {
-                        "u64": 0
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "memo"
-                      },
-                      "val": {
-                        "string": "Test"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "recipient"
-                      },
-                      "val": {
-                        "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "refund_timestamp"
-                      },
-                      "val": {
-                        "u64": 0
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "refunded_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 0
-                        }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "release_conditions"
-                      },
-                      "val": {
-                        "map": [
-                          {
-                            "key": {
-                              "symbol": "conditions"
+                            {
+                              "key": {
+                                "symbol": "amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 1000
+                                }
+                              }
                             },
-                            "val": {
-                              "vec": [
-                                {
-                                  "map": [
-                                    {
-                                      "key": {
-                                        "symbol": "condition_type"
-                                      },
-                                      "val": {
-                                        "vec": [
-                                          {
-                                            "symbol": "Timestamp"
-                                          }
-                                        ]
-                                      }
+                            {
+                              "key": {
+                                "symbol": "asset"
+                              },
+                              "val": {
+                                "map": [
+                                  {
+                                    "key": {
+                                      "symbol": "code"
                                     },
-                                    {
-                                      "key": {
-                                        "symbol": "required"
-                                      },
-                                      "val": {
-                                        "bool": true
-                                      }
+                                    "val": {
+                                      "string": "USDC"
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "issuer"
                                     },
-                                    {
-                                      "key": {
-                                        "symbol": "threshold_value"
-                                      },
-                                      "val": {
-                                        "i128": {
-                                          "hi": 0,
-                                          "lo": 0
+                                    "val": {
+                                      "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
+                                    }
+                                  }
+                                ]
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "created_at"
+                              },
+                              "val": {
+                                "u64": 1000
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "deposited_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 0
+                                }
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "escrow_id"
+                              },
+                              "val": {
+                                "u64": 1
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "kyc_compliant"
+                              },
+                              "val": {
+                                "bool": false
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "last_deposit_at"
+                              },
+                              "val": {
+                                "u64": 0
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "memo"
+                              },
+                              "val": {
+                                "string": "Test"
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "multi_party_enabled"
+                              },
+                              "val": {
+                                "bool": false
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "recipient"
+                              },
+                              "val": {
+                                "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "refund_timestamp"
+                              },
+                              "val": {
+                                "u64": 0
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "refunded_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 0
+                                }
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "release_conditions"
+                              },
+                              "val": {
+                                "map": [
+                                  {
+                                    "key": {
+                                      "symbol": "conditions"
+                                    },
+                                    "val": {
+                                      "vec": [
+                                        {
+                                          "map": [
+                                            {
+                                              "key": {
+                                                "symbol": "condition_type"
+                                              },
+                                              "val": {
+                                                "vec": [
+                                                  {
+                                                    "symbol": "Timestamp"
+                                                  }
+                                                ]
+                                              }
+                                            },
+                                            {
+                                              "key": {
+                                                "symbol": "required"
+                                              },
+                                              "val": {
+                                                "bool": true
+                                              }
+                                            },
+                                            {
+                                              "key": {
+                                                "symbol": "threshold_value"
+                                              },
+                                              "val": {
+                                                "i128": {
+                                                  "hi": 0,
+                                                  "lo": 0
+                                                }
+                                              }
+                                            },
+                                            {
+                                              "key": {
+                                                "symbol": "verified"
+                                              },
+                                              "val": {
+                                                "bool": true
+                                              }
+                                            }
+                                          ]
+                                        },
+                                        {
+                                          "map": [
+                                            {
+                                              "key": {
+                                                "symbol": "condition_type"
+                                              },
+                                              "val": {
+                                                "vec": [
+                                                  {
+                                                    "symbol": "OraclePrice"
+                                                  }
+                                                ]
+                                              }
+                                            },
+                                            {
+                                              "key": {
+                                                "symbol": "required"
+                                              },
+                                              "val": {
+                                                "bool": true
+                                              }
+                                            },
+                                            {
+                                              "key": {
+                                                "symbol": "threshold_value"
+                                              },
+                                              "val": {
+                                                "i128": {
+                                                  "hi": 0,
+                                                  "lo": 100
+                                                }
+                                              }
+                                            },
+                                            {
+                                              "key": {
+                                                "symbol": "verified"
+                                              },
+                                              "val": {
+                                                "bool": true
+                                              }
+                                            }
+                                          ]
                                         }
-                                      }
+                                      ]
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "current_approvals"
                                     },
-                                    {
-                                      "key": {
-                                        "symbol": "verified"
-                                      },
-                                      "val": {
-                                        "bool": true
-                                      }
+                                    "val": {
+                                      "u32": 0
                                     }
-                                  ]
-                                },
-                                {
-                                  "map": [
-                                    {
-                                      "key": {
-                                        "symbol": "condition_type"
-                                      },
-                                      "val": {
-                                        "vec": [
-                                          {
-                                            "symbol": "OraclePrice"
-                                          }
-                                        ]
-                                      }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "expiration_timestamp"
+                                    },
+                                    "val": {
+                                      "u64": 2000
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "min_approvals"
                                     },
-                                    {
-                                      "key": {
-                                        "symbol": "required"
-                                      },
-                                      "val": {
-                                        "bool": true
-                                      }
+                                    "val": {
+                                      "u32": 1
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "operator"
                                     },
-                                    {
-                                      "key": {
-                                        "symbol": "threshold_value"
-                                      },
-                                      "val": {
-                                        "i128": {
-                                          "hi": 0,
-                                          "lo": 100
+                                    "val": {
+                                      "vec": [
+                                        {
+                                          "symbol": "And"
                                         }
-                                      }
+                                      ]
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "oracle_confirmation"
                                     },
-                                    {
-                                      "key": {
-                                        "symbol": "verified"
-                                      },
-                                      "val": {
-                                        "bool": true
-                                      }
+                                    "val": {
+                                      "bool": false
                                     }
-                                  ]
-                                }
-                              ]
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "current_approvals"
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "recipient_approval"
+                                    },
+                                    "val": {
+                                      "bool": false
+                                    }
+                                  }
+                                ]
+                              }
                             },
-                            "val": {
-                              "u32": 0
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "expiration_timestamp"
+                            {
+                              "key": {
+                                "symbol": "release_timestamp"
+                              },
+                              "val": {
+                                "u64": 0
+                              }
                             },
-                            "val": {
-                              "u64": 2000
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "min_approvals"
+                            {
+                              "key": {
+                                "symbol": "released_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 0
+                                }
+                              }
                             },
-                            "val": {
-                              "u32": 1
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "operator"
+                            {
+                              "key": {
+                                "symbol": "sender"
+                              },
+                              "val": {
+                                "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
+                              }
                             },
-                            "val": {
-                              "vec": [
-                                {
-                                  "symbol": "And"
-                                }
-                              ]
-                            }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "release_timestamp"
-                      },
-                      "val": {
-                        "u64": 0
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "released_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 0
-                        }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "sender"
-                      },
-                      "val": {
-                        "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "status"
-                      },
-                      "val": {
-                        "vec": [
-                          {
-                            "symbol": "Pending"
-                          }
-                        ]
-                      }
-                    }
-                  ]
-                }
-              }
-            },
-            "ext": "v0"
-          },
-          4095
-        ]
-      ],
-      [
-        {
-          "contract_data": {
-            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM",
-            "key": "ledger_key_contract_instance",
-            "durability": "persistent"
-          }
-        },
-        [
-          {
-            "last_modified_ledger_seq": 0,
-            "data": {
-              "contract_data": {
-                "ext": "v0",
-                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM",
-                "key": "ledger_key_contract_instance",
-                "durability": "persistent",
-                "val": {
-                  "contract_instance": {
-                    "executable": {
-                      "wasm": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
-                    },
-                    "storage": [
-                      {
-                        "key": {
-                          "vec": [
                             {
-                              "symbol": "Admin"
+                              "key": {
+                                "symbol": "status"
+                              },
+                              "val": {
+                                "vec": [
+                                  {
+                                    "symbol": "Pending"
+                                  }
+                                ]
+                              }
                             }
                           ]
-                        },
-                        "val": {
-                          "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
                         }
                       },
                       {
diff --git a/contracts/test_snapshots/payment_escrow/test/test_verify_conditions_approval.1.json b/contracts/test_snapshots/payment_escrow/test/test_verify_conditions_approval.1.json
index 40b614d..bab42be 100644
--- a/contracts/test_snapshots/payment_escrow/test/test_verify_conditions_approval.1.json
+++ b/contracts/test_snapshots/payment_escrow/test/test_verify_conditions_approval.1.json
@@ -221,16 +221,7 @@
         {
           "contract_data": {
             "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM",
-            "key": {
-              "vec": [
-                {
-                  "symbol": "Escrow"
-                },
-                {
-                  "u64": 1
-                }
-              ]
-            },
+            "key": "ledger_key_contract_instance",
             "durability": "persistent"
           }
         },
@@ -241,311 +232,322 @@
               "contract_data": {
                 "ext": "v0",
                 "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM",
-                "key": {
-                  "vec": [
-                    {
-                      "symbol": "Escrow"
-                    },
-                    {
-                      "u64": 1
-                    }
-                  ]
-                },
+                "key": "ledger_key_contract_instance",
                 "durability": "persistent",
                 "val": {
-                  "map": [
-                    {
-                      "key": {
-                        "symbol": "amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 1000
-                        }
-                      }
+                  "contract_instance": {
+                    "executable": {
+                      "wasm": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
                     },
-                    {
-                      "key": {
-                        "symbol": "asset"
+                    "storage": [
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "Admin"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
+                        }
                       },
-                      "val": {
-                        "map": [
-                          {
-                            "key": {
-                              "symbol": "code"
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "Escrow"
                             },
-                            "val": {
-                              "string": "USDC"
+                            {
+                              "u64": 1
                             }
-                          },
-                          {
-                            "key": {
-                              "symbol": "issuer"
+                          ]
+                        },
+                        "val": {
+                          "map": [
+                            {
+                              "key": {
+                                "symbol": "allow_partial_release"
+                              },
+                              "val": {
+                                "bool": false
+                              }
                             },
-                            "val": {
-                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
-                            }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "created_at"
-                      },
-                      "val": {
-                        "u64": 0
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "deposited_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 0
-                        }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "escrow_id"
-                      },
-                      "val": {
-                        "u64": 1
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "flags"
-                      },
-                      "val": {
-                        "u32": 0
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "last_deposit_at"
-                      },
-                      "val": {
-                        "u64": 0
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "memo"
-                      },
-                      "val": {
-                        "string": "Test"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "recipient"
-                      },
-                      "val": {
-                        "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "refund_timestamp"
-                      },
-                      "val": {
-                        "u64": 0
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "refunded_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 0
-                        }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "release_conditions"
-                      },
-                      "val": {
-                        "map": [
-                          {
-                            "key": {
-                              "symbol": "conditions"
+                            {
+                              "key": {
+                                "symbol": "amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 1000
+                                }
+                              }
                             },
-                            "val": {
-                              "vec": [
-                                {
-                                  "map": [
-                                    {
-                                      "key": {
-                                        "symbol": "condition_type"
-                                      },
-                                      "val": {
-                                        "vec": [
-                                          {
-                                            "symbol": "Approval"
-                                          }
-                                        ]
-                                      }
-                                    },
-                                    {
-                                      "key": {
-                                        "symbol": "required"
-                                      },
-                                      "val": {
-                                        "bool": true
-                                      }
+                            {
+                              "key": {
+                                "symbol": "asset"
+                              },
+                              "val": {
+                                "map": [
+                                  {
+                                    "key": {
+                                      "symbol": "code"
                                     },
-                                    {
-                                      "key": {
-                                        "symbol": "threshold_value"
-                                      },
-                                      "val": {
-                                        "i128": {
-                                          "hi": 0,
-                                          "lo": 0
-                                        }
-                                      }
+                                    "val": {
+                                      "string": "USDC"
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "issuer"
                                     },
-                                    {
-                                      "key": {
-                                        "symbol": "verified"
-                                      },
-                                      "val": {
-                                        "bool": true
-                                      }
+                                    "val": {
+                                      "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
                                     }
-                                  ]
+                                  }
+                                ]
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "created_at"
+                              },
+                              "val": {
+                                "u64": 0
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "deposited_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 0
                                 }
-                              ]
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "current_approvals"
+                              }
                             },
-                            "val": {
-                              "u32": 2
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "expiration_timestamp"
+                            {
+                              "key": {
+                                "symbol": "escrow_id"
+                              },
+                              "val": {
+                                "u64": 1
+                              }
                             },
-                            "val": {
-                              "u64": 2000
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "min_approvals"
+                            {
+                              "key": {
+                                "symbol": "kyc_compliant"
+                              },
+                              "val": {
+                                "bool": false
+                              }
                             },
-                            "val": {
-                              "u32": 2
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "operator"
+                            {
+                              "key": {
+                                "symbol": "last_deposit_at"
+                              },
+                              "val": {
+                                "u64": 0
+                              }
                             },
-                            "val": {
-                              "vec": [
-                                {
-                                  "symbol": "And"
+                            {
+                              "key": {
+                                "symbol": "memo"
+                              },
+                              "val": {
+                                "string": "Test"
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "multi_party_enabled"
+                              },
+                              "val": {
+                                "bool": false
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "recipient"
+                              },
+                              "val": {
+                                "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "refund_timestamp"
+                              },
+                              "val": {
+                                "u64": 0
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "refunded_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 0
                                 }
-                              ]
-                            }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "release_timestamp"
-                      },
-                      "val": {
-                        "u64": 0
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "released_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 0
-                        }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "sender"
-                      },
-                      "val": {
-                        "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "status"
-                      },
-                      "val": {
-                        "vec": [
-                          {
-                            "symbol": "Pending"
-                          }
-                        ]
-                      }
-                    }
-                  ]
-                }
-              }
-            },
-            "ext": "v0"
-          },
-          4095
-        ]
-      ],
-      [
-        {
-          "contract_data": {
-            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM",
-            "key": "ledger_key_contract_instance",
-            "durability": "persistent"
-          }
-        },
-        [
-          {
-            "last_modified_ledger_seq": 0,
-            "data": {
-              "contract_data": {
-                "ext": "v0",
-                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM",
-                "key": "ledger_key_contract_instance",
-                "durability": "persistent",
-                "val": {
-                  "contract_instance": {
-                    "executable": {
-                      "wasm": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
-                    },
-                    "storage": [
-                      {
-                        "key": {
-                          "vec": [
+                              }
+                            },
                             {
-                              "symbol": "Admin"
+                              "key": {
+                                "symbol": "release_conditions"
+                              },
+                              "val": {
+                                "map": [
+                                  {
+                                    "key": {
+                                      "symbol": "conditions"
+                                    },
+                                    "val": {
+                                      "vec": [
+                                        {
+                                          "map": [
+                                            {
+                                              "key": {
+                                                "symbol": "condition_type"
+                                              },
+                                              "val": {
+                                                "vec": [
+                                                  {
+                                                    "symbol": "Approval"
+                                                  }
+                                                ]
+                                              }
+                                            },
+                                            {
+                                              "key": {
+                                                "symbol": "required"
+                                              },
+                                              "val": {
+                                                "bool": true
+                                              }
+                                            },
+                                            {
+                                              "key": {
+                                                "symbol": "threshold_value"
+                                              },
+                                              "val": {
+                                                "i128": {
+                                                  "hi": 0,
+                                                  "lo": 0
+                                                }
+                                              }
+                                            },
+                                            {
+                                              "key": {
+                                                "symbol": "verified"
+                                              },
+                                              "val": {
+                                                "bool": true
+                                              }
+                                            }
+                                          ]
+                                        }
+                                      ]
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "current_approvals"
+                                    },
+                                    "val": {
+                                      "u32": 2
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "expiration_timestamp"
+                                    },
+                                    "val": {
+                                      "u64": 2000
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "min_approvals"
+                                    },
+                                    "val": {
+                                      "u32": 2
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "operator"
+                                    },
+                                    "val": {
+                                      "vec": [
+                                        {
+                                          "symbol": "And"
+                                        }
+                                      ]
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "oracle_confirmation"
+                                    },
+                                    "val": {
+                                      "bool": false
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "recipient_approval"
+                                    },
+                                    "val": {
+                                      "bool": false
+                                    }
+                                  }
+                                ]
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "release_timestamp"
+                              },
+                              "val": {
+                                "u64": 0
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "released_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 0
+                                }
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "sender"
+                              },
+                              "val": {
+                                "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "status"
+                              },
+                              "val": {
+                                "vec": [
+                                  {
+                                    "symbol": "Pending"
+                                  }
+                                ]
+                              }
                             }
                           ]
-                        },
-                        "val": {
-                          "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
                         }
                       },
                       {
diff --git a/contracts/test_snapshots/payment_escrow/test/test_verify_conditions_or_operator.1.json b/contracts/test_snapshots/payment_escrow/test/test_verify_conditions_or_operator.1.json
index d788f5e..16e07b7 100644
--- a/contracts/test_snapshots/payment_escrow/test/test_verify_conditions_or_operator.1.json
+++ b/contracts/test_snapshots/payment_escrow/test/test_verify_conditions_or_operator.1.json
@@ -219,16 +219,7 @@
         {
           "contract_data": {
             "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM",
-            "key": {
-              "vec": [
-                {
-                  "symbol": "Escrow"
-                },
-                {
-                  "u64": 1
-                }
-              ]
-            },
+            "key": "ledger_key_contract_instance",
             "durability": "persistent"
           }
         },
@@ -239,354 +230,365 @@
               "contract_data": {
                 "ext": "v0",
                 "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM",
-                "key": {
-                  "vec": [
-                    {
-                      "symbol": "Escrow"
-                    },
-                    {
-                      "u64": 1
-                    }
-                  ]
-                },
+                "key": "ledger_key_contract_instance",
                 "durability": "persistent",
                 "val": {
-                  "map": [
-                    {
-                      "key": {
-                        "symbol": "amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 1000
-                        }
-                      }
+                  "contract_instance": {
+                    "executable": {
+                      "wasm": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
                     },
-                    {
-                      "key": {
-                        "symbol": "asset"
+                    "storage": [
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "Admin"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
+                        }
                       },
-                      "val": {
-                        "map": [
-                          {
-                            "key": {
-                              "symbol": "code"
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "Escrow"
                             },
-                            "val": {
-                              "string": "USDC"
+                            {
+                              "u64": 1
                             }
-                          },
-                          {
-                            "key": {
-                              "symbol": "issuer"
+                          ]
+                        },
+                        "val": {
+                          "map": [
+                            {
+                              "key": {
+                                "symbol": "allow_partial_release"
+                              },
+                              "val": {
+                                "bool": false
+                              }
                             },
-                            "val": {
-                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
-                            }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "created_at"
-                      },
-                      "val": {
-                        "u64": 1000
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "deposited_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 0
-                        }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "escrow_id"
-                      },
-                      "val": {
-                        "u64": 1
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "flags"
-                      },
-                      "val": {
-                        "u32": 0
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "last_deposit_at"
-                      },
-                      "val": {
-                        "u64": 0
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "memo"
-                      },
-                      "val": {
-                        "string": "Test"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "recipient"
-                      },
-                      "val": {
-                        "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "refund_timestamp"
-                      },
-                      "val": {
-                        "u64": 0
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "refunded_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 0
-                        }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "release_conditions"
-                      },
-                      "val": {
-                        "map": [
-                          {
-                            "key": {
-                              "symbol": "conditions"
+                            {
+                              "key": {
+                                "symbol": "amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 1000
+                                }
+                              }
                             },
-                            "val": {
-                              "vec": [
-                                {
-                                  "map": [
-                                    {
-                                      "key": {
-                                        "symbol": "condition_type"
-                                      },
-                                      "val": {
-                                        "vec": [
-                                          {
-                                            "symbol": "Timestamp"
-                                          }
-                                        ]
-                                      }
+                            {
+                              "key": {
+                                "symbol": "asset"
+                              },
+                              "val": {
+                                "map": [
+                                  {
+                                    "key": {
+                                      "symbol": "code"
                                     },
-                                    {
-                                      "key": {
-                                        "symbol": "required"
-                                      },
-                                      "val": {
-                                        "bool": true
-                                      }
+                                    "val": {
+                                      "string": "USDC"
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "issuer"
                                     },
-                                    {
-                                      "key": {
-                                        "symbol": "threshold_value"
-                                      },
-                                      "val": {
-                                        "i128": {
-                                          "hi": 0,
-                                          "lo": 0
+                                    "val": {
+                                      "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
+                                    }
+                                  }
+                                ]
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "created_at"
+                              },
+                              "val": {
+                                "u64": 1000
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "deposited_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 0
+                                }
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "escrow_id"
+                              },
+                              "val": {
+                                "u64": 1
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "kyc_compliant"
+                              },
+                              "val": {
+                                "bool": false
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "last_deposit_at"
+                              },
+                              "val": {
+                                "u64": 0
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "memo"
+                              },
+                              "val": {
+                                "string": "Test"
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "multi_party_enabled"
+                              },
+                              "val": {
+                                "bool": false
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "recipient"
+                              },
+                              "val": {
+                                "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "refund_timestamp"
+                              },
+                              "val": {
+                                "u64": 0
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "refunded_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 0
+                                }
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "release_conditions"
+                              },
+                              "val": {
+                                "map": [
+                                  {
+                                    "key": {
+                                      "symbol": "conditions"
+                                    },
+                                    "val": {
+                                      "vec": [
+                                        {
+                                          "map": [
+                                            {
+                                              "key": {
+                                                "symbol": "condition_type"
+                                              },
+                                              "val": {
+                                                "vec": [
+                                                  {
+                                                    "symbol": "Timestamp"
+                                                  }
+                                                ]
+                                              }
+                                            },
+                                            {
+                                              "key": {
+                                                "symbol": "required"
+                                              },
+                                              "val": {
+                                                "bool": true
+                                              }
+                                            },
+                                            {
+                                              "key": {
+                                                "symbol": "threshold_value"
+                                              },
+                                              "val": {
+                                                "i128": {
+                                                  "hi": 0,
+                                                  "lo": 0
+                                                }
+                                              }
+                                            },
+                                            {
+                                              "key": {
+                                                "symbol": "verified"
+                                              },
+                                              "val": {
+                                                "bool": false
+                                              }
+                                            }
+                                          ]
+                                        },
+                                        {
+                                          "map": [
+                                            {
+                                              "key": {
+                                                "symbol": "condition_type"
+                                              },
+                                              "val": {
+                                                "vec": [
+                                                  {
+                                                    "symbol": "OraclePrice"
+                                                  }
+                                                ]
+                                              }
+                                            },
+                                            {
+                                              "key": {
+                                                "symbol": "required"
+                                              },
+                                              "val": {
+                                                "bool": true
+                                              }
+                                            },
+                                            {
+                                              "key": {
+                                                "symbol": "threshold_value"
+                                              },
+                                              "val": {
+                                                "i128": {
+                                                  "hi": 0,
+                                                  "lo": 100
+                                                }
+                                              }
+                                            },
+                                            {
+                                              "key": {
+                                                "symbol": "verified"
+                                              },
+                                              "val": {
+                                                "bool": true
+                                              }
+                                            }
+                                          ]
                                         }
-                                      }
+                                      ]
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "current_approvals"
                                     },
-                                    {
-                                      "key": {
-                                        "symbol": "verified"
-                                      },
-                                      "val": {
-                                        "bool": false
-                                      }
+                                    "val": {
+                                      "u32": 0
                                     }
-                                  ]
-                                },
-                                {
-                                  "map": [
-                                    {
-                                      "key": {
-                                        "symbol": "condition_type"
-                                      },
-                                      "val": {
-                                        "vec": [
-                                          {
-                                            "symbol": "OraclePrice"
-                                          }
-                                        ]
-                                      }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "expiration_timestamp"
+                                    },
+                                    "val": {
+                                      "u64": 2000
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "min_approvals"
                                     },
-                                    {
-                                      "key": {
-                                        "symbol": "required"
-                                      },
-                                      "val": {
-                                        "bool": true
-                                      }
+                                    "val": {
+                                      "u32": 1
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "operator"
                                     },
-                                    {
-                                      "key": {
-                                        "symbol": "threshold_value"
-                                      },
-                                      "val": {
-                                        "i128": {
-                                          "hi": 0,
-                                          "lo": 100
+                                    "val": {
+                                      "vec": [
+                                        {
+                                          "symbol": "Or"
                                         }
-                                      }
+                                      ]
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "oracle_confirmation"
                                     },
-                                    {
-                                      "key": {
-                                        "symbol": "verified"
-                                      },
-                                      "val": {
-                                        "bool": true
-                                      }
+                                    "val": {
+                                      "bool": false
                                     }
-                                  ]
-                                }
-                              ]
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "current_approvals"
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "recipient_approval"
+                                    },
+                                    "val": {
+                                      "bool": false
+                                    }
+                                  }
+                                ]
+                              }
                             },
-                            "val": {
-                              "u32": 0
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "expiration_timestamp"
+                            {
+                              "key": {
+                                "symbol": "release_timestamp"
+                              },
+                              "val": {
+                                "u64": 0
+                              }
                             },
-                            "val": {
-                              "u64": 2000
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "min_approvals"
+                            {
+                              "key": {
+                                "symbol": "released_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 0
+                                }
+                              }
                             },
-                            "val": {
-                              "u32": 1
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "operator"
+                            {
+                              "key": {
+                                "symbol": "sender"
+                              },
+                              "val": {
+                                "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
+                              }
                             },
-                            "val": {
-                              "vec": [
-                                {
-                                  "symbol": "Or"
-                                }
-                              ]
-                            }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "release_timestamp"
-                      },
-                      "val": {
-                        "u64": 0
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "released_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 0
-                        }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "sender"
-                      },
-                      "val": {
-                        "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "status"
-                      },
-                      "val": {
-                        "vec": [
-                          {
-                            "symbol": "Pending"
-                          }
-                        ]
-                      }
-                    }
-                  ]
-                }
-              }
-            },
-            "ext": "v0"
-          },
-          4095
-        ]
-      ],
-      [
-        {
-          "contract_data": {
-            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM",
-            "key": "ledger_key_contract_instance",
-            "durability": "persistent"
-          }
-        },
-        [
-          {
-            "last_modified_ledger_seq": 0,
-            "data": {
-              "contract_data": {
-                "ext": "v0",
-                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM",
-                "key": "ledger_key_contract_instance",
-                "durability": "persistent",
-                "val": {
-                  "contract_instance": {
-                    "executable": {
-                      "wasm": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
-                    },
-                    "storage": [
-                      {
-                        "key": {
-                          "vec": [
                             {
-                              "symbol": "Admin"
+                              "key": {
+                                "symbol": "status"
+                              },
+                              "val": {
+                                "vec": [
+                                  {
+                                    "symbol": "Pending"
+                                  }
+                                ]
+                              }
                             }
                           ]
-                        },
-                        "val": {
-                          "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
                         }
                       },
                       {
diff --git a/contracts/test_snapshots/payment_escrow/test/test_verify_conditions_oracle_price.1.json b/contracts/test_snapshots/payment_escrow/test/test_verify_conditions_oracle_price.1.json
index 0433096..1f0b988 100644
--- a/contracts/test_snapshots/payment_escrow/test/test_verify_conditions_oracle_price.1.json
+++ b/contracts/test_snapshots/payment_escrow/test/test_verify_conditions_oracle_price.1.json
@@ -153,16 +153,7 @@
         {
           "contract_data": {
             "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM",
-            "key": {
-              "vec": [
-                {
-                  "symbol": "Escrow"
-                },
-                {
-                  "u64": 1
-                }
-              ]
-            },
+            "key": "ledger_key_contract_instance",
             "durability": "persistent"
           }
         },
@@ -173,311 +164,322 @@
               "contract_data": {
                 "ext": "v0",
                 "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM",
-                "key": {
-                  "vec": [
-                    {
-                      "symbol": "Escrow"
-                    },
-                    {
-                      "u64": 1
-                    }
-                  ]
-                },
+                "key": "ledger_key_contract_instance",
                 "durability": "persistent",
                 "val": {
-                  "map": [
-                    {
-                      "key": {
-                        "symbol": "amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 1000
-                        }
-                      }
+                  "contract_instance": {
+                    "executable": {
+                      "wasm": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
                     },
-                    {
-                      "key": {
-                        "symbol": "asset"
+                    "storage": [
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "Admin"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
+                        }
                       },
-                      "val": {
-                        "map": [
-                          {
-                            "key": {
-                              "symbol": "code"
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "Escrow"
                             },
-                            "val": {
-                              "string": "USDC"
+                            {
+                              "u64": 1
                             }
-                          },
-                          {
-                            "key": {
-                              "symbol": "issuer"
+                          ]
+                        },
+                        "val": {
+                          "map": [
+                            {
+                              "key": {
+                                "symbol": "allow_partial_release"
+                              },
+                              "val": {
+                                "bool": false
+                              }
                             },
-                            "val": {
-                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
-                            }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "created_at"
-                      },
-                      "val": {
-                        "u64": 0
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "deposited_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 0
-                        }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "escrow_id"
-                      },
-                      "val": {
-                        "u64": 1
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "flags"
-                      },
-                      "val": {
-                        "u32": 0
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "last_deposit_at"
-                      },
-                      "val": {
-                        "u64": 0
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "memo"
-                      },
-                      "val": {
-                        "string": "Test"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "recipient"
-                      },
-                      "val": {
-                        "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "refund_timestamp"
-                      },
-                      "val": {
-                        "u64": 0
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "refunded_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 0
-                        }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "release_conditions"
-                      },
-                      "val": {
-                        "map": [
-                          {
-                            "key": {
-                              "symbol": "conditions"
+                            {
+                              "key": {
+                                "symbol": "amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 1000
+                                }
+                              }
                             },
-                            "val": {
-                              "vec": [
-                                {
-                                  "map": [
-                                    {
-                                      "key": {
-                                        "symbol": "condition_type"
-                                      },
-                                      "val": {
-                                        "vec": [
-                                          {
-                                            "symbol": "OraclePrice"
-                                          }
-                                        ]
-                                      }
-                                    },
-                                    {
-                                      "key": {
-                                        "symbol": "required"
-                                      },
-                                      "val": {
-                                        "bool": true
-                                      }
+                            {
+                              "key": {
+                                "symbol": "asset"
+                              },
+                              "val": {
+                                "map": [
+                                  {
+                                    "key": {
+                                      "symbol": "code"
                                     },
-                                    {
-                                      "key": {
-                                        "symbol": "threshold_value"
-                                      },
-                                      "val": {
-                                        "i128": {
-                                          "hi": 0,
-                                          "lo": 100
-                                        }
-                                      }
+                                    "val": {
+                                      "string": "USDC"
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "issuer"
                                     },
-                                    {
-                                      "key": {
-                                        "symbol": "verified"
-                                      },
-                                      "val": {
-                                        "bool": false
-                                      }
+                                    "val": {
+                                      "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
                                     }
-                                  ]
+                                  }
+                                ]
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "created_at"
+                              },
+                              "val": {
+                                "u64": 0
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "deposited_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 0
                                 }
-                              ]
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "current_approvals"
+                              }
                             },
-                            "val": {
-                              "u32": 0
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "expiration_timestamp"
+                            {
+                              "key": {
+                                "symbol": "escrow_id"
+                              },
+                              "val": {
+                                "u64": 1
+                              }
                             },
-                            "val": {
-                              "u64": 2000
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "min_approvals"
+                            {
+                              "key": {
+                                "symbol": "kyc_compliant"
+                              },
+                              "val": {
+                                "bool": false
+                              }
                             },
-                            "val": {
-                              "u32": 1
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "operator"
+                            {
+                              "key": {
+                                "symbol": "last_deposit_at"
+                              },
+                              "val": {
+                                "u64": 0
+                              }
                             },
-                            "val": {
-                              "vec": [
-                                {
-                                  "symbol": "And"
+                            {
+                              "key": {
+                                "symbol": "memo"
+                              },
+                              "val": {
+                                "string": "Test"
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "multi_party_enabled"
+                              },
+                              "val": {
+                                "bool": false
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "recipient"
+                              },
+                              "val": {
+                                "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "refund_timestamp"
+                              },
+                              "val": {
+                                "u64": 0
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "refunded_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 0
                                 }
-                              ]
-                            }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "release_timestamp"
-                      },
-                      "val": {
-                        "u64": 0
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "released_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 0
-                        }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "sender"
-                      },
-                      "val": {
-                        "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "status"
-                      },
-                      "val": {
-                        "vec": [
-                          {
-                            "symbol": "Pending"
-                          }
-                        ]
-                      }
-                    }
-                  ]
-                }
-              }
-            },
-            "ext": "v0"
-          },
-          4095
-        ]
-      ],
-      [
-        {
-          "contract_data": {
-            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM",
-            "key": "ledger_key_contract_instance",
-            "durability": "persistent"
-          }
-        },
-        [
-          {
-            "last_modified_ledger_seq": 0,
-            "data": {
-              "contract_data": {
-                "ext": "v0",
-                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM",
-                "key": "ledger_key_contract_instance",
-                "durability": "persistent",
-                "val": {
-                  "contract_instance": {
-                    "executable": {
-                      "wasm": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
-                    },
-                    "storage": [
-                      {
-                        "key": {
-                          "vec": [
+                              }
+                            },
                             {
-                              "symbol": "Admin"
+                              "key": {
+                                "symbol": "release_conditions"
+                              },
+                              "val": {
+                                "map": [
+                                  {
+                                    "key": {
+                                      "symbol": "conditions"
+                                    },
+                                    "val": {
+                                      "vec": [
+                                        {
+                                          "map": [
+                                            {
+                                              "key": {
+                                                "symbol": "condition_type"
+                                              },
+                                              "val": {
+                                                "vec": [
+                                                  {
+                                                    "symbol": "OraclePrice"
+                                                  }
+                                                ]
+                                              }
+                                            },
+                                            {
+                                              "key": {
+                                                "symbol": "required"
+                                              },
+                                              "val": {
+                                                "bool": true
+                                              }
+                                            },
+                                            {
+                                              "key": {
+                                                "symbol": "threshold_value"
+                                              },
+                                              "val": {
+                                                "i128": {
+                                                  "hi": 0,
+                                                  "lo": 100
+                                                }
+                                              }
+                                            },
+                                            {
+                                              "key": {
+                                                "symbol": "verified"
+                                              },
+                                              "val": {
+                                                "bool": false
+                                              }
+                                            }
+                                          ]
+                                        }
+                                      ]
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "current_approvals"
+                                    },
+                                    "val": {
+                                      "u32": 0
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "expiration_timestamp"
+                                    },
+                                    "val": {
+                                      "u64": 2000
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "min_approvals"
+                                    },
+                                    "val": {
+                                      "u32": 1
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "operator"
+                                    },
+                                    "val": {
+                                      "vec": [
+                                        {
+                                          "symbol": "And"
+                                        }
+                                      ]
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "oracle_confirmation"
+                                    },
+                                    "val": {
+                                      "bool": false
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "recipient_approval"
+                                    },
+                                    "val": {
+                                      "bool": false
+                                    }
+                                  }
+                                ]
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "release_timestamp"
+                              },
+                              "val": {
+                                "u64": 0
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "released_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 0
+                                }
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "sender"
+                              },
+                              "val": {
+                                "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "status"
+                              },
+                              "val": {
+                                "vec": [
+                                  {
+                                    "symbol": "Pending"
+                                  }
+                                ]
+                              }
                             }
                           ]
-                        },
-                        "val": {
-                          "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
                         }
                       },
                       {
diff --git a/contracts/test_snapshots/payment_escrow/test/test_verify_conditions_timestamp.1.json b/contracts/test_snapshots/payment_escrow/test/test_verify_conditions_timestamp.1.json
index 32c3fbe..2762c96 100644
--- a/contracts/test_snapshots/payment_escrow/test/test_verify_conditions_timestamp.1.json
+++ b/contracts/test_snapshots/payment_escrow/test/test_verify_conditions_timestamp.1.json
@@ -152,16 +152,7 @@
         {
           "contract_data": {
             "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM",
-            "key": {
-              "vec": [
-                {
-                  "symbol": "Escrow"
-                },
-                {
-                  "u64": 1
-                }
-              ]
-            },
+            "key": "ledger_key_contract_instance",
             "durability": "persistent"
           }
         },
@@ -172,311 +163,322 @@
               "contract_data": {
                 "ext": "v0",
                 "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM",
-                "key": {
-                  "vec": [
-                    {
-                      "symbol": "Escrow"
-                    },
-                    {
-                      "u64": 1
-                    }
-                  ]
-                },
+                "key": "ledger_key_contract_instance",
                 "durability": "persistent",
                 "val": {
-                  "map": [
-                    {
-                      "key": {
-                        "symbol": "amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 1000
-                        }
-                      }
+                  "contract_instance": {
+                    "executable": {
+                      "wasm": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
                     },
-                    {
-                      "key": {
-                        "symbol": "asset"
+                    "storage": [
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "Admin"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
+                        }
                       },
-                      "val": {
-                        "map": [
-                          {
-                            "key": {
-                              "symbol": "code"
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "Escrow"
                             },
-                            "val": {
-                              "string": "USDC"
+                            {
+                              "u64": 1
                             }
-                          },
-                          {
-                            "key": {
-                              "symbol": "issuer"
+                          ]
+                        },
+                        "val": {
+                          "map": [
+                            {
+                              "key": {
+                                "symbol": "allow_partial_release"
+                              },
+                              "val": {
+                                "bool": false
+                              }
                             },
-                            "val": {
-                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
-                            }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "created_at"
-                      },
-                      "val": {
-                        "u64": 1000
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "deposited_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 0
-                        }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "escrow_id"
-                      },
-                      "val": {
-                        "u64": 1
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "flags"
-                      },
-                      "val": {
-                        "u32": 0
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "last_deposit_at"
-                      },
-                      "val": {
-                        "u64": 0
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "memo"
-                      },
-                      "val": {
-                        "string": "Test"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "recipient"
-                      },
-                      "val": {
-                        "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "refund_timestamp"
-                      },
-                      "val": {
-                        "u64": 0
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "refunded_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 0
-                        }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "release_conditions"
-                      },
-                      "val": {
-                        "map": [
-                          {
-                            "key": {
-                              "symbol": "conditions"
+                            {
+                              "key": {
+                                "symbol": "amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 1000
+                                }
+                              }
                             },
-                            "val": {
-                              "vec": [
-                                {
-                                  "map": [
-                                    {
-                                      "key": {
-                                        "symbol": "condition_type"
-                                      },
-                                      "val": {
-                                        "vec": [
-                                          {
-                                            "symbol": "Timestamp"
-                                          }
-                                        ]
-                                      }
-                                    },
-                                    {
-                                      "key": {
-                                        "symbol": "required"
-                                      },
-                                      "val": {
-                                        "bool": true
-                                      }
+                            {
+                              "key": {
+                                "symbol": "asset"
+                              },
+                              "val": {
+                                "map": [
+                                  {
+                                    "key": {
+                                      "symbol": "code"
                                     },
-                                    {
-                                      "key": {
-                                        "symbol": "threshold_value"
-                                      },
-                                      "val": {
-                                        "i128": {
-                                          "hi": 0,
-                                          "lo": 0
-                                        }
-                                      }
+                                    "val": {
+                                      "string": "USDC"
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "issuer"
                                     },
-                                    {
-                                      "key": {
-                                        "symbol": "verified"
-                                      },
-                                      "val": {
-                                        "bool": true
-                                      }
+                                    "val": {
+                                      "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
                                     }
-                                  ]
+                                  }
+                                ]
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "created_at"
+                              },
+                              "val": {
+                                "u64": 1000
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "deposited_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 0
                                 }
-                              ]
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "current_approvals"
+                              }
                             },
-                            "val": {
-                              "u32": 0
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "expiration_timestamp"
+                            {
+                              "key": {
+                                "symbol": "escrow_id"
+                              },
+                              "val": {
+                                "u64": 1
+                              }
                             },
-                            "val": {
-                              "u64": 2000
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "min_approvals"
+                            {
+                              "key": {
+                                "symbol": "kyc_compliant"
+                              },
+                              "val": {
+                                "bool": false
+                              }
                             },
-                            "val": {
-                              "u32": 1
-                            }
-                          },
-                          {
-                            "key": {
-                              "symbol": "operator"
+                            {
+                              "key": {
+                                "symbol": "last_deposit_at"
+                              },
+                              "val": {
+                                "u64": 0
+                              }
                             },
-                            "val": {
-                              "vec": [
-                                {
-                                  "symbol": "And"
+                            {
+                              "key": {
+                                "symbol": "memo"
+                              },
+                              "val": {
+                                "string": "Test"
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "multi_party_enabled"
+                              },
+                              "val": {
+                                "bool": false
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "recipient"
+                              },
+                              "val": {
+                                "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "refund_timestamp"
+                              },
+                              "val": {
+                                "u64": 0
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "refunded_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 0
                                 }
-                              ]
-                            }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "release_timestamp"
-                      },
-                      "val": {
-                        "u64": 0
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "released_amount"
-                      },
-                      "val": {
-                        "i128": {
-                          "hi": 0,
-                          "lo": 0
-                        }
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "sender"
-                      },
-                      "val": {
-                        "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "status"
-                      },
-                      "val": {
-                        "vec": [
-                          {
-                            "symbol": "Pending"
-                          }
-                        ]
-                      }
-                    }
-                  ]
-                }
-              }
-            },
-            "ext": "v0"
-          },
-          4095
-        ]
-      ],
-      [
-        {
-          "contract_data": {
-            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM",
-            "key": "ledger_key_contract_instance",
-            "durability": "persistent"
-          }
-        },
-        [
-          {
-            "last_modified_ledger_seq": 0,
-            "data": {
-              "contract_data": {
-                "ext": "v0",
-                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM",
-                "key": "ledger_key_contract_instance",
-                "durability": "persistent",
-                "val": {
-                  "contract_instance": {
-                    "executable": {
-                      "wasm": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
-                    },
-                    "storage": [
-                      {
-                        "key": {
-                          "vec": [
+                              }
+                            },
                             {
-                              "symbol": "Admin"
+                              "key": {
+                                "symbol": "release_conditions"
+                              },
+                              "val": {
+                                "map": [
+                                  {
+                                    "key": {
+                                      "symbol": "conditions"
+                                    },
+                                    "val": {
+                                      "vec": [
+                                        {
+                                          "map": [
+                                            {
+                                              "key": {
+                                                "symbol": "condition_type"
+                                              },
+                                              "val": {
+                                                "vec": [
+                                                  {
+                                                    "symbol": "Timestamp"
+                                                  }
+                                                ]
+                                              }
+                                            },
+                                            {
+                                              "key": {
+                                                "symbol": "required"
+                                              },
+                                              "val": {
+                                                "bool": true
+                                              }
+                                            },
+                                            {
+                                              "key": {
+                                                "symbol": "threshold_value"
+                                              },
+                                              "val": {
+                                                "i128": {
+                                                  "hi": 0,
+                                                  "lo": 0
+                                                }
+                                              }
+                                            },
+                                            {
+                                              "key": {
+                                                "symbol": "verified"
+                                              },
+                                              "val": {
+                                                "bool": true
+                                              }
+                                            }
+                                          ]
+                                        }
+                                      ]
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "current_approvals"
+                                    },
+                                    "val": {
+                                      "u32": 0
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "expiration_timestamp"
+                                    },
+                                    "val": {
+                                      "u64": 2000
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "min_approvals"
+                                    },
+                                    "val": {
+                                      "u32": 1
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "operator"
+                                    },
+                                    "val": {
+                                      "vec": [
+                                        {
+                                          "symbol": "And"
+                                        }
+                                      ]
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "oracle_confirmation"
+                                    },
+                                    "val": {
+                                      "bool": false
+                                    }
+                                  },
+                                  {
+                                    "key": {
+                                      "symbol": "recipient_approval"
+                                    },
+                                    "val": {
+                                      "bool": false
+                                    }
+                                  }
+                                ]
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "release_timestamp"
+                              },
+                              "val": {
+                                "u64": 0
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "released_amount"
+                              },
+                              "val": {
+                                "i128": {
+                                  "hi": 0,
+                                  "lo": 0
+                                }
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "sender"
+                              },
+                              "val": {
+                                "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
+                              }
+                            },
+                            {
+                              "key": {
+                                "symbol": "status"
+                              },
+                              "val": {
+                                "vec": [
+                                  {
+                                    "symbol": "Pending"
+                                  }
+                                ]
+                              }
                             }
                           ]
-                        },
-                        "val": {
-                          "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
                         }
                       },
                       {
diff --git a/contracts/test_snapshots/remittance_hub/test/test_send_remittance.1.json b/contracts/test_snapshots/remittance_hub/test/test_send_remittance.1.json
index 360e495..1696aca 100644
--- a/contracts/test_snapshots/remittance_hub/test/test_send_remittance.1.json
+++ b/contracts/test_snapshots/remittance_hub/test/test_send_remittance.1.json
@@ -52,14 +52,7 @@
           "contract_data": {
             "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM",
             "key": {
-              "vec": [
-                {
-                  "symbol": "Remittance"
-                },
-                {
-                  "u64": 0
-                }
-              ]
+              "u64": 0
             },
             "durability": "persistent"
           }
@@ -72,14 +65,7 @@
                 "ext": "v0",
                 "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM",
                 "key": {
-                  "vec": [
-                    {
-                      "symbol": "Remittance"
-                    },
-                    {
-                      "u64": 0
-                    }
-                  ]
+                  "u64": 0
                 },
                 "durability": "persistent",
                 "val": {
@@ -116,11 +102,7 @@
                         "symbol": "status"
                       },
                       "val": {
-                        "vec": [
-                          {
-                            "symbol": "Pending"
-                          }
-                        ]
+                        "symbol": "pending"
                       }
                     },
                     {
@@ -369,11 +351,7 @@
                     "symbol": "status"
                   },
                   "val": {
-                    "vec": [
-                      {
-                        "symbol": "Pending"
-                      }
-                    ]
+                    "symbol": "pending"
                   }
                 },
                 {