diff --git a/Cargo.lock b/Cargo.lock
index b7adffb..0551f4f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -624,9 +624,9 @@ checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
 
 [[package]]
 name = "cpufeatures"
-version = "0.2.16"
+version = "0.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16b80225097f2e5ae4e7179dd2266824648f3e2f49d9134d584b76389d31c4c3"
+checksum = "59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280"
 dependencies = [
  "libc",
 ]
@@ -1496,7 +1496,7 @@ dependencies = [
 [[package]]
 name = "rgb-invoice"
 version = "0.12.0-beta.4"
-source = "git+https://github.com/RGB-WG/rgb-std?branch=payments#d19bfefb813240e2e6edbcb99dfb1abd0358166c"
+source = "git+https://github.com/RGB-WG/rgb-std?branch=payments#79e68c101d8e297a9e3a99100f1da727deda00e5"
 dependencies = [
  "amplify",
  "baid64",
@@ -1545,7 +1545,7 @@ dependencies = [
 [[package]]
 name = "rgb-std"
 version = "0.12.0-beta.4"
-source = "git+https://github.com/RGB-WG/rgb-std?branch=payments#d19bfefb813240e2e6edbcb99dfb1abd0358166c"
+source = "git+https://github.com/RGB-WG/rgb-std?branch=payments#79e68c101d8e297a9e3a99100f1da727deda00e5"
 dependencies = [
  "amplify",
  "bp-core",
diff --git a/src/runtime.rs b/src/runtime.rs
index 0549fc7..6075458 100644
--- a/src/runtime.rs
+++ b/src/runtime.rs
@@ -29,7 +29,7 @@ use bpstd::seals::TxoSeal;
 use bpstd::{Psbt, Sats};
 use rgb::invoice::RgbInvoice;
 use rgb::popls::bp::{
-    Barrow, BundleError, FulfillError, IncludeError, OpRequestSet, WoutAssignment,
+    Barrow, BundleError, FulfillError, IncludeError, OpRequestSet, PaymentScript,
 };
 use rgb::{ContractId, Excavate, Pile, Supply};
 use rgpsbt::{RgbPsbt, RgbPsbtError, ScriptResolver};
@@ -82,7 +82,7 @@ impl<S: Supply, P: Pile<Seal = TxoSeal>, X: Excavate<S, P>> RgbRuntime<S, P, X>
     // TODO: Return a dedicated Transfer object which can stream a consignment
     pub fn transfer(
         &mut self,
-        set: OpRequestSet<Option<WoutAssignment>>,
+        set: PaymentScript,
         params: TxParams,
     ) -> Result<Psbt, TransferError> {
         let (mut psbt, meta) = self.0.wallet.compose_psbt(&set, params)?;
diff --git a/src/wallet.rs b/src/wallet.rs
index cb74844..b0e84ff 100644
--- a/src/wallet.rs
+++ b/src/wallet.rs
@@ -30,7 +30,7 @@ use bpstd::seals::TxoSeal;
 use bpstd::{Address, Keychain, Network, Outpoint, Psbt, XpubDerivable};
 use bpwallet::{Layer2Empty, NoLayer2, Wallet, WalletCache, WalletData, WalletDescr};
 use nonasync::persistence::{PersistenceError, PersistenceProvider};
-use rgb::popls::bp::{OpRequestSet, WalletProvider, WoutAssignment};
+use rgb::popls::bp::{PaymentScript, WalletProvider};
 use rgb::{AuthToken, EitherSeal, SealAuthToken};
 
 use crate::descriptor::RgbDescr;
@@ -106,7 +106,7 @@ impl RgbWallet {
 
     pub fn compose_psbt(
         &mut self,
-        bundle: &OpRequestSet<Option<WoutAssignment>>,
+        bundle: &PaymentScript,
         params: TxParams,
     ) -> Result<(Psbt, PsbtMeta), ConstructionError> {
         let closes = bundle