Refactored messages into their own container class.