Improved the Country data structure