diff --git a/src/uipath_langchain/agent/tools/context_tool.py b/src/uipath_langchain/agent/tools/context_tool.py
index c572d2e7..32e317da 100644
--- a/src/uipath_langchain/agent/tools/context_tool.py
+++ b/src/uipath_langchain/agent/tools/context_tool.py
@@ -128,6 +128,8 @@ async def context_tool_fn(query: str) -> dict[str, Any]:
         metadata={
             "tool_type": "context",
             "display_name": resource.name,
+            "index_name": resource.index_name,
+            "context_retrieval_mode": resource.settings.retrieval_mode,
         },
     )
 
@@ -223,6 +225,8 @@ async def context_tool_fn(query: str) -> dict[str, Any]:
         metadata={
             "tool_type": "context",
             "display_name": resource.name,
+            "index_name": resource.index_name,
+            "context_retrieval_mode": resource.settings.retrieval_mode,
         },
     )
 
@@ -354,6 +358,8 @@ async def context_tool_fn(
         metadata={
             "tool_type": "context",
             "display_name": resource.name,
+            "index_name": resource.index_name,
+            "context_retrieval_mode": resource.settings.retrieval_mode,
         },
     )
 
diff --git a/src/uipath_langchain/agent/tools/integration_tool.py b/src/uipath_langchain/agent/tools/integration_tool.py
index ca9dceb4..eac7523e 100644
--- a/src/uipath_langchain/agent/tools/integration_tool.py
+++ b/src/uipath_langchain/agent/tools/integration_tool.py
@@ -201,6 +201,8 @@ async def integration_tool_wrapper(
         metadata={
             "tool_type": "integration",
             "display_name": resource.name,
+            "connector_key": resource.properties.connection.id,
+            "connector_name": resource.properties.connection.name,
         },
     )
     tool.set_tool_wrappers(awrapper=integration_tool_wrapper)