diff --git a/src/Plugins/BotSharp.Plugin.AzureOpenAI/BotSharp.Plugin.AzureOpenAI.csproj b/src/Plugins/BotSharp.Plugin.AzureOpenAI/BotSharp.Plugin.AzureOpenAI.csproj
index 1ffa0081..6c76a9fb 100644
--- a/src/Plugins/BotSharp.Plugin.AzureOpenAI/BotSharp.Plugin.AzureOpenAI.csproj
+++ b/src/Plugins/BotSharp.Plugin.AzureOpenAI/BotSharp.Plugin.AzureOpenAI.csproj
@@ -11,7 +11,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Azure.AI.OpenAI" Version="1.0.0-beta.16" />
+    <PackageReference Include="Azure.AI.OpenAI" Version="1.0.0-beta.17" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Plugins/BotSharp.Plugin.AzureOpenAI/Providers/ChatCompletionProvider.cs b/src/Plugins/BotSharp.Plugin.AzureOpenAI/Providers/ChatCompletionProvider.cs
index 2d759505..d2077ae6 100644
--- a/src/Plugins/BotSharp.Plugin.AzureOpenAI/Providers/ChatCompletionProvider.cs
+++ b/src/Plugins/BotSharp.Plugin.AzureOpenAI/Providers/ChatCompletionProvider.cs
@@ -334,6 +334,7 @@ public class ChatCompletionProvider : IChatCompletion
                 }));
             prompt += $"{verbose}\r\n";
 
+            prompt += "\r\n[CONVERSATION]";
             verbose = string.Join("\r\n", chatCompletionsOptions.Messages
                 .Where(x => x.Role != AgentRole.System).Select(x =>
                 {
@@ -364,13 +365,14 @@ public class ChatCompletionProvider : IChatCompletion
             prompt += $"\r\n{verbose}\r\n";
         }
 
-        if (chatCompletionsOptions.Functions.Count > 0)
+        if (chatCompletionsOptions.Tools.Count > 0)
         {
-            var functions = string.Join("\r\n", chatCompletionsOptions.Functions.Select(x =>
+            var functions = string.Join("\r\n", chatCompletionsOptions.Tools.Select(x =>
             {
-                return $"\r\n{x.Name}: {x.Description}\r\n{x.Parameters}";
+                var fn = x as ChatCompletionsFunctionToolDefinition;
+                return $"\r\n{fn.Name}: {fn.Description}\r\n{fn.Parameters}";
             }));
-            prompt += $"\r\n[FUNCTIONS]\r\n{functions}\r\n";
+            prompt += $"\r\n[FUNCTIONS]{functions}\r\n";
         }
 
         return prompt;