diff --git a/docs/docs/modules/model_io/chat/structured_output.ipynb b/docs/docs/modules/model_io/chat/structured_output.ipynb
index 8c47ffbe86..aa0c956ee1 100644
--- a/docs/docs/modules/model_io/chat/structured_output.ipynb
+++ b/docs/docs/modules/model_io/chat/structured_output.ipynb
@@ -86,7 +86,7 @@
    "id": "deddb6d3",
    "metadata": {},
    "source": [
-    "### Function Calling\n",
+    "#### Tool/function Calling\n",
     "\n",
     "By default, we will use `function_calling`"
    ]
@@ -128,7 +128,7 @@
    "id": "39d7a555",
    "metadata": {},
    "source": [
-    "### JSON Mode\n",
+    "#### JSON Mode\n",
     "\n",
     "We also support JSON mode. Note that we need to specify in the prompt the format that it should respond in."
    ]
@@ -193,7 +193,7 @@
    "id": "36270ed5",
    "metadata": {},
    "source": [
-    "### Function Calling\n",
+    "#### Tool/function Calling\n",
     "\n",
     "By default, we will use `function_calling`"
    ]
@@ -235,7 +235,7 @@
    "id": "ddb6b3ba",
    "metadata": {},
    "source": [
-    "### JSON Mode\n",
+    "#### JSON Mode\n",
     "\n",
     "We also support JSON mode. Note that we need to specify in the prompt the format that it should respond in."
    ]
@@ -401,7 +401,7 @@
    "id": "6b7e97a6",
    "metadata": {},
    "source": [
-    "### Function Calling\n",
+    "#### Tool/function Calling\n",
     "\n",
     "By default, we will use `function_calling`"
    ]
@@ -452,7 +452,7 @@
    "id": "a82c2f55",
    "metadata": {},
    "source": [
-    "### JSON Mode\n",
+    "#### JSON Mode\n",
     "\n",
     "We also support JSON mode. Note that we need to specify in the prompt the format that it should respond in."
    ]
@@ -532,7 +532,7 @@
    "id": "6c797e2d-3115-4ca2-9c2f-e853bdc7956d",
    "metadata": {},
    "source": [
-    "# Vertex AI\n",
+    "## Google Vertex AI\n",
     "\n",
     "Google's Gemini models support [function-calling](https://ai.google.dev/docs/function_calling), which we can access via Vertex AI and use for structuring outputs.\n",
     "\n",
diff --git a/docs/scripts/model_feat_table.py b/docs/scripts/model_feat_table.py
index 790acae17f..a0f6d7df25 100644
--- a/docs/scripts/model_feat_table.py
+++ b/docs/scripts/model_feat_table.py
@@ -20,13 +20,46 @@ CHAT_MODEL_FEAT_TABLE_CORRECTION = {
     "ChatMLflowAIGateway": {"_agenerate": False},
     "PromptLayerChatOpenAI": {"_stream": False, "_astream": False},
     "ChatKonko": {"_astream": False, "_agenerate": False},
-    "ChatAnthropic": {"tool_calling": True, "package": "langchain-anthropic"},
-    "ChatMistralAI": {"tool_calling": True, "package": "langchain-mistralai"},
-    "ChatFireworks": {"tool_calling": True, "package": "langchain-fireworks"},
-    "ChatOpenAI": {"tool_calling": True, "package": "langchain-openai"},
-    "ChatVertexAI": {"tool_calling": True, "package": "langchain-google-vertexai"},
-    "ChatGroq": {"tool_calling": "partial", "package": "langchain-groq"},
-    "ChatCohere": {"tool_calling": "partial", "package": "langchain-cohere"},
+    "ChatAnthropic": {
+        "tool_calling": True,
+        "structured_output": True,
+        "package": "langchain-anthropic",
+    },
+    "ChatMistralAI": {
+        "tool_calling": True,
+        "structured_output": True,
+        "package": "langchain-mistralai",
+    },
+    "ChatFireworks": {
+        "tool_calling": True,
+        "structured_output": True,
+        "package": "langchain-fireworks",
+    },
+    "AzureChatOpenAI": {
+        "tool_calling": True,
+        "structured_output": True,
+        "package": "langchain-openai",
+    },
+    "ChatOpenAI": {
+        "tool_calling": True,
+        "structured_output": True,
+        "package": "langchain-openai",
+    },
+    "ChatVertexAI": {
+        "tool_calling": True,
+        "structured_output": True,
+        "package": "langchain-google-vertexai",
+    },
+    "ChatGroq": {
+        "tool_calling": "partial",
+        "structured_output": True,
+        "package": "langchain-groq",
+    },
+    "ChatCohere": {
+        "tool_calling": "partial",
+        "structured_output": True,
+        "package": "langchain-cohere",
+    },
 }
 
 
@@ -152,6 +185,7 @@ def get_chat_model_table() -> str:
         "_stream",
         "_astream",
         "tool_calling",
+        "structured_output",
         "package",
     ]
     title = [
@@ -160,7 +194,8 @@ def get_chat_model_table() -> str:
         "Async invoke",
         "Stream",
         "Async stream",
-        "Tool calling",
+        "[Tool calling](/docs/modules/model_io/chat/function_calling/)",
+        "[Structured output](/docs/modules/model_io/chat/structured_output/)",
         "Python Package",
     ]
     rows = [title, [":-"] + [":-:"] * (len(title) - 1)]