Add ability to get proper channel list