Rework savemap target.