Adds support for both country and country_code