Make world loading use new map format