Channel Mapper now maintains its state between updates