MapManager enhancement