Added channel support