Updates for country resolution