Added some functionality to ChannelSelectionController