Refactor model: Message