diff --git a/src/config.rs b/src/config.rs
index 05db2bd..89f3c68 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -36,7 +36,6 @@ pub enum ValidModel {
 pub struct ChatMessage {
     pub role: String,
     pub content: String,
-    pub tool_calls: Option<Value>, // This is to be compatible with Mistral
 }
 
 impl ChatMessage {
@@ -44,7 +43,7 @@ impl ChatMessage {
         Self {
             role,
             content,
-            tool_calls: None,
+            // tool_calls: None,
         }
     }
 }
diff --git a/src/transformer_backends/open_ai/mod.rs b/src/transformer_backends/open_ai/mod.rs
index 405f36b..a004614 100644
--- a/src/transformer_backends/open_ai/mod.rs
+++ b/src/transformer_backends/open_ai/mod.rs
@@ -1,7 +1,7 @@
 use std::collections::HashMap;
 
 use anyhow::Context;
-use serde::Deserialize;
+use serde::{Deserialize, Serialize};
 use serde_json::{json, Value};
 use tracing::instrument;
 
@@ -71,9 +71,15 @@ struct OpenAICompletionsResponse {
     pub other: HashMap<String, Value>,
 }
 
+#[derive(Debug, Deserialize, Serialize)]
+pub struct OpenAIChatMessage {
+    pub role: String,
+    pub content: String,
+}
+
 #[derive(Deserialize)]
 pub struct OpenAIChatChoices {
-    pub message: ChatMessage,
+    pub message: OpenAIChatMessage,
 }
 
 #[derive(Deserialize)]