Refactored Message