Added channel handling.