Updated ChannelManager