[MAP] Improvement of switching maps through checkpoints