Refactored Messages