Add support for messages with payloads