diff --git a/pyproject.toml b/pyproject.toml
index 679680554..99a5b3d7e 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [project]
 name = "uipath-langchain"
-version = "0.3.4"
+version = "0.3.5"
 description = "Python SDK that enables developers to build and deploy LangGraph agents to the UiPath Cloud Platform"
 readme = { file = "README.md", content-type = "text/markdown" }
 requires-python = ">=3.11"
diff --git a/src/uipath_langchain/agent/tools/context_tool.py b/src/uipath_langchain/agent/tools/context_tool.py
index 5f3f2b0fc..ac917863c 100644
--- a/src/uipath_langchain/agent/tools/context_tool.py
+++ b/src/uipath_langchain/agent/tools/context_tool.py
@@ -106,6 +106,10 @@ async def context_tool_fn(query: str) -> dict[str, Any]:
         args_schema=input_model,
         coroutine=context_tool_fn,
         output_type=output_model,
+        metadata={
+            "tool_type": "context",
+            "display_name": resource.name,
+        },
     )
 
 
@@ -183,6 +187,10 @@ async def context_tool_fn(query: str) -> dict[str, Any]:
         args_schema=input_model,
         coroutine=context_tool_fn,
         output_type=output_model,
+        metadata={
+            "tool_type": "context",
+            "display_name": resource.name,
+        },
     )
 
 
@@ -302,6 +310,10 @@ async def context_tool_fn(
         args_schema=input_model,
         coroutine=context_tool_fn,
         output_type=output_model,
+        metadata={
+            "tool_type": "context",
+            "display_name": resource.name,
+        },
     )
 
 
diff --git a/src/uipath_langchain/agent/tools/integration_tool.py b/src/uipath_langchain/agent/tools/integration_tool.py
index 2a5c659ee..e049cbe64 100644
--- a/src/uipath_langchain/agent/tools/integration_tool.py
+++ b/src/uipath_langchain/agent/tools/integration_tool.py
@@ -179,6 +179,10 @@ async def integration_tool_fn(**kwargs: Any):
         args_schema=input_model,
         coroutine=integration_tool_fn,
         output_type=output_model,
+        metadata={
+            "tool_type": "integration",
+            "display_name": resource.name,
+        },
     )
     tool.set_tool_wrappers(awrapper=wrapper)
 
diff --git a/src/uipath_langchain/agent/tools/mcp_tool.py b/src/uipath_langchain/agent/tools/mcp_tool.py
index c51b5c5d7..7208591f5 100644
--- a/src/uipath_langchain/agent/tools/mcp_tool.py
+++ b/src/uipath_langchain/agent/tools/mcp_tool.py
@@ -66,6 +66,8 @@ async def init_session(
         async with semaphore:
             await session.initialize()
             tools = await load_mcp_tools(session)
+            for tool in tools:
+                tool.metadata = {"tool_type": "mcp", "display_name": tool.name}
             return _filter_tools(tools, cfg)
 
     async def create_session(
diff --git a/uv.lock b/uv.lock
index dc389255d..505eb37f0 100644
--- a/uv.lock
+++ b/uv.lock
@@ -3292,7 +3292,7 @@ wheels = [
 
 [[package]]
 name = "uipath-langchain"
-version = "0.3.4"
+version = "0.3.5"
 source = { editable = "." }
 dependencies = [
     { name = "aiosqlite" },