[dev] Refactor code for as-country-map