diff --git a/conversations/src/context.rs b/conversations/src/context.rs
index 342e9d2..e19050f 100644
--- a/conversations/src/context.rs
+++ b/conversations/src/context.rs
@@ -1,7 +1,7 @@
 use std::{collections::HashMap, rc::Rc, sync::Arc};
 
 use crate::{
-    conversation::{ConversationStore, Convo, Id},
+    conversation::{ConversationId, ConversationStore, Convo, Id},
     errors::ChatError,
     identity::Identity,
     inbox::Inbox,
diff --git a/conversations/src/inbox/inbox.rs b/conversations/src/inbox/inbox.rs
index d019fdb..66888b7 100644
--- a/conversations/src/inbox/inbox.rs
+++ b/conversations/src/inbox/inbox.rs
@@ -123,7 +123,7 @@ impl Inbox {
     pub fn handle_frame(
         &mut self,
         enc_payload: EncryptedPayload,
-    ) -> Result<(Box<dyn Convo>, Vec<ContentData>), ChatError> {
+    ) -> Result<(Box<dyn Convo>, Option<ContentData>), ChatError> {
         let handshake = Self::extract_payload(enc_payload)?;
 
         let header = handshake
@@ -142,7 +142,7 @@ impl Inbox {
                 let convo = PrivateV1Convo::new_responder(seed_key, ephemeral_key.clone().into());
 
                 // TODO: Update PrivateV1 Constructor with DR, initial_message
-                Ok((Box::new(convo), vec![]))
+                Ok((Box::new(convo), None))
             }
         }
     }