Added map-retrieval functionality