Add support for custom channel_data