Message Refactor