diff --git a/packages/components/nodes/agents/ConversationalRetrievalAgent/ConversationalRetrievalAgent.ts b/packages/components/nodes/agents/ConversationalRetrievalAgent/ConversationalRetrievalAgent.ts
index 3c956833..643c6a65 100644
--- a/packages/components/nodes/agents/ConversationalRetrievalAgent/ConversationalRetrievalAgent.ts
+++ b/packages/components/nodes/agents/ConversationalRetrievalAgent/ConversationalRetrievalAgent.ts
@@ -21,7 +21,7 @@ class ConversationalRetrievalAgent_Agents implements INode {
     constructor() {
         this.label = 'Conversational Retrieval Agent'
         this.name = 'conversationalRetrievalAgent'
-        this.version = 2.0
+        this.version = 3.0
         this.type = 'AgentExecutor'
         this.category = 'Agents'
         this.icon = 'agent.svg'
@@ -42,7 +42,7 @@ class ConversationalRetrievalAgent_Agents implements INode {
             {
                 label: 'OpenAI/Azure Chat Model',
                 name: 'model',
-                type: 'ChatOpenAI | AzureChatOpenAI'
+                type: 'BaseChatModel'
             },
             {
                 label: 'System Message',
diff --git a/packages/components/nodes/agents/OpenAIFunctionAgent/OpenAIFunctionAgent.ts b/packages/components/nodes/agents/OpenAIFunctionAgent/OpenAIFunctionAgent.ts
index 0f5b9aec..96ba7ea3 100644
--- a/packages/components/nodes/agents/OpenAIFunctionAgent/OpenAIFunctionAgent.ts
+++ b/packages/components/nodes/agents/OpenAIFunctionAgent/OpenAIFunctionAgent.ts
@@ -20,7 +20,7 @@ class OpenAIFunctionAgent_Agents implements INode {
     constructor() {
         this.label = 'OpenAI Function Agent'
         this.name = 'openAIFunctionAgent'
-        this.version = 2.0
+        this.version = 3.0
         this.type = 'AgentExecutor'
         this.category = 'Agents'
         this.icon = 'openai.png'
@@ -41,7 +41,7 @@ class OpenAIFunctionAgent_Agents implements INode {
             {
                 label: 'OpenAI/Azure Chat Model',
                 name: 'model',
-                type: 'ChatOpenAI | AzureChatOpenAI'
+                type: 'BaseChatModel'
             },
             {
                 label: 'System Message',
diff --git a/packages/server/marketplaces/chatflows/API Agent OpenAI.json b/packages/server/marketplaces/chatflows/API Agent OpenAI.json
index 0e9aa091..002c08c1 100644
--- a/packages/server/marketplaces/chatflows/API Agent OpenAI.json	
+++ b/packages/server/marketplaces/chatflows/API Agent OpenAI.json	
@@ -333,8 +333,8 @@
             "data": {
                 "id": "openAIFunctionAgent_0",
                 "label": "OpenAI Function Agent",
-                "version": 2,
                 "name": "openAIFunctionAgent",
+                "version": 3,
                 "type": "AgentExecutor",
                 "baseClasses": ["AgentExecutor", "BaseChain"],
                 "category": "Agents",
@@ -367,8 +367,8 @@
                     {
                         "label": "OpenAI/Azure Chat Model",
                         "name": "model",
-                        "type": "ChatOpenAI | AzureChatOpenAI",
-                        "id": "openAIFunctionAgent_0-input-model-ChatOpenAI | AzureChatOpenAI"
+                        "type": "BaseChatModel",
+                        "id": "openAIFunctionAgent_0-input-model-BaseChatModel"
                     }
                 ],
                 "inputs": {
@@ -672,9 +672,9 @@
             "source": "chatOpenAI_2",
             "sourceHandle": "chatOpenAI_2-output-chatOpenAI-ChatOpenAI|BaseChatModel|BaseLanguageModel",
             "target": "openAIFunctionAgent_0",
-            "targetHandle": "openAIFunctionAgent_0-input-model-ChatOpenAI | AzureChatOpenAI",
+            "targetHandle": "openAIFunctionAgent_0-input-model-BaseChatModel",
             "type": "buttonedge",
-            "id": "chatOpenAI_2-chatOpenAI_2-output-chatOpenAI-ChatOpenAI|BaseChatModel|BaseLanguageModel-openAIFunctionAgent_0-openAIFunctionAgent_0-input-model-ChatOpenAI | AzureChatOpenAI",
+            "id": "chatOpenAI_2-chatOpenAI_2-output-chatOpenAI-ChatOpenAI|BaseChatModel|BaseLanguageModel-openAIFunctionAgent_0-openAIFunctionAgent_0-input-model-BaseChatModel",
             "data": {
                 "label": ""
             }
diff --git a/packages/server/marketplaces/chatflows/Conversational Retrieval Agent.json b/packages/server/marketplaces/chatflows/Conversational Retrieval Agent.json
index 68618a63..0e9e41bd 100644
--- a/packages/server/marketplaces/chatflows/Conversational Retrieval Agent.json	
+++ b/packages/server/marketplaces/chatflows/Conversational Retrieval Agent.json	
@@ -98,7 +98,7 @@
             "data": {
                 "id": "conversationalRetrievalAgent_0",
                 "label": "Conversational Retrieval Agent",
-                "version": 2,
+                "version": 3,
                 "name": "conversationalRetrievalAgent",
                 "type": "AgentExecutor",
                 "baseClasses": ["AgentExecutor", "BaseChain", "Runnable"],
@@ -132,8 +132,8 @@
                     {
                         "label": "OpenAI/Azure Chat Model",
                         "name": "model",
-                        "type": "ChatOpenAI | AzureChatOpenAI",
-                        "id": "conversationalRetrievalAgent_0-input-model-ChatOpenAI | AzureChatOpenAI"
+                        "type": "BaseChatModel",
+                        "id": "conversationalRetrievalAgent_0-input-model-BaseChatModel"
                     }
                 ],
                 "inputs": {
@@ -642,9 +642,9 @@
             "source": "chatOpenAI_0",
             "sourceHandle": "chatOpenAI_0-output-chatOpenAI-ChatOpenAI|BaseChatModel|BaseLanguageModel|Runnable",
             "target": "conversationalRetrievalAgent_0",
-            "targetHandle": "conversationalRetrievalAgent_0-input-model-ChatOpenAI | AzureChatOpenAI",
+            "targetHandle": "conversationalRetrievalAgent_0-input-model-BaseChatModel",
             "type": "buttonedge",
-            "id": "chatOpenAI_0-chatOpenAI_0-output-chatOpenAI-ChatOpenAI|BaseChatModel|BaseLanguageModel|Runnable-conversationalRetrievalAgent_0-conversationalRetrievalAgent_0-input-model-ChatOpenAI | AzureChatOpenAI",
+            "id": "chatOpenAI_0-chatOpenAI_0-output-chatOpenAI-ChatOpenAI|BaseChatModel|BaseLanguageModel|Runnable-conversationalRetrievalAgent_0-conversationalRetrievalAgent_0-input-model-BaseChatModel",
             "data": {
                 "label": ""
             }
diff --git a/packages/server/marketplaces/chatflows/OpenAI Agent.json b/packages/server/marketplaces/chatflows/OpenAI Agent.json
index d2c842c6..17e59236 100644
--- a/packages/server/marketplaces/chatflows/OpenAI Agent.json	
+++ b/packages/server/marketplaces/chatflows/OpenAI Agent.json	
@@ -205,8 +205,8 @@
             "data": {
                 "id": "openAIFunctionAgent_0",
                 "label": "OpenAI Function Agent",
-                "version": 2,
                 "name": "openAIFunctionAgent",
+                "version": 3,
                 "type": "AgentExecutor",
                 "baseClasses": ["AgentExecutor", "BaseChain"],
                 "category": "Agents",
@@ -239,8 +239,8 @@
                     {
                         "label": "OpenAI/Azure Chat Model",
                         "name": "model",
-                        "type": "ChatOpenAI | AzureChatOpenAI",
-                        "id": "openAIFunctionAgent_0-input-model-ChatOpenAI | AzureChatOpenAI"
+                        "type": "BaseChatModel",
+                        "id": "openAIFunctionAgent_0-input-model-BaseChatModel"
                     }
                 ],
                 "inputs": {
@@ -488,9 +488,9 @@
             "source": "chatOpenAI_0",
             "sourceHandle": "chatOpenAI_0-output-chatOpenAI-ChatOpenAI|BaseChatModel|BaseLanguageModel",
             "target": "openAIFunctionAgent_0",
-            "targetHandle": "openAIFunctionAgent_0-input-model-ChatOpenAI | AzureChatOpenAI",
+            "targetHandle": "openAIFunctionAgent_0-input-model-BaseChatModel",
             "type": "buttonedge",
-            "id": "chatOpenAI_0-chatOpenAI_0-output-chatOpenAI-ChatOpenAI|BaseChatModel|BaseLanguageModel-openAIFunctionAgent_0-openAIFunctionAgent_0-input-model-ChatOpenAI | AzureChatOpenAI",
+            "id": "chatOpenAI_0-chatOpenAI_0-output-chatOpenAI-ChatOpenAI|BaseChatModel|BaseLanguageModel-openAIFunctionAgent_0-openAIFunctionAgent_0-input-model-BaseChatModel",
             "data": {
                 "label": ""
             }