Feature 05 - Create wrapper class for messages