Allowed country to be optional