Updated channel management for replacing channel with channel_id