Add support for buffer payloads