Improve noisemaker mapping