Updated message and added Conversation Classes