Mapping is now in channels map