Refactored Message Client