Map-related structs are now outside of the WorldMap class