updated channel_map functionality