added ChannelType enum and made sure to use it everywhere now