Changes to MapGenerator