Added and updated Worldbank and CIA Factbook mappings.