Refine data management on map