Refactored message fields into their own container class.