diff --git a/app/assistantconversation.py b/app/assistantconversation.py
new file mode 100644
index 0000000..241fecf
--- /dev/null
+++ b/app/assistantconversation.py
@@ -0,0 +1,7 @@
+from datetime import datetime
+from pydantic import BaseModel
+
+class AssistantConversation(BaseModel):
+  ConversationID : str
+  Messages : str = ""
+  LastModified : datetime
diff --git a/app/server.py b/app/server.py
index bde6ecd..715b7fd 100644
--- a/app/server.py
+++ b/app/server.py
@@ -1,14 +1,20 @@
 import logging
 import json
 import os
+from datetime import datetime
 
 from fastapi import FastAPI, Request
 from fastapi.responses import HTMLResponse
 from pydantic import BaseModel
 from twilio.rest import Client
+from pymongo import MongoClient
 
 from vertex import Assistant
+from assistantconversation import AssistantConversation
 
+from vertexai.preview.generative_models import Content, Part
+
+client = MongoClient(os.environ['TRAVIGO_MONGODB_CONNECTION'])
 app = FastAPI()
 
 class OnMessageReceived(BaseModel):
@@ -27,45 +33,93 @@ class OnMessageReceived(BaseModel):
 
 @app.get("/assistant")
 async def get():
-    return HTMLResponse("No content here")
+  updateConversationHistory("dlkfngjkdnfg", json.dumps({}))
+  return HTMLResponse("No content here")
+
+def getConversationHistory(conversationID : str) -> AssistantConversation:
+  db = client[os.environ['TRAVIGO_MONGODB_DATABASE']]
+  collection = db['assistant_conversations']
+
+  searchQuery = {"ConversationID": conversationID}
+  conversation = collection.find_one(searchQuery)
+  
+  if conversation is None:
+      conversation = AssistantConversation(
+        ConversationID=conversationID,
+        LastModified=datetime.now(),
+        Messages="[]"
+      )
+  else:
+      conversation = AssistantConversation(**conversation)
+
+  return conversation
+
+def updateConversationHistory(conversation: AssistantConversation):
+  db = client[os.environ['TRAVIGO_MONGODB_DATABASE']]
+  collection = db['assistant_conversations']
+
+  searchQuery = {"ConversationID": conversation.ConversationID}
+
+  collection.update_one(searchQuery, {"$set": conversation.model_dump()}, upsert=True)
 
 @app.post("/assistant/twilio/webhook")
 async def get(request: Request):
-    client = Client(os.environ['TRAVIGO_TWILIO_ACCOUNT_SID'], os.environ['TRAVIGO_TWILIO_AUTH_TOKEN'])
+  client = Client(os.environ['TRAVIGO_TWILIO_ACCOUNT_SID'], os.environ['TRAVIGO_TWILIO_AUTH_TOKEN'])
+
+  form_data = await request.form()
+
+  event_type = form_data['EventType']
+  
+  if event_type == "onMessageAdded":
+      received_message = OnMessageReceived(**form_data)
+      print(received_message)
+
+      logging.info("Message received")
+
+      # Load previous history
+      conversationHistory = getConversationHistory(received_message.ConversationSid)
+      previousHistoryDict = json.loads(conversationHistory.Messages)
+      previousHistory = []
+
+      for historyItem in previousHistoryDict:
+        parts = []
+        for partDef in historyItem['parts']:
+          if 'text' in partDef:
+            part = Part.from_text(partDef['text'])
+          elif 'function_call' in partDef or 'function_response' in partDef:
+            part = Part.from_dict(partDef)
 
-    # print(request.form, )
-    form_data = await request.form()
+          parts.append(part)
 
-    event_type = form_data['EventType']
-    
-    if event_type == "onMessageAdded":
-        received_message = OnMessageReceived(**form_data)
-        print(received_message)
+        content = Content(role=historyItem['role'], parts=parts)
+        previousHistory.append(content)
 
-        logging.info("Message received")
+      # Create new chat
+      assistant = Assistant()
+      assistant.create_chat(history=previousHistory)
 
-        assistant = Assistant()
-        assistant.create_chat()
+      response = assistant.message(received_message.Body)
 
-        response = assistant.message(received_message.Body)
+      for part in response.candidates[0].content.parts:
+        send_message = client.conversations \
+                .v1 \
+                .services(os.environ['TRAVIGO_TWILIO_SERVICE_SID']) \
+                .conversations(received_message.ConversationSid) \
+                .messages \
+                .create(author='system', body=part.text)
+        
+        print(send_message)
 
-        for part in response.candidates[0].content.parts:
-            send_message = client.conversations \
-                    .v1 \
-                    .services(os.environ['TRAVIGO_TWILIO_SERVICE_SID']) \
-                    .conversations(received_message.ConversationSid) \
-                    .messages \
-                    .create(author='system', body=part.text)
-            
-            print(send_message)
+      # Update database history
+      history = []
 
-        history = []
+      for historyItem in assistant.chat.history:
+        history.append(historyItem.to_dict())
 
-        for historyItem in assistant.chat.history[-5:]:
-          history.append(historyItem.to_dict())
+      conversationHistory.Messages = json.dumps(history)
 
-        print(json.dumps(history))
+      updateConversationHistory(conversationHistory)
 
-        return HTMLResponse("OK")
-    
-    return HTMLResponse("Unknown mode")
+      return HTMLResponse("OK")
+  
+  return HTMLResponse("Unknown mode")
diff --git a/requirements.txt b/requirements.txt
index b974ed0..c33778b 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,5 @@
 requests==2.31.0
 google-cloud-aiplatform==1.52.0
 twilio==9.1.0
-fastapi==0.111.0
\ No newline at end of file
+fastapi==0.111.0
+pymongo==4.7.3
\ No newline at end of file