diff --git a/swap/src/api/request.rs b/swap/src/api/request.rs
index e4360c7a..d7a58aa1 100644
--- a/swap/src/api/request.rs
+++ b/swap/src/api/request.rs
@@ -18,14 +18,13 @@ use std::future::Future;
 use std::net::SocketAddr;
 use std::sync::Arc;
 use std::time::Duration;
+use structopt::lazy_static::lazy_static;
 use tokio::sync::broadcast::Receiver;
-use tokio::sync::Mutex;
 use tracing::{debug_span, Instrument};
 use uuid::Uuid;
 
 #[derive(PartialEq, Debug)]
 pub struct Request {
-    pub params: Params,
     pub cmd: Method,
     pub shutdown: Shutdown,
 }
@@ -72,72 +71,72 @@ impl PartialEq for Shutdown {
     }
 }
 
-#[derive(Default, PartialEq, Debug)]
-pub struct Params {
-    pub seller: Option<Multiaddr>,
-    pub bitcoin_change_address: Option<bitcoin::Address>,
-    pub monero_receive_address: Option<monero::Address>,
-    pub rendezvous_point: Option<Multiaddr>,
-    pub swap_id: Option<Uuid>,
-    pub amount: Option<Amount>,
-    pub server_address: Option<SocketAddr>,
-    pub address: Option<bitcoin::Address>,
-}
-
 #[derive(Debug, PartialEq)]
 pub enum Method {
-    BuyXmr,
+    BuyXmr {
+        seller: Multiaddr,
+        bitcoin_change_address: bitcoin::Address,
+        monero_receive_address: monero::Address,
+        swap_id: Uuid,
+    },
     History,
     RawHistory,
     Config,
-    WithdrawBtc,
+    WithdrawBtc {
+        amount: Option<Amount>,
+        address: bitcoin::Address,
+    },
     Balance,
-    GetSeller,
-    SwapStartDate,
-    Resume,
-    CancelAndRefund,
-    ListSellers,
+    GetSeller {
+        swap_id: Uuid,
+    },
+    SwapStartDate {
+        swap_id: Uuid,
+    },
+    Resume {
+        swap_id: Uuid,
+    },
+    CancelAndRefund {
+        swap_id: Uuid,
+    },
+    ListSellers {
+        rendezvous_point: Multiaddr,
+    },
     ExportBitcoinWallet,
-    MoneroRecovery,
-    StartDaemon,
+    MoneroRecovery {
+        swap_id: Uuid,
+    },
+    StartDaemon {
+        server_address: Option<SocketAddr>,
+    }
 }
 
 impl Request {
-    pub fn new(shutdownReceiver: Receiver<()>, cmd: Method, params: Params) -> Request {
+    pub fn new(shutdownReceiver: Receiver<()>, cmd: Method) -> Request {
         Request {
-            params,
             cmd,
             shutdown: Shutdown::new(shutdownReceiver),
         }
     }
 
-    async fn handle_cmd(&mut self, context: Arc<Context>) -> Result<serde_json::Value> {
+    fn has_lockable_swap_id(&self) -> Option<Uuid> {
         match self.cmd {
-            Method::BuyXmr => {
-                let swap_id = self
-                    .params
-                    .swap_id
-                    .context("Parameter swap_id is missing")?;
+            Method::BuyXmr { swap_id, .. }
+            | Method::Resume { swap_id }
+            | Method::CancelAndRefund { swap_id } => Some(swap_id),
+            _ => None,
+        }
+    }
+
+    async fn handle_cmd(mut self, context: Arc<Context>) -> Result<serde_json::Value> {
+        match self.cmd {
+            Method::BuyXmr { seller, bitcoin_change_address, monero_receive_address, swap_id } => {
                 let seed = context.config.seed.as_ref().context("Could not get seed")?;
                 let env_config = context.config.env_config;
                 let btc = context
                     .bitcoin_wallet
                     .as_ref()
                     .context("Could not get Bitcoin wallet")?;
-                let seller = self
-                    .params
-                    .seller
-                    .clone()
-                    .context("Parameter seller is missing")?;
-                let monero_receive_address = self
-                    .params
-                    .monero_receive_address
-                    .context("Parameter monero_receive_address is missing")?;
-                let bitcoin_change_address = self
-                    .params
-                    .bitcoin_change_address
-                    .clone()
-                    .context("Parameter bitcoin_change_address is missing")?;
 
                 let bitcoin_wallet = btc;
                 let seller_peer_id = seller
@@ -247,8 +246,7 @@ impl Request {
                 let raw_history = context.db.raw_all().await?;
                 Ok(json!({ "raw_history": raw_history }))
             }
-            Method::GetSeller => {
-                let swap_id = self.params.swap_id.context("Parameter swap_id is needed")?;
+            Method::GetSeller { swap_id }  => {
                 let peerId = context
                     .db
                     .get_peer_id(swap_id)
@@ -266,12 +264,7 @@ impl Request {
                     "addresses": addresses
                 }))
             }
-            Method::SwapStartDate => {
-                let swap_id = self
-                    .params
-                    .swap_id
-                    .context("Parameter swap_id is missing")?;
-
+            Method::SwapStartDate { swap_id } => {
                 let start_date = context.db.get_swap_start_date(swap_id).await?;
 
                 Ok(json!({
@@ -295,19 +288,13 @@ impl Request {
                     "bitcoin_wallet": format!("{}/wallet", data_dir_display),
                 }))
             }
-            Method::WithdrawBtc => {
+            Method::WithdrawBtc {address, amount} => {
                 let bitcoin_wallet = context
                     .bitcoin_wallet
                     .as_ref()
                     .context("Could not get Bitcoin wallet")?;
 
-                let address = self
-                    .params
-                    .address
-                    .clone()
-                    .context("Parameter address is missing")?;
-
-                let amount = match self.params.amount {
+                let amount = match amount {
                     Some(amount) => amount,
                     None => {
                         bitcoin_wallet
@@ -330,12 +317,9 @@ impl Request {
                     "txid": signed_tx.txid(),
                 }))
             }
-            Method::StartDaemon => {
+            Method::StartDaemon {server_address} => {
                 // Default to 127.0.0.1:1234
-                let server_address = self
-                    .params
-                    .server_address
-                    .unwrap_or("127.0.0.1:1234".parse().unwrap());
+                let server_address = server_address.unwrap_or("127.0.0.1:1234".parse().unwrap());
 
                 let (_, server_handle) =
                     rpc::run_server(server_address, Arc::clone(&context)).await?;
@@ -368,12 +352,7 @@ impl Request {
                     "balance": bitcoin_balance.to_sat()
                 }))
             }
-            Method::Resume => {
-                let swap_id = self
-                    .params
-                    .swap_id
-                    .context("Parameter swap_id is missing")?;
-
+            Method::Resume {swap_id} => {
                 let seller_peer_id = context.db.get_peer_id(swap_id).await?;
                 let seller_addresses = context.db.get_addresses(seller_peer_id).await?;
 
@@ -452,16 +431,14 @@ impl Request {
                     "result": []
                 }))
             }
-            Method::CancelAndRefund => {
+            Method::CancelAndRefund {swap_id} => {
                 let bitcoin_wallet = context
                     .bitcoin_wallet
                     .as_ref()
                     .context("Could not get Bitcoin wallet")?;
 
                 let state = cli::cancel_and_refund(
-                    self.params
-                        .swap_id
-                        .context("Parameter swap_id is missing")?,
+                    swap_id,
                     Arc::clone(bitcoin_wallet),
                     Arc::clone(&context.db),
                 )
@@ -471,12 +448,7 @@ impl Request {
                     "result": state,
                 }))
             }
-            Method::ListSellers => {
-                let rendezvous_point = self
-                    .params
-                    .rendezvous_point
-                    .clone()
-                    .context("Parameter rendezvous_point is missing")?;
+            Method::ListSellers {rendezvous_point} => {
                 let rendezvous_node_peer_id = rendezvous_point
                     .extract_peer_id()
                     .context("Rendezvous node address must contain peer ID")?;
@@ -536,13 +508,11 @@ impl Request {
                     "result": []
                 }))
             }
-            Method::MoneroRecovery => {
+            Method::MoneroRecovery {swap_id} => {
                 let swap_state: BobState = context
                     .db
                     .get_state(
-                        self.params
-                            .swap_id
-                            .context("Parameter swap_id is missing")?,
+                        swap_id,
                     )
                     .await?
                     .try_into()?;
@@ -585,22 +555,11 @@ impl Request {
         }
     }
 
-    pub async fn call(&mut self, context: Arc<Context>) -> Result<serde_json::Value> {
+    pub async fn call(self, context: Arc<Context>) -> Result<serde_json::Value> {
         // If the swap ID is set, we add it to the span
-        let call_span = self.params.swap_id.map_or_else(
-            || {
-                debug_span!(
-                    "call",
-                    method = ?self.cmd,
-                )
-            },
-            |swap_id| {
-                debug_span!(
-                    "call",
-                    method = ?self.cmd,
-                    swap_id = swap_id.to_string(),
-                )
-            },
+        let call_span = debug_span!(
+            "call",
+            method = ?self.cmd,
         );
 
         self.handle_cmd(context).instrument(call_span).await
diff --git a/swap/src/bin/swap.rs b/swap/src/bin/swap.rs
index e86cf75a..5dbd949c 100644
--- a/swap/src/bin/swap.rs
+++ b/swap/src/bin/swap.rs
@@ -22,7 +22,7 @@ use tokio::sync::broadcast;
 #[tokio::main]
 async fn main() -> Result<()> {
     let (tx, _) = broadcast::channel(1);
-    let (context, mut request) = match parse_args_and_apply_defaults(env::args_os(), tx).await? {
+    let (context, request) = match parse_args_and_apply_defaults(env::args_os(), tx).await? {
         ParseResult::Context(context, request) => (context, request),
         ParseResult::PrintAndExitZero { message } => {
             println!("{}", message);
diff --git a/swap/src/cli/command.rs b/swap/src/cli/command.rs
index e3c664b1..38d861a7 100644
--- a/swap/src/cli/command.rs
+++ b/swap/src/cli/command.rs
@@ -1,4 +1,4 @@
-use crate::api::request::{Method, Params, Request};
+use crate::api::request::{Method, Request};
 use crate::api::Context;
 use crate::bitcoin::{bitcoin_address, Amount};
 use crate::monero;
@@ -80,13 +80,12 @@ where
 
             let request = Request::new(
                 rx.subscribe(),
-                Method::BuyXmr,
-                Params {
-                    bitcoin_change_address: Some(bitcoin_change_address),
-                    monero_receive_address: Some(monero_receive_address),
-                    seller: Some(seller),
-                    ..Default::default()
-                },
+                Method::BuyXmr {
+                    seller,
+                    bitcoin_change_address,
+                    monero_receive_address,
+                    swap_id: Uuid::new_v4(),
+                }
             );
 
             let context = Context::build(
@@ -104,21 +103,21 @@ where
             (context, request)
         }
         CliCommand::History => {
-            let request = Request::new(rx.subscribe(), Method::History, Params::default());
+            let request = Request::new(rx.subscribe(), Method::History);
 
             let context =
                 Context::build(None, None, None, data, is_testnet, debug, json, None, rx).await?;
             (context, request)
         }
         CliCommand::Config => {
-            let request = Request::new(rx.subscribe(), Method::Config, Params::default());
+            let request = Request::new(rx.subscribe(), Method::Config);
 
             let context =
                 Context::build(None, None, None, data, is_testnet, debug, json, None, rx).await?;
             (context, request)
         }
         CliCommand::Balance { bitcoin } => {
-            let request = Request::new(rx.subscribe(), Method::Balance, Params::default());
+            let request = Request::new(rx.subscribe(), Method::Balance);
 
             let context = Context::build(
                 Some(bitcoin),
@@ -142,11 +141,9 @@ where
         } => {
             let request = Request::new(
                 rx.subscribe(),
-                Method::StartDaemon,
-                Params {
-                    server_address,
-                    ..Default::default()
-                },
+                Method::StartDaemon {
+                    server_address
+                }
             );
 
             let context = Context::build(
@@ -172,11 +169,9 @@ where
 
             let request = Request::new(
                 rx.subscribe(),
-                Method::WithdrawBtc,
-                Params {
+                Method::WithdrawBtc {
                     amount,
-                    address: Some(address),
-                    ..Default::default()
+                    address,
                 },
             );
 
@@ -202,11 +197,9 @@ where
         } => {
             let request = Request::new(
                 rx.subscribe(),
-                Method::Resume,
-                Params {
-                    swap_id: Some(swap_id),
-                    ..Default::default()
-                },
+                Method::Resume {
+                    swap_id
+                }
             );
 
             let context = Context::build(
@@ -230,11 +223,9 @@ where
         } => {
             let request = Request::new(
                 rx.subscribe(),
-                Method::CancelAndRefund,
-                Params {
-                    swap_id: Some(swap_id),
-                    ..Default::default()
-                },
+                Method::CancelAndRefund {
+                    swap_id
+                }
             );
 
             let context = Context::build(
@@ -257,11 +248,9 @@ where
         } => {
             let request = Request::new(
                 rx.subscribe(),
-                Method::ListSellers,
-                Params {
-                    rendezvous_point: Some(rendezvous_point),
-                    ..Default::default()
-                },
+                Method::ListSellers {
+                    rendezvous_point
+                }
             );
 
             let context = Context::build(
@@ -283,7 +272,6 @@ where
             let request = Request::new(
                 rx.subscribe(),
                 Method::ExportBitcoinWallet,
-                Params::default(),
             );
 
             let context = Context::build(
@@ -305,11 +293,9 @@ where
         } => {
             let request = Request::new(
                 rx.subscribe(),
-                Method::MoneroRecovery,
-                Params {
-                    swap_id: Some(swap_id),
-                    ..Default::default()
-                },
+                Method::MoneroRecovery {
+                    swap_id
+                }
             );
 
             let context =
diff --git a/swap/src/rpc/methods.rs b/swap/src/rpc/methods.rs
index dbdb0479..5c564900 100644
--- a/swap/src/rpc/methods.rs
+++ b/swap/src/rpc/methods.rs
@@ -1,4 +1,4 @@
-use crate::api::request::{Method, Params, Request};
+use crate::api::request::{Method, Request};
 use crate::api::Context;
 use crate::bitcoin::bitcoin_address;
 use crate::monero::monero_address;
@@ -161,10 +161,9 @@ pub fn register_modules(context: Arc<Context>) -> RpcModule<Arc<Context>> {
 
 async fn execute_request(
     cmd: Method,
-    params: Params,
     context: &Arc<Context>,
 ) -> Result<serde_json::Value, jsonrpsee_core::Error> {
-    let mut request = Request::new(context.shutdown.subscribe(), cmd, params);
+    let request = Request::new(context.shutdown.subscribe(), cmd);
     request
         .call(Arc::clone(context))
         .await
@@ -174,74 +173,64 @@ async fn execute_request(
 async fn get_bitcoin_balance(
     context: &Arc<Context>,
 ) -> Result<serde_json::Value, jsonrpsee_core::Error> {
-    execute_request(Method::Balance, Params::default(), context).await
+    execute_request(Method::Balance, context).await
 }
 
 async fn get_history(context: &Arc<Context>) -> Result<serde_json::Value, jsonrpsee_core::Error> {
-    execute_request(Method::History, Params::default(), context).await
+    execute_request(Method::History, context).await
 }
 
 async fn get_raw_history(
     context: &Arc<Context>,
 ) -> Result<serde_json::Value, jsonrpsee_core::Error> {
-    execute_request(Method::RawHistory, Params::default(), context).await
+    execute_request(Method::RawHistory, context).await
 }
 
 async fn get_seller(
     swap_id: Uuid,
     context: &Arc<Context>,
 ) -> Result<serde_json::Value, jsonrpsee_core::Error> {
-    let params = Params {
-        swap_id: Some(swap_id),
-        ..Default::default()
-    };
-    execute_request(Method::GetSeller, params, context).await
+    execute_request(Method::GetSeller {
+        swap_id
+    }, context).await
 }
 
 async fn get_swap_start_date(
     swap_id: Uuid,
     context: &Arc<Context>,
 ) -> Result<serde_json::Value, jsonrpsee_core::Error> {
-    let params = Params {
-        swap_id: Some(swap_id),
-        ..Default::default()
-    };
-    execute_request(Method::SwapStartDate, params, context).await
+    execute_request(Method::SwapStartDate {
+        swap_id
+    }, context).await
 }
 
 async fn resume_swap(
     swap_id: Uuid,
     context: &Arc<Context>,
 ) -> Result<serde_json::Value, jsonrpsee_core::Error> {
-    let params = Params {
-        swap_id: Some(swap_id),
-        ..Default::default()
-    };
-    execute_request(Method::Resume, params, context).await
+    execute_request(Method::Resume {
+        swap_id
+    }, context).await
 }
 
 async fn cancel_and_refund_swap(
     swap_id: Uuid,
     context: &Arc<Context>,
 ) -> Result<serde_json::Value, jsonrpsee_core::Error> {
-    let params = Params {
-        swap_id: Some(swap_id),
-        ..Default::default()
-    };
-    execute_request(Method::CancelAndRefund, params, context).await
+    execute_request(Method::CancelAndRefund {
+        swap_id
+    }, context).await
 }
 
 async fn withdraw_btc(
-    withdraw_address: bitcoin::Address,
+    address: bitcoin::Address,
     amount: Option<bitcoin::Amount>,
     context: &Arc<Context>,
 ) -> Result<serde_json::Value, jsonrpsee_core::Error> {
-    let params = Params {
+    execute_request(Method::WithdrawBtc {
         amount,
-        address: Some(withdraw_address),
-        ..Default::default()
-    };
-    execute_request(Method::WithdrawBtc, params, context).await
+        address,
+    }, context).await
 }
 
 async fn buy_xmr(
@@ -250,24 +239,19 @@ async fn buy_xmr(
     seller: Multiaddr,
     context: &Arc<Context>,
 ) -> Result<serde_json::Value, jsonrpsee_core::Error> {
-    let params = Params {
-        bitcoin_change_address: Some(bitcoin_change_address),
-        monero_receive_address: Some(monero_receive_address),
-        seller: Some(seller),
-        swap_id: Some(Uuid::new_v4()),
-        ..Default::default()
-    };
-
-    execute_request(Method::BuyXmr, params, context).await
+    execute_request(Method::BuyXmr {
+        seller,
+        swap_id: Uuid::new_v4(),
+        bitcoin_change_address,
+        monero_receive_address
+    }, context).await
 }
 
 async fn list_sellers(
     rendezvous_point: Multiaddr,
     context: &Arc<Context>,
 ) -> Result<serde_json::Value, jsonrpsee_core::Error> {
-    let params = Params {
-        rendezvous_point: Some(rendezvous_point),
-        ..Default::default()
-    };
-    execute_request(Method::ListSellers, params, context).await
+    execute_request(Method::ListSellers {
+        rendezvous_point
+    }, context).await
 }