More work on map loading