Changes on map data retrival