Added type attribute to Conversation model