Rest mapping corrected