diff --git a/application/llm/google_ai.py b/application/llm/google_ai.py
index ae888042..31943601 100644
--- a/application/llm/google_ai.py
+++ b/application/llm/google_ai.py
@@ -57,25 +57,35 @@ class GoogleLLM(BaseLLM):
         for tool_data in tools_list:
             if tool_data["type"] == "function":
                 function = tool_data["function"]
-                genai_function = dict(
-                    name=function["name"],
-                    description=function["description"],
-                    parameters={
-                        "type": "OBJECT",
-                        "properties": {
-                            k: {
-                                **v,
-                                "type": v["type"].upper() if v["type"] else None,
-                            }
-                            for k, v in function["parameters"]["properties"].items()
+                parameters = function["parameters"]
+                properties = parameters.get("properties", {})
+
+                if properties:
+                    genai_function = dict(
+                        name=function["name"],
+                        description=function["description"],
+                        parameters={
+                            "type": "OBJECT",
+                            "properties": {
+                                k: {
+                                    **v,
+                                    "type": v["type"].upper() if v["type"] else None,
+                                }
+                                for k, v in properties.items()
+                            },
+                            "required": (
+                                parameters["required"]
+                                if "required" in parameters
+                                else []
+                            ),
                         },
-                        "required": (
-                            function["parameters"]["required"]
-                            if "required" in function["parameters"]
-                            else []
-                        ),
-                    },
-                )
+                    )
+                else:
+                    genai_function = dict(
+                        name=function["name"],
+                        description=function["description"],
+                    )
+
                 genai_tool = types.Tool(function_declarations=[genai_function])
                 genai_tools.append(genai_tool)
 
diff --git a/application/tools/agent.py b/application/tools/agent.py
index 209184d2..740e1689 100644
--- a/application/tools/agent.py
+++ b/application/tools/agent.py
@@ -42,22 +42,26 @@ class Agent:
                                 if key != "filled_by_llm" and key != "value"
                             }
                             for k, v in action["parameters"]["properties"].items()
-                            if v.get("filled_by_llm", False)
+                            if v.get("filled_by_llm", True)
                         },
                         "required": [
                             key
                             for key in action["parameters"]["required"]
                             if key in action["parameters"]["properties"]
                             and action["parameters"]["properties"][key].get(
-                                "filled_by_llm", False
+                                "filled_by_llm", True
                             )
                         ],
                     },
                 },
             }
             for tool_id, tool in tools_dict.items()
-            for action in tool["actions"]
-            if action["active"]
+            for action in (
+                tool["config"]["actions"].values()
+                if tool["name"] == "api_tool"
+                else tool["actions"]
+            )
+            if action.get("active", True)
         ]
 
     def _execute_tool_action(self, tools_dict, call):
@@ -65,8 +69,14 @@ class Agent:
         tool_id, action_name, call_args = parser.parse_args(call)
 
         tool_data = tools_dict[tool_id]
-        action_data = next(
-            action for action in tool_data["actions"] if action["name"] == action_name
+        action_data = (
+            tool_data["config"]["actions"][action_name]
+            if tool_data["name"] == "api_tool"
+            else next(
+                action
+                for action in tool_data["actions"]
+                if action["name"] == action_name
+            )
         )
 
         for param, details in action_data["parameters"]["properties"].items():
@@ -74,7 +84,14 @@ class Agent:
                 call_args[param] = details["value"]
 
         tm = ToolManager(config={})
-        tool = tm.load_tool(tool_data["name"], tool_config=tool_data["config"])
+        tool = tm.load_tool(
+            tool_data["name"],
+            tool_config=(
+                tool_data["config"]["actions"][action_name]
+                if tool_data["name"] == "api_tool"
+                else tool_data["config"]
+            ),
+        )
         print(f"Executing tool: {action_name} with args: {call_args}")
         result = tool.execute_action(action_name, **call_args)
         call_id = getattr(call, "id", None)
diff --git a/application/tools/implementations/api_tool.py b/application/tools/implementations/api_tool.py
new file mode 100644
index 00000000..da105e39
--- /dev/null
+++ b/application/tools/implementations/api_tool.py
@@ -0,0 +1,49 @@
+import json
+
+import requests
+from application.tools.base import Tool
+
+
+class APITool(Tool):
+    """
+    API Tool
+    A flexible tool for performing various API actions (e.g., sending messages, retrieving data) via custom user-specified APIs
+    """
+
+    def __init__(self, config):
+        self.config = config
+        self.url = config.get("url", "")
+        self.method = config.get("method", "GET")
+        self.headers = config.get("headers", {"Content-Type": "application/json"})
+
+    def execute_action(self, action_name, **kwargs):
+        return self._make_api_call(self.url, self.method, self.headers, kwargs)
+
+    def _make_api_call(self, url, method, headers, body):
+        if isinstance(body, dict):
+            body = json.dumps(body)
+        try:
+            print(f"Making API call: {method} {url} with body: {body}")
+            response = requests.request(method, url, headers=headers, data=body)
+            response.raise_for_status()
+            try:
+                data = response.json()
+            except ValueError:
+                data = None
+
+            return {
+                "status_code": response.status_code,
+                "data": data,
+                "message": "API call successful.",
+            }
+        except requests.exceptions.RequestException as e:
+            return {
+                "status_code": response.status_code if response else None,
+                "message": f"API call failed: {str(e)}",
+            }
+
+    def get_actions_metadata(self):
+        return []
+
+    def get_config_requirements(self):
+        return {}
diff --git a/frontend/public/toolIcons/tool_api_tool.svg b/frontend/public/toolIcons/tool_api_tool.svg
new file mode 100644
index 00000000..1e923cf3
--- /dev/null
+++ b/frontend/public/toolIcons/tool_api_tool.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg viewBox="1 6 38 28" xmlns="http://www.w3.org/2000/svg">
+  <path d="M3,33.5c-0.827,0-1.5-0.673-1.5-1.5V8c0-0.827,0.673-1.5,1.5-1.5h34c0.827,0,1.5,0.673,1.5,1.5v24 c0,0.827-0.673,1.5-1.5,1.5H3z" style="fill: rgb(7, 106, 255);"/>
+  <path d="M37,7c0.551,0,1,0.449,1,1v24c0,0.551-0.449,1-1,1H3c-0.551,0-1-0.449-1-1V8c0-0.551,0.449-1,1-1 H37 M37,6H3C1.895,6,1,6.895,1,8v24c0,1.105,0.895,2,2,2h34c1.105,0,2-0.895,2-2V8C39,6.895,38.105,6,37,6L37,6z" style="fill: rgb(7, 106, 255);"/>
+  <path d="M 19.296 13.226 C 20.066 13.06 21.108 12.955 22.147 12.955 C 23.772 12.955 25.153 13.185 26.047 14.038 C 26.88 14.766 27.255 15.931 27.255 17.118 C 27.255 18.638 26.798 19.718 26.07 20.489 C 25.196 21.426 23.801 21.842 22.656 21.842 C 22.47 21.842 22.302 21.842 22.115 21.821 L 22.115 27.045 L 19.297 27.045 L 19.297 13.226 L 19.296 13.226 Z M 22.114 19.616 C 22.259 19.637 22.405 19.637 22.571 19.637 C 23.945 19.637 24.55 18.657 24.55 17.347 C 24.55 16.119 24.049 15.162 22.78 15.162 C 22.532 15.162 22.281 15.203 22.114 15.266 L 22.114 19.616 Z M 29.158 12.955 L 31.976 12.955 L 31.976 27.045 L 29.158 27.045 L 29.158 12.955 Z M 15.001 27.045 L 17.887 27.045 L 14.91 12.955 L 11.342 12.955 L 8.024 27.045 L 10.91 27.045 L 11.524 24.227 L 14.408 24.227 L 15.001 27.045 Z M 13 15.547 L 13.068 15.547 C 13.205 16.467 13.409 17.888 13.568 18.745 L 14.021 21.409 L 11.942 21.409 L 12.457 18.746 C 12.614 17.93 12.841 16.488 13 15.547 Z" style="fill: rgb(255, 255, 255);"/>
+</svg>
\ No newline at end of file