diff --git a/src/bot/mod.rs b/src/bot/mod.rs
index acca297e..6f4c4ec1 100644
--- a/src/bot/mod.rs
+++ b/src/bot/mod.rs
@@ -144,7 +144,7 @@ impl BotOrchestrator {
             session_manager.save_message(
                 session.id,
                 user_id,
-                "user",
+                1,
                 &message.content,
                 message.message_type,
             )?;
@@ -154,7 +154,7 @@ impl BotOrchestrator {
 
         {
             let mut session_manager = self.session_manager.lock().await;
-            session_manager.save_message(session.id, user_id, "assistant", &response_content, 1)?;
+            session_manager.save_message(session.id, user_id, 2, &response_content, 1)?;
         }
 
         let bot_response = BotResponse {
@@ -244,7 +244,7 @@ impl BotOrchestrator {
             sm.save_message(
                 session.id,
                 user_id,
-                "user",
+                1,
                 &message.content,
                 message.message_type,
             )?;
@@ -301,7 +301,7 @@ impl BotOrchestrator {
         // Save the complete assistant reply.
         {
             let mut sm = self.session_manager.lock().await;
-            sm.save_message(session.id, user_id, "assistant", &full_response, 1)?;
+            sm.save_message(session.id, user_id, 2, &full_response, 1)?;
         }
 
         // Notify the client that the stream is finished.
@@ -363,7 +363,7 @@ impl BotOrchestrator {
             session_manager.save_message(
                 session.id,
                 user_id,
-                "user",
+                1,
                 &message.content,
                 message.message_type,
             )?;
@@ -412,13 +412,7 @@ impl BotOrchestrator {
             {
                 Ok(tool_result) => {
                     let mut session_manager = self.session_manager.lock().await;
-                    session_manager.save_message(
-                        session.id,
-                        user_id,
-                        "assistant",
-                        &tool_result.output,
-                        2,
-                    )?;
+                    session_manager.save_message(session.id, user_id, 2, &tool_result.output, 2)?;
 
                     tool_result.output
                 }
@@ -443,7 +437,7 @@ impl BotOrchestrator {
 
         {
             let mut session_manager = self.session_manager.lock().await;
-            session_manager.save_message(session.id, user_id, "assistant", &response, 1)?;
+            session_manager.save_message(session.id, user_id, 2, &response, 1)?;
         }
 
         let bot_response = BotResponse {
diff --git a/src/session/mod.rs b/src/session/mod.rs
index 76faa259..c1c7b9df 100644
--- a/src/session/mod.rs
+++ b/src/session/mod.rs
@@ -130,7 +130,7 @@ impl SessionManager {
         &mut self,
         sess_id: Uuid,
         uid: Uuid,
-        _role_str: &str,
+        ro: i32,
         content: &str,
         msg_type: i32,
     ) -> Result<(), Box<dyn Error + Send + Sync>> {
@@ -146,7 +146,7 @@ impl SessionManager {
                 id.eq(Uuid::new_v4()),
                 session_id.eq(sess_id),
                 user_id.eq(uid),
-                //        role.eq(role_str),
+                role.eq(ro),
                 content_encrypted.eq(content),
                 message_type.eq(msg_type),
                 message_index.eq(next_index),
diff --git a/src/shared/models.rs b/src/shared/models.rs
index 1015e324..a39b2a0d 100644
--- a/src/shared/models.rs
+++ b/src/shared/models.rs
@@ -188,7 +188,7 @@ diesel::table! {
         id -> Uuid,
         session_id -> Uuid,
         user_id -> Uuid,
-        role -> Text,
+        role -> Int4,
         content_encrypted -> Text,
         message_type -> Int4,
         message_index -> Int8,