Switched back to the old message type with the Payload field.  Added some helpers to convert a generic message to a specific message.
Refactoring