diff --git a/src/agent/agent.rs b/src/agent/agent.rs
index ce150d0..45b4d54 100644
--- a/src/agent/agent.rs
+++ b/src/agent/agent.rs
@@ -219,17 +219,24 @@ impl Agent {
         } else {
             None
         };
+        let composio_entity_id = if config.composio.enabled {
+            Some(config.composio.entity_id.as_str())
+        } else {
+            None
+        };
 
         let tools = tools::all_tools_with_runtime(
             &security,
             runtime,
             memory.clone(),
             composio_key,
+            composio_entity_id,
             &config.browser,
             &config.http_request,
             &config.workspace_dir,
             &config.agents,
             config.api_key.as_deref(),
+            config,
         );
 
         let provider_name = config.default_provider.as_deref().unwrap_or("openrouter");
diff --git a/src/gateway/mod.rs b/src/gateway/mod.rs
index 580fe4b..9c97fe6 100644
--- a/src/gateway/mod.rs
+++ b/src/gateway/mod.rs
@@ -219,7 +219,6 @@ pub async fn run_gateway(host: &str, port: u16, config: Config) -> Result<()> {
         config.api_key.as_deref(),
     )?);
 
-
     // Extract webhook secret for authentication
     let webhook_secret: Option<Arc<str>> = config
         .channels_config
diff --git a/src/tools/mod.rs b/src/tools/mod.rs
index 67c05a3..fcf8fa5 100644
--- a/src/tools/mod.rs
+++ b/src/tools/mod.rs
@@ -74,7 +74,7 @@ pub fn all_tools(
     browser_config: &crate::config::BrowserConfig,
     http_config: &crate::config::HttpRequestConfig,
     workspace_dir: &std::path::Path,
-    agents: &HashMap<String, DelegateAgentConfig, S>,
+    agents: &HashMap<String, DelegateAgentConfig>,
     fallback_api_key: Option<&str>,
     config: &crate::config::Config,
 ) -> Vec<Box<dyn Tool>> {
@@ -104,7 +104,7 @@ pub fn all_tools_with_runtime(
     browser_config: &crate::config::BrowserConfig,
     http_config: &crate::config::HttpRequestConfig,
     workspace_dir: &std::path::Path,
-    agents: &HashMap<String, DelegateAgentConfig, S>,
+    agents: &HashMap<String, DelegateAgentConfig>,
     fallback_api_key: Option<&str>,
     config: &crate::config::Config,
 ) -> Vec<Box<dyn Tool>> {