More steps to ensure better map data