Improve modulation mapping