Made the MapLoader more robust to map input