Refactor code to use default_country