Added support for asynchonous loading of the map