Added ChannelSelectionController