Use new country data and changed to json for files