Conversation object + minor changes