Moving some functions into WorldMap class