diff --git a/src/client.rs b/src/client.rs
index 16b72be..662233a 100644
--- a/src/client.rs
+++ b/src/client.rs
@@ -39,7 +39,7 @@ impl BunBunClient {
     }
 
     pub async fn rpc_call<T: RPCClientTask + Send + Debug>(
-        &mut self,
+        &self,
         data: T,
         queue_name: &str,
     ) -> Result<T::Result, RpcClientError<T::ErroredResult>>
@@ -218,7 +218,7 @@ impl BunBunClient {
     /// let client = Client::new("amqp://127.0.0.1:5672");
     /// let result = client.call(EmailJob::new("someone@example.com", "Hello there"), "email_channel");
     /// ```
-    pub async fn call<T>(&mut self, data: T, queue_name: &str) -> Result<(), ClientError>
+    pub async fn call<T>(&self, data: T, queue_name: &str) -> Result<(), ClientError>
     where
         T: Serialize + DeserializeOwned,
     {
diff --git a/src/lib.rs b/src/lib.rs
index 18e7f14..216367c 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -78,9 +78,9 @@ impl BunBunWorker {
     pub async fn add_non_rpc_consumer<J: NonRPCServerTask + 'static + Send>(
         &mut self,
         queue_name: &str,
-        state: Arc<Mutex<J::State>>,
+        state: Arc<J::State>,
     ) where
-        <J as NonRPCServerTask>::State: std::marker::Send,
+        <J as NonRPCServerTask>::State: std::marker::Send + Sync,
     {
         let consumer = self
             .channel
@@ -124,11 +124,11 @@ impl BunBunWorker {
     pub async fn add_rpc_consumer<J: RPCServerTask + 'static + Send>(
         &mut self,
         queue_name: &str,
-        state: Arc<Mutex<J::State>>,
+        state: Arc<J::State>,
     ) where
-        <J as RPCServerTask>::State: std::marker::Send,
-        <J as RPCServerTask>::Result: std::marker::Send,
-        <J as RPCServerTask>::ErroredResult: std::marker::Send,
+        <J as RPCServerTask>::State: std::marker::Send + Sync,
+        <J as RPCServerTask>::Result: std::marker::Send + Sync,
+        <J as RPCServerTask>::ErroredResult: std::marker::Send + Sync,
     {
         let consumer = self
             .channel
@@ -306,7 +306,7 @@ pub trait RPCServerTask: Sized + Debug + DeserializeOwned {
 
     fn run(
         self,
-        state: Arc<Mutex<Self::State>>,
+        state: Arc<Self::State>,
     ) -> BoxFuture<'static, Result<Self::Result, Self::ErroredResult>>;
 
     /// A function to display the task
@@ -330,7 +330,7 @@ pub trait NonRPCServerTask: Sized + Debug + DeserializeOwned {
         Ok(job)
     }
 
-    fn run(self, state: Arc<Mutex<Self::State>>) -> BoxFuture<'static, Result<(), ()>>;
+    fn run(self, state: Arc<Self::State>) -> BoxFuture<'static, Result<(), ()>>;
 
     /// A function to display the task
     fn display(&self) -> String {
diff --git a/src/test/mod.rs b/src/test/mod.rs
index 419a8ac..e95e76a 100644
--- a/src/test/mod.rs
+++ b/src/test/mod.rs
@@ -49,7 +49,7 @@ mod test {
         type State = State;
         fn run(
             self,
-            state: Arc<Mutex<Self::State>>,
+            state: Arc<Self::State>,
         ) -> futures::prelude::future::BoxFuture<'static, Result<Self::Result, Self::ErroredResult>>
         {
             Box::pin(async move {
@@ -67,7 +67,7 @@ mod test {
         type State = State;
         fn run(
             self,
-            state: Arc<Mutex<Self::State>>,
+            state: Arc<Self::State>,
         ) -> futures::prelude::future::BoxFuture<'static, Result<Self::Result, Self::ErroredResult>>
         {
             Box::pin(async move { panic!("Ooops..") })
@@ -88,9 +88,9 @@ mod test {
         listener
             .add_rpc_consumer::<EmailJob>(
                 "email-emailjob-v1.0.0",
-                Arc::new(Mutex::new(State {
+                Arc::new(State {
                     something: "test".into(),
-                })),
+                }),
             )
             .await;
         tracing::debug!("Starting listener");
@@ -106,9 +106,9 @@ mod test {
         listener
             .add_rpc_consumer::<PanickingEmailJob>(
                 "email-emailjob-v1.0.0",
-                Arc::new(Mutex::new(State {
+                Arc::new(State {
                     something: "test".into(),
-                })),
+                }),
             )
             .await;
         tracing::debug!("Starting listener");