Further work on map loading