Make country block optional