Added channel id support