Add channels; simplify the selection definitions