Tweak the save mapping