aded map-fetch