diff --git a/clusters/intelligence-agencies.json b/clusters/intelligence-agencies.json
index 22bff46..4c9c327 100644
--- a/clusters/intelligence-agencies.json
+++ b/clusters/intelligence-agencies.json
@@ -10,7 +10,8 @@
     {
       "description": "General Directorate of Intelligence (GDI) – د استخباراتو لوی ریاست",
       "meta": {
-        "country": "Afghanistan",
+        "country": "AF",
+        "country_name": "Afghanistan",
         "refs": [
           "https://en.wikipedia.org/wiki/General_Directorate_of_Intelligence"
         ],
@@ -21,13 +22,14 @@
         ]
       },
       "related": [],
-      "uuid": "0957b011-bf54-4891-9d9f-8ca0eaa82158",
+      "uuid": "a07c6e6c-1ce2-42dd-9fbc-955513cc2b79",
       "value": "General Directorate of Intelligence"
     },
     {
       "description": "State Intelligence Service (SHISH) – Sherbimi Informativ Shteteror",
       "meta": {
-        "country": "Albania",
+        "country": "AL",
+        "country_name": "Albania",
         "refs": [
           "https://en.wikipedia.org/wiki/National_Intelligence_Service_(Albania)"
         ],
@@ -38,133 +40,144 @@
         ]
       },
       "related": [],
-      "uuid": "1a7d3779-26f7-4fd5-ad69-bd2f96de1aca",
+      "uuid": "3891d3d1-427a-4b09-8f2d-0e32086e52ca",
       "value": "National Intelligence Service (Albania)"
     },
     {
       "description": "Directorate of Judicial Surveillance (DOJ) – Dirección de Observaciones Judiciales",
       "meta": {
-        "country": "Argentina",
+        "country": "AR",
+        "country_name": "Argentina",
         "refs": [
           "https://en.wikipedia.org/wiki/Direcci%C3%B3n_de_Observaciones_Judiciales"
         ]
       },
       "related": [],
-      "uuid": "928ae983-fe94-4f21-b97e-01e6bb6ed012",
+      "uuid": "5ddb30c6-60b6-4dbf-b81a-314a9adac406",
       "value": "Dirección de Observaciones Judiciales"
     },
     {
       "description": "Federal Counternarcotics Service (SEFECONAR) – Servicio Federal de Lucha contra el Narcotráfico",
       "meta": {
-        "country": "Argentina",
+        "country": "AR",
+        "country_name": "Argentina",
         "refs": [
           "https://en.wikipedia.org/wiki/Servicio_Federal_de_Lucha_contra_el_Narcotr%C3%A1fico"
         ]
       },
       "related": [],
-      "uuid": "c9435616-f5e0-44f9-9d3b-96f4f9d3b6a3",
+      "uuid": "d7461a7d-8a2b-442d-8a67-56449de20970",
       "value": "Servicio Federal de Lucha contra el Narcotráfico"
     },
     {
       "description": "Argentine National Gendarmerie Intelligence (SIGN) – Inteligencia de la Gendarmería Nacional Argentina",
       "meta": {
-        "country": "Argentina",
+        "country": "AR",
+        "country_name": "Argentina",
         "refs": [
           "https://en.wikipedia.org/wiki/Inteligencia_de_la_Gendarmer%C3%ADa_Nacional_Argentina"
         ]
       },
       "related": [],
-      "uuid": "2a2b058f-a426-45b9-809e-1430d530dc5e",
+      "uuid": "4f7a01a6-e4c8-4f09-86a5-a1cfad48a5ed",
       "value": "Inteligencia de la Gendarmería Nacional Argentina"
     },
     {
       "description": "National Directorate of Strategic Military Intelligence (DNIEM) – Dirección Nacional de Inteligencia Estratégica Militar",
       "meta": {
-        "country": "Argentina",
+        "country": "AR",
+        "country_name": "Argentina",
         "refs": [
           "https://en.wikipedia.org/wiki/Direcci%C3%B3n_Nacional_de_Inteligencia_Estrat%C3%A9gica_Militar"
         ]
       },
       "related": [],
-      "uuid": "0dcd92aa-1155-4b67-88e7-048c9576b2ee",
+      "uuid": "b90b5736-4161-4751-b0ea-ecb4f7fdce6a",
       "value": "Dirección Nacional de Inteligencia Estratégica Militar"
     },
     {
       "description": "Federal Penitentiary Service Intelligence – Inteligencia del Servicio Penitenciario Federal",
       "meta": {
-        "country": "Argentina",
+        "country": "AR",
+        "country_name": "Argentina",
         "refs": [
           "https://en.wikipedia.org/wiki/Inteligencia_del_Servicio_Penitenciario_Federal"
         ]
       },
       "related": [],
-      "uuid": "7961ac26-a773-4503-8902-ef010e496457",
+      "uuid": "f8ab33e2-b9c9-47df-b0b4-bf2deefcfc96",
       "value": "Inteligencia del Servicio Penitenciario Federal"
     },
     {
       "description": "Airport Security Police Intelligence – Inteligencia de la Policía de Seguridad Aeroportuaria",
       "meta": {
-        "country": "Argentina",
+        "country": "AR",
+        "country_name": "Argentina",
         "refs": [
           "https://en.wikipedia.org/wiki/Inteligencia_de_la_Polic%C3%ADa_de_Seguridad_Aeroportuaria"
         ]
       },
       "related": [],
-      "uuid": "05d49308-07e7-4189-bbdf-8675b294f97b",
+      "uuid": "9ea32e42-3f75-4b6b-a065-b51bc8be9250",
       "value": "Inteligencia de la Policía de Seguridad Aeroportuaria"
     },
     {
       "description": "National Directorate of Criminal Intelligence (DNIC) – Dirección Nacional de Inteligencia Criminal",
       "meta": {
-        "country": "Argentina",
+        "country": "AR",
+        "country_name": "Argentina",
         "refs": [
           "https://en.wikipedia.org/wiki/Direcci%C3%B3n_Nacional_de_Inteligencia_Criminal"
         ]
       },
       "related": [],
-      "uuid": "fed825bc-1875-4bf7-856a-bb538f18fc33",
+      "uuid": "3904d7df-218b-4949-8845-0ef118aecad7",
       "value": "Dirección Nacional de Inteligencia Criminal"
     },
     {
       "description": "Argentine Federal Police Intelligence – Inteligencia de la Policía Federal Argentina",
       "meta": {
-        "country": "Argentina",
+        "country": "AR",
+        "country_name": "Argentina",
         "refs": [
           "https://en.wikipedia.org/wiki/Inteligencia_de_la_Polic%C3%ADa_Federal_Argentina"
         ]
       },
       "related": [],
-      "uuid": "8db04ab5-cb43-4483-8297-1ef88d7686ad",
+      "uuid": "971276dd-a29e-4979-8847-7bd406e93a8b",
       "value": "Inteligencia de la Policía Federal Argentina"
     },
     {
       "description": "Buenos Aires Police Intelligence (SIPBA) (Buenos Aires Police Intelligence) – Inteligencia de la Policía Bonaerense",
       "meta": {
-        "country": "Argentina",
+        "country": "AR",
+        "country_name": "Argentina",
         "refs": [
           "https://en.wikipedia.org/wiki/Inteligencia_de_la_Polic%C3%ADa_Bonaerense"
         ]
       },
       "related": [],
-      "uuid": "ffe0e77b-4c58-48b8-bc3d-41141548e604",
+      "uuid": "413e5b10-942c-4e1a-b424-4ae63980e4d9",
       "value": "Inteligencia de la Policía Bonaerense"
     },
     {
       "description": "Argentine Naval Prefecture Intelligence (SIPN) – Inteligencia de la Prefectura Naval Argentina",
       "meta": {
-        "country": "Argentina",
+        "country": "AR",
+        "country_name": "Argentina",
         "refs": [
           "https://en.wikipedia.org/wiki/Inteligencia_de_la_Prefectura_Naval_Argentina"
         ]
       },
       "related": [],
-      "uuid": "406d45d6-a249-4974-baf5-eb4e02320b80",
+      "uuid": "ca4500fd-91c5-4aff-a129-f0595252f96c",
       "value": "Inteligencia de la Prefectura Naval Argentina"
     },
     {
       "description": "Financial Intelligence Unit (UIF) – Unidad de Inteligencia Financiera",
       "meta": {
-        "country": "Argentina",
+        "country": "AR",
+        "country_name": "Argentina",
         "refs": [
           "https://en.wikipedia.org/wiki/Unidad_de_Inteligencia_Financiera_(Argentina)"
         ],
@@ -175,25 +188,27 @@
         ]
       },
       "related": [],
-      "uuid": "ebc1ebea-519a-4f3c-a5e4-1ecfe96588f2",
+      "uuid": "07ef7070-8372-4cc2-b964-7e4bbce18bc0",
       "value": "Unidad de Inteligencia Financiera (Argentina)"
     },
     {
       "description": "Military Intelligence Collection Center (CRIM) – Central de Reunión de Inteligencia Militar",
       "meta": {
-        "country": "Argentina",
+        "country": "AR",
+        "country_name": "Argentina",
         "refs": [
           "https://en.wikipedia.org/wiki/Central_de_Reuni%C3%B3n_de_Inteligencia_Militar"
         ]
       },
       "related": [],
-      "uuid": "ec72fea4-5696-42fa-bac5-e971be3d81bc",
+      "uuid": "37260077-694b-4cd8-8c70-e42dfa4a3f8c",
       "value": "Central de Reunión de Inteligencia Militar"
     },
     {
       "description": "Army Intelligence Service (SIE) – Servicio de Inteligencia del Ejército",
       "meta": {
-        "country": "Argentina",
+        "country": "AR",
+        "country_name": "Argentina",
         "refs": [
           "https://en.wikipedia.org/wiki/Servicio_de_Inteligencia_del_Ej%C3%A9rcito_(Argentina)"
         ],
@@ -204,13 +219,14 @@
         ]
       },
       "related": [],
-      "uuid": "9d93b5ea-d386-4441-a1db-b3d8915953cb",
+      "uuid": "11c6311b-194d-47f9-8a86-2b9fa5ee55d7",
       "value": "Servicio de Inteligencia del Ejército (Argentina)"
     },
     {
       "description": "Naval Intelligence Service (SIN) – Servicio de Inteligencia Naval",
       "meta": {
-        "country": "Argentina",
+        "country": "AR",
+        "country_name": "Argentina",
         "refs": [
           "https://en.wikipedia.org/wiki/Servicio_de_Inteligencia_Naval_(Argentina)"
         ],
@@ -221,13 +237,14 @@
         ]
       },
       "related": [],
-      "uuid": "a2e6c33d-96ee-437e-8e2e-c64f22c69e19",
+      "uuid": "d347e31f-13c7-474c-b1ed-6ad35a4c194a",
       "value": "Servicio de Inteligencia Naval (Argentina)"
     },
     {
       "description": "Air Force Intelligence Service (SIFA) – Servicio de Inteligencia de la Fuerza Aérea",
       "meta": {
-        "country": "Argentina",
+        "country": "AR",
+        "country_name": "Argentina",
         "refs": [
           "https://en.wikipedia.org/wiki/Servicio_de_Inteligencia_de_la_Fuerza_A%C3%A9rea_(Argentina)"
         ],
@@ -238,97 +255,105 @@
         ]
       },
       "related": [],
-      "uuid": "2b5e5bd6-dc66-46b0-8505-c261c2c0056c",
+      "uuid": "c572ef76-3750-47c9-b47e-aeca300b2def",
       "value": "Servicio de Inteligencia de la Fuerza Aérea (Argentina)"
     },
     {
       "description": "National Security Service (NSS)",
       "meta": {
-        "country": "Armenia",
+        "country": "AM",
+        "country_name": "Armenia",
         "refs": [
           "https://en.wikipedia.org/wiki/National_Security_Service_(Armenia)"
         ]
       },
       "related": [],
-      "uuid": "30ee16a8-214f-47f3-b5ad-be33f5202bcc",
+      "uuid": "b5926111-0ae4-4eee-ba68-07e6623fddf2",
       "value": "National Security Service (Armenia)"
     },
     {
       "description": "Australian Security Intelligence Organisation (ASIO)",
       "meta": {
-        "country": "Australia",
+        "country": "AU",
+        "country_name": "Australia",
         "refs": [
           "https://en.wikipedia.org/wiki/Australian_Security_Intelligence_Organisation"
         ]
       },
       "related": [],
-      "uuid": "f07f94f8-182e-4f3f-ad23-8e9075d93158",
+      "uuid": "b6b30250-d905-4c69-9e87-3f5fdc8e1bda",
       "value": "Australian Security Intelligence Organisation"
     },
     {
       "description": "Australian Secret Intelligence Service (ASIS)",
       "meta": {
-        "country": "Australia",
+        "country": "AU",
+        "country_name": "Australia",
         "refs": [
           "https://en.wikipedia.org/wiki/Australian_Secret_Intelligence_Service"
         ]
       },
       "related": [],
-      "uuid": "b92c0f94-f543-4b5f-9eae-cdcbeb686972",
+      "uuid": "2e6aa670-7ad0-4865-86a6-88de028d5213",
       "value": "Australian Secret Intelligence Service"
     },
     {
       "description": "Australian Signals Directorate (ASD)",
       "meta": {
-        "country": "Australia",
+        "country": "AU",
+        "country_name": "Australia",
         "refs": [
           "https://en.wikipedia.org/wiki/Australian_Signals_Directorate"
         ]
       },
       "related": [],
-      "uuid": "e5c8fd30-3d8c-4d72-926e-b4bf099bfe26",
+      "uuid": "a6d69cde-3f51-42fd-92c4-dfec582bc8ae",
       "value": "Australian Signals Directorate"
     },
     {
       "description": "Australian Geospatial-Intelligence Organisation (AGO)",
       "meta": {
-        "country": "Australia",
+        "country": "AU",
+        "country_name": "Australia",
         "refs": [
           "https://en.wikipedia.org/wiki/Australian_Geospatial-Intelligence_Organisation"
         ]
       },
       "related": [],
-      "uuid": "cd8eb545-58df-4790-9cdb-b9c983e4c13d",
+      "uuid": "e98c92b8-d8bc-4bee-96fc-b86c6e579214",
       "value": "Australian Geospatial-Intelligence Organisation"
     },
     {
       "description": "Defence Intelligence Organisation (DIO)",
       "meta": {
-        "country": "Australia",
+        "country": "AU",
+        "country_name": "Australia",
         "refs": [
           "https://en.wikipedia.org/wiki/Defence_Intelligence_Organisation"
         ]
       },
       "related": [],
-      "uuid": "0b8c0f63-51c3-47d7-8a10-56f605774c9d",
+      "uuid": "b1cc7568-1acc-4dd1-bbe2-a58666f81b27",
       "value": "Defence Intelligence Organisation"
     },
     {
       "description": "Office of National Intelligence (ONI)",
       "meta": {
-        "country": "Australia",
+        "country": "AU",
+        "country_name": "Australia",
         "refs": [
           "https://en.wikipedia.org/wiki/Office_of_National_Intelligence_(Australia)"
         ]
       },
       "related": [],
-      "uuid": "5d8e4538-1da3-41ad-89da-6efb9c70768e",
+      "uuid": "0637b658-e539-4bf3-8d37-af60429d0931",
       "value": "Office of National Intelligence (Australia)"
     },
     {
       "description": "Heeresnachrichtenamt (HNA): Army Intelligence Office",
       "meta": {
-        "country": "Austria",
+        "country": "AT",
+        "country_name": "Austria",
         "refs": [
           "https://en.wikipedia.org/wiki/Heeresnachrichtenamt"
         ],
@@ -339,13 +364,14 @@
         ]
       },
       "related": [],
-      "uuid": "508d2415-93a7-4aca-ba22-bba1c3e34958",
+      "uuid": "e97c06a3-71d5-40b7-a3ed-901036e1845f",
       "value": "Heeresnachrichtenamt"
     },
     {
       "description": " Abwehramt (AbwA): Counter-Intelligence Office [2]",
       "meta": {
-        "country": "Austria",
+        "country": "AT",
+        "country_name": "Austria",
         "refs": [
           "https://en.wikipedia.org/wiki/Ministry_of_Defence_(Austria)#Subordinate_departments"
         ],
@@ -356,994 +382,1077 @@
         ]
       },
       "related": [],
-      "uuid": "9c0c595a-a220-418f-b91e-acc7d4cdb429",
+      "uuid": "c9505672-910c-4104-8b99-c5c7faaca1df",
       "value": "Ministry of Defence (Austria)"
     },
     {
       "description": "Direktion Staatsschutz und Nachrichtendienst (DSN): State Security and Intelligence Directorate",
       "meta": {
-        "country": "Austria",
+        "country": "AT",
+        "country_name": "Austria",
         "refs": [
           "https://en.wikipedia.org/wiki/State_Security_and_Intelligence_Directorate"
         ]
       },
       "related": [],
-      "uuid": "179fcbe1-bedf-4300-8d93-e8146e4447e2",
+      "uuid": "e15457ce-0ea7-4a1b-ba79-5775bfb2ca0d",
       "value": "State Security and Intelligence Directorate"
     },
     {
       "description": "State Security Service (Dövlət Təhlükəsizliyi Xidməti)",
       "meta": {
-        "country": "Azerbaijan",
+        "country": "AZ",
+        "country_name": "Azerbaijan",
         "refs": [
           "https://en.wikipedia.org/wiki/State_Security_Service_of_the_Republic_of_Azerbaijan"
         ]
       },
       "related": [],
-      "uuid": "d9e70011-4687-4d80-9f99-f3fa3f5bff38",
+      "uuid": "9d37bbb9-77a1-48c1-ba89-318882cdc8df",
       "value": "State Security Service of the Republic of Azerbaijan"
     },
     {
       "description": "Foreign Intelligence Service (Xarici Kəşfiyyat Xidməti)",
       "meta": {
-        "country": "Azerbaijan",
+        "country": "AZ",
+        "country_name": "Azerbaijan",
         "refs": [
           "https://en.wikipedia.org/wiki/Foreign_Intelligence_Service_(Azerbaijan)"
         ]
       },
       "related": [],
-      "uuid": "b5d8adcf-3fef-41de-b71a-2babd17a4df0",
+      "uuid": "ffe3e9e2-614e-42e1-a728-04133d2f268a",
       "value": "Foreign Intelligence Service (Azerbaijan)"
     },
     {
       "description": "Financial Monitoring Service (Maliyyə Monitorinqi Xidməti)",
       "meta": {
-        "country": "Azerbaijan",
+        "country": "AZ",
+        "country_name": "Azerbaijan",
         "refs": [
           "https://en.wikipedia.org/wiki/Financial_Monitoring_Service_(Azerbaijan)"
         ]
       },
       "related": [],
-      "uuid": "d82a6288-0a78-4f5a-878e-6c9d74d47fa4",
+      "uuid": "b0b08a46-6828-4a76-b950-7b33080e514e",
       "value": "Financial Monitoring Service (Azerbaijan)"
     },
     {
       "description": "Security and Intelligence Branch (SIB)",
       "meta": {
-        "country": "Bahamas",
+        "country": "BS",
+        "country_name": "Bahamas",
         "refs": [
           "https://en.wikipedia.org/wiki/Special_Branch#Bahamas"
         ]
       },
       "related": [],
-      "uuid": "0df81880-e825-42f6-b17a-379f900c7944",
+      "uuid": "7ee96458-af7b-423e-8300-002a7389e934",
       "value": "Special Branch"
     },
     {
       "description": "Financial Intelligence Unit (FIU)",
       "meta": {
-        "country": "Bahamas",
+        "country": "BS",
+        "country_name": "Bahamas",
         "refs": [
           "https://en.wikipedia.org/wiki/Financial_Intelligence_Unit"
         ]
       },
       "related": [],
-      "uuid": "a8fcc1ac-3104-4f29-bfe8-e61e945eb1b7",
+      "uuid": "23a169a2-c94c-433e-98ba-4d0bb65d99a4",
       "value": "Financial Intelligence Unit"
     },
     {
       "description": "NSA – National Security Agency",
       "meta": {
-        "country": "Bahrain",
+        "country": "BH",
+        "country_name": "Bahrain",
         "refs": [
           "https://en.wikipedia.org/wiki/National_Security_Agency_(Bahrain)"
         ]
       },
       "related": [],
-      "uuid": "fd5bcbe9-2e7a-40c4-82a5-38bfb2e5fe68",
+      "uuid": "91261f6a-10a4-476c-a360-f259194af033",
       "value": "National Security Agency (Bahrain)"
     },
     {
       "description": "National Committee for Intelligence Coordination",
       "meta": {
-        "country": "Bangladesh",
+        "country": "BD",
+        "country_name": "Bangladesh",
         "refs": [
           "https://en.wikipedia.org/wiki/National_Committee_for_Intelligence_Coordination"
         ]
       },
       "related": [],
-      "uuid": "36c94244-b2bf-4f94-8094-ec5671a44301",
+      "uuid": "0e006d92-b265-44e5-8e9e-f5997069f528",
       "value": "National Committee for Intelligence Coordination"
     },
     {
       "description": "National Security Intelligence (NSI)",
       "meta": {
-        "country": "Bangladesh",
+        "country": "BD",
+        "country_name": "Bangladesh",
         "refs": [
           "https://en.wikipedia.org/wiki/National_Security_Intelligence"
         ]
       },
       "related": [],
-      "uuid": "3152332b-578e-4997-8a39-b6430fe55f95",
+      "uuid": "d0617bfa-f5d5-48d0-b228-a5f7bab04bc9",
       "value": "National Security Intelligence"
     },
     {
       "description": "Special Security Force – Intelligence Bureau (SSF-IB)",
       "meta": {
-        "country": "Bangladesh",
+        "country": "BD",
+        "country_name": "Bangladesh",
         "refs": [
           "https://en.wikipedia.org/wiki/Special_Security_Force"
         ]
       },
       "related": [],
-      "uuid": "931ad88e-2a99-4f27-bf4c-35c01738d828",
+      "uuid": "cc79e063-aa0b-4a5f-9b0a-120a31536fd5",
       "value": "Special Security Force"
     },
     {
       "description": "National Security Affairs Cell[3]",
       "meta": {
-        "country": "Bangladesh",
+        "country": "BD",
+        "country_name": "Bangladesh",
         "refs": [
           "https://en.wikipedia.org/wiki/National_Security_Affairs_Cell"
         ]
       },
       "related": [],
-      "uuid": "a36dc1d4-1cfb-4c73-8766-4fab58b53175",
+      "uuid": "1dec9c8d-eeb9-453e-9171-e61a9ac18d0c",
       "value": "National Security Affairs Cell"
     },
     {
       "description": "Special Branch (SB)",
       "meta": {
-        "country": "Bangladesh",
+        "country": "BD",
+        "country_name": "Bangladesh",
         "refs": [
           "https://en.wikipedia.org/wiki/Special_Branch,_Bangladesh_Police"
         ]
       },
       "related": [],
-      "uuid": "058b6e81-8e92-4e27-9650-f7f28e0cb929",
+      "uuid": "6d1f4478-d033-4dbe-871c-f95377574c53",
       "value": "Special Branch, Bangladesh Police"
     },
     {
       "description": "Detective Branch (DB)",
       "meta": {
-        "country": "Bangladesh",
+        "country": "BD",
+        "country_name": "Bangladesh",
         "refs": [
           "https://en.wikipedia.org/wiki/Detective_Branch,_Bangladesh_Police"
         ]
       },
       "related": [],
-      "uuid": "840ad081-5259-4569-b85a-77cc2114011f",
+      "uuid": "008d243d-ca8b-4480-a984-1bd208658662",
       "value": "Detective Branch, Bangladesh Police"
     },
     {
       "description": "Police Bureau of Investigation (PBI)",
       "meta": {
-        "country": "Bangladesh",
+        "country": "BD",
+        "country_name": "Bangladesh",
         "refs": [
           "https://en.wikipedia.org/wiki/Police_Bureau_of_Investigation"
         ]
       },
       "related": [],
-      "uuid": "19908248-2d5e-42b5-889f-6ad0e026f839",
+      "uuid": "d46f9bf3-0da4-4f20-854e-14bb58623c9a",
       "value": "Police Bureau of Investigation"
     },
     {
       "description": "Criminal Investigation Department (CID)",
       "meta": {
-        "country": "Bangladesh",
+        "country": "BD",
+        "country_name": "Bangladesh",
         "refs": [
           "https://en.wikipedia.org/wiki/Criminal_Investigation_Department_(Bangladesh)"
         ]
       },
       "related": [],
-      "uuid": "d2169fd5-6c67-4532-9f5f-0acf17691865",
+      "uuid": "61e9c7c7-e10e-409d-9d80-ea93119eb82d",
       "value": "Criminal Investigation Department (Bangladesh)"
     },
     {
       "description": "Counter Terrorism and Transnational Crime (CTTC)",
       "meta": {
-        "country": "Bangladesh",
+        "country": "BD",
+        "country_name": "Bangladesh",
         "refs": [
           "https://en.wikipedia.org/wiki/Counter_Terrorism_and_Transnational_Crime"
         ]
       },
       "related": [],
-      "uuid": "17580d39-e160-422c-ad2d-66462686377c",
+      "uuid": "acc23747-a985-4b3f-b2d1-68f32fd6143d",
       "value": "Counter Terrorism and Transnational Crime"
     },
     {
       "description": "Rapid Action Battalion – Intelligence Wing (RAB-IW)",
       "meta": {
-        "country": "Bangladesh",
+        "country": "BD",
+        "country_name": "Bangladesh",
         "refs": [
           "https://en.wikipedia.org/wiki/Rapid_Action_Battalion"
         ]
       },
       "related": [],
-      "uuid": "4212d7ed-7252-4c75-865a-a39f635b92cc",
+      "uuid": "a884df31-170a-4eed-98ca-4e9a7da6b823",
       "value": "Rapid Action Battalion"
     },
     {
       "description": "Directorate General of Forces Intelligence (DGFI)",
       "meta": {
-        "country": "Bangladesh",
+        "country": "BD",
+        "country_name": "Bangladesh",
         "refs": [
           "https://en.wikipedia.org/wiki/Directorate_General_of_Forces_Intelligence"
         ]
       },
       "related": [],
-      "uuid": "e071c241-48b3-4a51-bd23-b247fe9f4a6b",
+      "uuid": "481d46c8-dac3-4fa7-81ed-a2ac38d1c9b4",
       "value": "Directorate General of Forces Intelligence"
     },
     {
       "description": "Counter Terrorism and Intelligence Bureau (CTIB)",
       "meta": {
-        "country": "Bangladesh",
+        "country": "BD",
+        "country_name": "Bangladesh",
         "refs": [
           "https://en.wikipedia.org/wiki/Counter_Terrorism_and_Intelligence_Bureau"
         ]
       },
       "related": [],
-      "uuid": "60f03c05-79e2-407c-b8a7-a3f82709e802",
+      "uuid": "de90e866-2567-4f92-817c-75e3686e3fad",
       "value": "Counter Terrorism and Intelligence Bureau"
     },
     {
       "description": "National Telecommunication Monitoring Centre (NTMC)",
       "meta": {
-        "country": "Bangladesh",
+        "country": "BD",
+        "country_name": "Bangladesh",
         "refs": [
           "https://en.wikipedia.org/wiki/National_Telecommunication_Monitoring_Centre"
         ]
       },
       "related": [],
-      "uuid": "85a202f1-2180-4929-9da2-cdf13de9ad41",
+      "uuid": "90fd0181-2e4a-4067-899c-980999a997a0",
       "value": "National Telecommunication Monitoring Centre"
     },
     {
       "description": "Central Intelligence Unit (CIU)",
       "meta": {
-        "country": "Bangladesh",
+        "country": "BD",
+        "country_name": "Bangladesh",
         "refs": [
           "https://en.wikipedia.org/wiki/National_Board_of_Revenue"
         ]
       },
       "related": [],
-      "uuid": "e4b4abd6-9d44-4db9-b505-ef0900d3930b",
+      "uuid": "15b26a5c-5be5-4e4f-aa6c-d16e0a03d327",
       "value": "National Board of Revenue"
     },
     {
       "description": "Bangladesh Financial Intelligence Unit (BFIU)",
       "meta": {
-        "country": "Bangladesh",
+        "country": "BD",
+        "country_name": "Bangladesh",
         "refs": [
           "https://en.wikipedia.org/wiki/Bangladesh_Financial_Intelligence_Unit"
         ]
       },
       "related": [],
-      "uuid": "fd971bf9-1ef1-4371-ac8a-f6ebdbdb8a28",
+      "uuid": "68fef06c-de4e-4ce8-87e6-c562678a6f01",
       "value": "Bangladesh Financial Intelligence Unit"
     },
     {
       "description": "Digital Security Agency",
       "meta": {
-        "country": "Bangladesh",
+        "country": "BD",
+        "country_name": "Bangladesh",
         "refs": [
           "https://en.wikipedia.org/wiki/Digital_Security_Agency"
         ]
       },
       "related": [],
-      "uuid": "b8ba18fc-65c5-4d56-8c7b-bed9b9a64c96",
+      "uuid": "36040d5d-a005-4979-8521-662bb9d19f19",
       "value": "Digital Security Agency"
     },
     {
       "description": "Financial Intelligence Unit (FIU)",
       "meta": {
-        "country": "Barbados",
+        "country": "BB",
+        "country_name": "Barbados",
         "refs": [
           "https://en.wikipedia.org/wiki/Financial_Intelligence_Unit"
         ]
       },
       "related": [],
-      "uuid": "a8fcc1ac-3104-4f29-bfe8-e61e945eb1b7",
+      "uuid": "23a169a2-c94c-433e-98ba-4d0bb65d99a4",
       "value": "Financial Intelligence Unit"
     },
     {
       "description": "Criminal Investigations Department (CID)",
       "meta": {
-        "country": "Barbados",
+        "country": "BB",
+        "country_name": "Barbados",
         "refs": [
           "https://en.wikipedia.org/wiki/Criminal_Investigations_Department"
         ]
       },
       "related": [],
-      "uuid": "6a48825d-ca6e-4ca1-b60e-130c21334e5f",
+      "uuid": "93deba22-96ea-48cc-9290-3a2244a4ad6d",
       "value": "Criminal Investigations Department"
     },
     {
       "description": "State Security Committee of the Republic of Belarus (KDB/KGB) (State Security Committee)",
       "meta": {
-        "country": "Belarus",
+        "country": "BY",
+        "country_name": "Belarus",
         "refs": [
           "https://en.wikipedia.org/wiki/State_Security_Committee_of_the_Republic_of_Belarus"
         ]
       },
       "related": [],
-      "uuid": "7f7c094a-da05-4bb7-9907-a9a45606d067",
+      "uuid": "b975d731-befe-4235-b928-1d8229d48428",
       "value": "State Security Committee of the Republic of Belarus"
     },
     {
       "description": "VSSE (State Security Service)",
       "meta": {
-        "country": "Belgium",
+        "country": "BE",
+        "country_name": "Belgium",
         "refs": [
           "https://en.wikipedia.org/wiki/Belgian_State_Security_Service"
         ]
       },
       "related": [],
-      "uuid": "8155042a-05bf-418e-9035-a7b881e70f1d",
+      "uuid": "ef3f0b3c-3ff3-4ff7-b092-7b3846f4d290",
       "value": "Belgian State Security Service"
     },
     {
       "description": "ADIV / SGRS (ADIV/SGRS) (General Intelligence and Security Service, military intelligence)",
       "meta": {
-        "country": "Belgium",
+        "country": "BE",
+        "country_name": "Belgium",
         "refs": [
           "https://en.wikipedia.org/wiki/Belgian_General_Information_and_Security_Service"
         ]
       },
       "related": [],
-      "uuid": "e67a17c4-b0bc-4903-adfa-820d215f2bca",
+      "uuid": "c8aba4b4-014c-4e53-9366-d73cb341a494",
       "value": "Belgian General Information and Security Service"
     },
     {
       "description": "Intelligence-Security Agency of Bosnia and Herzegovina (OSA)",
       "meta": {
-        "country": "Bosnia and Herzegovina",
+        "country": "BA",
+        "country_name": "Bosnia and Herzegovina",
         "refs": [
           "https://en.wikipedia.org/wiki/Intelligence-Security_Agency_of_Bosnia_and_Herzegovina"
         ]
       },
       "related": [],
-      "uuid": "beced41a-42b7-4320-b61f-a1e9b6e37614",
+      "uuid": "930087e3-d463-491d-b786-916a44ed266c",
       "value": "Intelligence-Security Agency of Bosnia and Herzegovina"
     },
     {
       "description": "Državna Agencija za Istrage i Zaštitu (State Investigation and Protection Agency, SIPA)",
       "meta": {
-        "country": "Bosnia and Herzegovina",
+        "country": "BA",
+        "country_name": "Bosnia and Herzegovina",
         "refs": [
           "https://en.wikipedia.org/wiki/Dr%C5%BEavna_Agencija_za_Istrage_i_Za%C5%A1titu"
         ]
       },
       "related": [],
-      "uuid": "317b2c51-616d-4e2c-bce9-5aee6e2bbd9a",
+      "uuid": "8b288c07-8f64-45ef-91bc-6683768bda02",
       "value": "Državna Agencija za Istrage i Zaštitu"
     },
     {
       "description": "Directorate on Intelligence and Security Services (DISS – Ministry of State President Espionage & Counter Intelligence unit)",
       "meta": {
-        "country": "Botswana",
+        "country": "BW",
+        "country_name": "Botswana",
         "refs": [
           "https://en.wikipedia.org/wiki/Directorate_of_Intelligence_and_Security"
         ]
       },
       "related": [],
-      "uuid": "2b071db1-f9c4-4de8-8918-7506762ce4a1",
+      "uuid": "67d84e0c-9c44-41d5-8f89-63e37a5f7f39",
       "value": "Directorate of Intelligence and Security"
     },
     {
       "description": "Brazilian Intelligence Agency (ABIN)",
       "meta": {
-        "country": "Brazil",
+        "country": "BR",
+        "country_name": "Brazil",
         "refs": [
           "https://en.wikipedia.org/wiki/Brazilian_Intelligence_Agency"
         ]
       },
       "related": [],
-      "uuid": "7b041248-97d3-438b-8e87-563794eb2a47",
+      "uuid": "274a02ce-5dcf-41ae-8fcb-123e597af6e8",
       "value": "Brazilian Intelligence Agency"
     },
     {
       "description": "Federal Police Department (DPF) (counterintelligence agency)",
       "meta": {
-        "country": "Brazil",
+        "country": "BR",
+        "country_name": "Brazil",
         "refs": [
           "https://en.wikipedia.org/wiki/Federal_Police_Department"
         ]
       },
       "related": [],
-      "uuid": "92da2a48-8533-402d-b39a-31d89a357999",
+      "uuid": "b68bd0de-deeb-4291-bb9c-80789772da0d",
       "value": "Federal Police Department"
     },
     {
       "description": "Gabinete de Segurança Institucional (Institutional Security Bureau) (GSI) Responds directly to the president's office and the armed forces. Coordinates some intelligence operations.",
       "meta": {
-        "country": "Brazil",
+        "country": "BR",
+        "country_name": "Brazil",
         "refs": [
           "https://en.wikipedia.org/wiki/Institutional_Security_Bureau"
         ]
       },
       "related": [],
-      "uuid": "b0ac77ac-c222-4f3b-a9d1-7e4132242951",
+      "uuid": "8522a941-be9f-4983-8851-2f3295cfc4c6",
       "value": "Institutional Security Bureau"
     },
     {
       "description": "Secretaria da Receita Federal do Brasil (Federal Revenue Secretariat) (RFB)  (General Coordination for Research and Investigations - Coordenação-Geral de Pesquisa e Investigação - Copei)",
       "meta": {
-        "country": "Brazil",
+        "country": "BR",
+        "country_name": "Brazil",
         "refs": [
           "https://en.wikipedia.org/wiki/Secretaria_da_Receita_Federal_do_Brasil"
         ]
       },
       "related": [],
-      "uuid": "f4ef4da0-a1c1-482d-a854-4bc337915303",
+      "uuid": "50c471d0-abf6-422c-846a-0ddbd806bdec",
       "value": "Secretaria da Receita Federal do Brasil"
     },
     {
       "description": "Internal Security Department (Brunei)[4]  (internal)",
       "meta": {
-        "country": "Brunei",
+        "country": "BN",
+        "country_name": "Brunei",
         "refs": [
           "https://en.wikipedia.org/wiki/Internal_Security_Department_(Brunei)"
         ]
       },
       "related": [],
-      "uuid": "63d2bbb0-3483-468a-b6f4-6d9c5ae27820",
+      "uuid": "ffc73799-3e7f-4ceb-b147-20a097651708",
       "value": "Internal Security Department (Brunei)"
     },
     {
       "description": "State Intelligence Agency (Държавна агенция „Разузнаване“ (DAR)) – overseas intelligence gathering service under the supervision of the Council of Ministers of Bulgaria",
       "meta": {
-        "country": "Bulgaria",
+        "country": "BG",
+        "country_name": "Bulgaria",
         "refs": [
           "https://en.wikipedia.org/wiki/National_Intelligence_Service_(Bulgaria)"
         ]
       },
       "related": [],
-      "uuid": "4acc5bd2-3eae-4cd3-98d8-0c8523898daf",
+      "uuid": "5ac9dd05-1416-4885-8acb-4e39b5d8cf9e",
       "value": "National Intelligence Service (Bulgaria)"
     },
     {
       "description": "State Agency for National Security (Държавна агенция за национална сигурност (DANS)) – national security service under the supervision of the Council of Ministers of Bulgaria",
       "meta": {
-        "country": "Bulgaria",
+        "country": "BG",
+        "country_name": "Bulgaria",
         "refs": [
           "https://en.wikipedia.org/wiki/State_Agency_for_National_Security"
         ]
       },
       "related": [],
-      "uuid": "eab2557b-cd0c-46c2-8d61-95795c5723f8",
+      "uuid": "17d4c339-c189-45fe-a236-2a03ec843796",
       "value": "State Agency for National Security"
     },
     {
       "description": "Service national de renseignement (SNR)",
       "meta": {
-        "country": "Burundi",
+        "country": "BI",
+        "country_name": "Burundi",
         "refs": [
           "https://en.wikipedia.org/wiki/National_Intelligence_Service_(Burundi)"
         ]
       },
       "related": [],
-      "uuid": "ac06caf9-0f47-4e60-9052-1ba161cbe893",
+      "uuid": "0a0c2c3c-ae9c-4717-8c24-f4b9bf36f9e9",
       "value": "National Intelligence Service (Burundi)"
     },
     {
       "description": "Canadian Security Intelligence Service (CSIS)",
       "meta": {
-        "country": "Canada",
+        "country": "CA",
+        "country_name": "Canada",
         "refs": [
           "https://en.wikipedia.org/wiki/Canadian_Security_Intelligence_Service"
         ]
       },
       "related": [],
-      "uuid": "7d39e11b-9f37-4dc9-b3e6-a2ca38e3068f",
+      "uuid": "9ef2bb66-842d-4d70-babe-33928e309c75",
       "value": "Canadian Security Intelligence Service"
     },
     {
       "description": "Communications Security Establishment (CSE)",
       "meta": {
-        "country": "Canada",
+        "country": "CA",
+        "country_name": "Canada",
         "refs": [
           "https://en.wikipedia.org/wiki/Communications_Security_Establishment_Canada"
         ]
       },
       "related": [],
-      "uuid": "b87b3241-0000-4b33-95d2-1d8a688c7da7",
+      "uuid": "8788086a-17e9-4f3f-a459-6de019b2158c",
       "value": "Communications Security Establishment Canada"
     },
     {
       "description": "Canadian Forces National Counter-Intelligence Unit (DND) operated by the Canadian Forces Military Police Group",
       "meta": {
-        "country": "Canada",
+        "country": "CA",
+        "country_name": "Canada",
         "refs": [
           "https://en.wikipedia.org/wiki/Canadian_Forces_Military_Police"
         ]
       },
       "related": [],
-      "uuid": "6ee745c0-a5f5-4ae3-b2e7-782d959f97b3",
+      "uuid": "02a0d566-40f8-4936-b4e1-4d04dd6624f9",
       "value": "Canadian Forces Military Police"
     },
     {
       "description": "Joint Task Force X",
       "meta": {
-        "country": "Canada"
+        "country": "CA",
+        "country_name": "Canada"
       },
       "related": [],
-      "uuid": "c0970553-a0b9-410b-ba1b-b5603bf3a3fc",
+      "uuid": "78165c10-f285-469b-ade2-3a5abb735e54",
       "value": "Joint Task Force X"
     },
     {
       "description": "Criminal Intelligence Service Canada (CISC)",
       "meta": {
-        "country": "Canada",
+        "country": "CA",
+        "country_name": "Canada",
         "refs": [
           "https://en.wikipedia.org/wiki/Criminal_Intelligence_Service_Canada"
         ]
       },
       "related": [],
-      "uuid": "1aaa70a2-d4b0-41aa-8fa4-25ac2ff75f46",
+      "uuid": "e81c0b13-ec70-46d3-be75-f4a6373340b3",
       "value": "Criminal Intelligence Service Canada"
     },
     {
       "description": "Intelligence Branch",
       "meta": {
-        "country": "Canada",
+        "country": "CA",
+        "country_name": "Canada",
         "refs": [
           "https://en.wikipedia.org/wiki/Intelligence_Branch"
         ]
       },
       "related": [],
-      "uuid": "5c1db5cb-d34c-43c0-9991-63bfcc79f459",
+      "uuid": "c122e10e-4dd7-4a94-a253-02f2374faf8e",
       "value": "Intelligence Branch"
     },
     {
       "description": "Financial Transactions and Reports Analysis Centre of Canada (FINTRAC)",
       "meta": {
-        "country": "Canada",
+        "country": "CA",
+        "country_name": "Canada",
         "refs": [
           "https://en.wikipedia.org/wiki/Financial_Transactions_and_Reports_Analysis_Centre_of_Canada"
         ]
       },
       "related": [],
-      "uuid": "a238ba8d-9ef9-4293-8997-41ba1b35cd1b",
+      "uuid": "7b45b888-620d-476e-b6c7-8948665bff09",
       "value": "Financial Transactions and Reports Analysis Centre of Canada"
     },
     {
       "description": "Global Affairs Canada (GAC) Bureau of Intelligence Analysis and Security and Bureau of Economic Intelligence",
       "meta": {
-        "country": "Canada",
+        "country": "CA",
+        "country_name": "Canada",
         "refs": [
           "https://en.wikipedia.org/wiki/Global_Affairs_Canada"
         ]
       },
       "related": [],
-      "uuid": "f0edbe1c-8d2d-40b0-9d04-4a1658bc1206",
+      "uuid": "1e541dec-d1f0-43ef-bedb-ff1568d77b3f",
       "value": "Global Affairs Canada"
     },
     {
       "description": "Royal Canadian Mounted Police (RCMP) Intelligence Division",
       "meta": {
-        "country": "Canada",
+        "country": "CA",
+        "country_name": "Canada",
         "refs": [
           "https://en.wikipedia.org/wiki/Royal_Canadian_Mounted_Police"
         ]
       },
       "related": [],
-      "uuid": "997baa2c-5830-46b4-a6fa-1e7924a79bb0",
+      "uuid": "4038bc9d-c3a3-470d-9c99-b23e813c5650",
       "value": "Royal Canadian Mounted Police"
     },
     {
       "description": "Canada Border Services Agency (CBSA) Immigrations Intelligence",
       "meta": {
-        "country": "Canada",
+        "country": "CA",
+        "country_name": "Canada",
         "refs": [
           "https://en.wikipedia.org/wiki/Canada_Border_Services_Agency"
         ]
       },
       "related": [],
-      "uuid": "86f1676a-e997-48e5-ae94-7cf9be978110",
+      "uuid": "b6d29549-6b74-4664-a677-d52c2133fff1",
       "value": "Canada Border Services Agency"
     },
     {
       "description": "Canadian Coast Guard (CCG)",
       "meta": {
-        "country": "Canada",
+        "country": "CA",
+        "country_name": "Canada",
         "refs": [
           "https://en.wikipedia.org/wiki/Canadian_Coast_Guard"
         ]
       },
       "related": [],
-      "uuid": "e81a02a7-5715-44ce-96a7-88c57f46ae47",
+      "uuid": "cca20269-584e-498e-b7c6-5a51a9571e90",
       "value": "Canadian Coast Guard"
     },
     {
       "description": "Agence nationale de sécurité (ANS)",
       "meta": {
-        "country": "Chad",
+        "country": "TD",
+        "country_name": "Chad",
         "refs": [
           "https://en.wikipedia.org/wiki/Agence_nationale_de_s%C3%A9curit%C3%A9"
         ]
       },
       "related": [],
-      "uuid": "e22ec52e-cb5c-4c71-bc3b-ff2bc3f70574",
+      "uuid": "0de905ba-5775-4269-98da-9a2237efc1b6",
       "value": "Agence nationale de sécurité"
     },
     {
       "description": "National Intelligence Agency (ANI) – Agencia Nacional de Inteligencia",
       "meta": {
-        "country": "Chile",
+        "country": "CL",
+        "country_name": "Chile",
         "refs": [
           "https://en.wikipedia.org/wiki/Agencia_Nacional_de_Inteligencia"
         ]
       },
       "related": [],
-      "uuid": "8362071e-f496-435f-971c-4368328845e8",
+      "uuid": "20e956ba-9020-4261-a353-f640e6b234b2",
       "value": "Agencia Nacional de Inteligencia"
     },
     {
       "description": "610 Office",
       "meta": {
-        "country": "People's Republic of China",
+        "country": "CN",
+        "country_name": "People's Republic of China",
         "refs": [
           "https://en.wikipedia.org/wiki/610_Office"
         ]
       },
       "related": [],
-      "uuid": "4323dec5-dfd1-4345-bf1f-5fe5b0296eeb",
+      "uuid": "c6ec1c40-5440-4a26-83ee-e1cad2a513ab",
       "value": "610 Office"
     },
     {
       "description": "International Department (ID)",
       "meta": {
-        "country": "People's Republic of China",
+        "country": "CN",
+        "country_name": "People's Republic of China",
         "refs": [
           "https://en.wikipedia.org/wiki/International_Liaison_Department_of_the_Chinese_Communist_Party"
         ]
       },
       "related": [],
-      "uuid": "b3b81bc4-7d2f-4c3b-8a73-ef692d3a41c2",
+      "uuid": "5e080a56-0434-4777-b99d-a7c94f1f0934",
       "value": "International Liaison Department of the Chinese Communist Party"
     },
     {
       "description": "United Front Work Department (UFWD)",
       "meta": {
-        "country": "People's Republic of China",
+        "country": "CN",
+        "country_name": "People's Republic of China",
         "refs": [
           "https://en.wikipedia.org/wiki/United_Front_Work_Department"
         ]
       },
       "related": [],
-      "uuid": "74f852e7-5f99-443e-8289-5a8ed357bf4f",
+      "uuid": "0fe563cc-29a1-4ab3-8c78-ed519d8b06fe",
       "value": "United Front Work Department"
     },
     {
       "description": "Intelligence Bureau of the General Staff aka 2nd Bureau",
       "meta": {
-        "country": "People's Republic of China",
+        "country": "CN",
+        "country_name": "People's Republic of China",
         "refs": [
           "https://en.wikipedia.org/wiki/Joint_Staff_Department_of_the_Central_Military_Commission_Intelligence_Bureau"
         ]
       },
       "related": [],
-      "uuid": "39e95744-3e71-4fc9-845a-08ff5b31cbdc",
+      "uuid": "215133e8-dea8-4ec1-82e4-3fdd7982c406",
       "value": "Joint Staff Department of the Central Military Commission Intelligence Bureau"
     },
     {
       "description": "People's Liberation Army Air Force (PLAAF)",
       "meta": {
-        "country": "People's Republic of China",
+        "country": "CN",
+        "country_name": "People's Republic of China",
         "refs": [
           "https://en.wikipedia.org/wiki/People%27s_Liberation_Army_Air_Force"
         ]
       },
       "related": [],
-      "uuid": "b385f038-402e-4734-99a7-06f6556e028f",
+      "uuid": "cc46341b-af14-43ed-b00b-8b3b3b4b884e",
       "value": "People's Liberation Army Air Force"
     },
     {
       "description": "People's Liberation Army General Political Department (GND)",
       "meta": {
-        "country": "People's Republic of China",
+        "country": "CN",
+        "country_name": "People's Republic of China",
         "refs": [
           "https://en.wikipedia.org/wiki/People%27s_Liberation_Army_General_Political_Department"
         ]
       },
       "related": [],
-      "uuid": "6f47d511-42ae-4c15-8819-4c04bb80094c",
+      "uuid": "ff5dcc1a-cc20-4f1a-916e-c2f7908e046f",
       "value": "People's Liberation Army General Political Department"
     },
     {
       "description": "People's Liberation Army General Staff Department (GSD)",
       "meta": {
-        "country": "People's Republic of China",
+        "country": "CN",
+        "country_name": "People's Republic of China",
         "refs": [
           "https://en.wikipedia.org/wiki/People%27s_Liberation_Army_General_Staff_Department"
         ]
       },
       "related": [],
-      "uuid": "040e2361-729a-4e1f-a324-5d25cc211fac",
+      "uuid": "668f51cb-fec2-4de9-aca6-1757d34ece03",
       "value": "People's Liberation Army General Staff Department"
     },
     {
       "description": "PLA Unit 61398 aka APT 1",
       "meta": {
-        "country": "People's Republic of China",
+        "country": "CN",
+        "country_name": "People's Republic of China",
         "refs": [
           "https://en.wikipedia.org/wiki/PLA_Unit_61398"
         ]
       },
       "related": [],
-      "uuid": "9717b3dc-643c-4a4a-8867-15eafa0424c8",
+      "uuid": "ff6fefee-8ce0-412d-818a-634a252fc617",
       "value": "PLA Unit 61398"
     },
     {
       "description": "State Administration of Foreign Experts Affairs (SAFEA)",
       "meta": {
-        "country": "People's Republic of China",
+        "country": "CN",
+        "country_name": "People's Republic of China",
         "refs": [
           "https://en.wikipedia.org/wiki/State_Administration_of_Foreign_Experts_Affairs"
         ]
       },
       "related": [],
-      "uuid": "233ac446-f908-4390-bfe9-d66a224bf107",
+      "uuid": "df42c99f-8b0e-4029-b554-aaf212ed9e16",
       "value": "State Administration of Foreign Experts Affairs"
     },
     {
       "description": "Ministry of Public Security (MPS)",
       "meta": {
-        "country": "People's Republic of China",
+        "country": "CN",
+        "country_name": "People's Republic of China",
         "refs": [
           "https://en.wikipedia.org/wiki/Ministry_of_Public_Security_(China)"
         ]
       },
       "related": [],
-      "uuid": "95fc3d5f-b783-45aa-890d-2a5e02ac0ff1",
+      "uuid": "5d6623ce-81cd-4c62-8e2e-dda5b31fda99",
       "value": "Ministry of Public Security (China)"
     },
     {
       "description": "Ministry of State Security (MSS)",
       "meta": {
-        "country": "People's Republic of China",
+        "country": "CN",
+        "country_name": "People's Republic of China",
         "refs": [
           "https://en.wikipedia.org/wiki/Ministry_of_State_Security_(China)"
         ]
       },
       "related": [],
-      "uuid": "a7bcaa50-dac6-4c9d-8ad0-9928c07a1071",
+      "uuid": "c5960379-c37f-46f9-96ec-7e93c10017c2",
       "value": "Ministry of State Security (China)"
     },
     {
       "description": "Office for Safeguarding National Security of the CPG in the HKSAR (CPGNSO)",
       "meta": {
-        "country": "People's Republic of China",
+        "country": "CN",
+        "country_name": "People's Republic of China",
         "refs": [
           "https://en.wikipedia.org/wiki/Office_for_Safeguarding_National_Security_of_the_CPG_in_the_HKSAR"
         ]
       },
       "related": [],
-      "uuid": "07a0bd40-9674-4b75-b5c8-0bd99a86d393",
+      "uuid": "996694b2-3ff2-4d04-8ff2-af0c8997da29",
       "value": "Office for Safeguarding National Security of the CPG in the HKSAR"
     },
     {
       "description": "Dirección Nacional de Inteligencia (DNI)",
       "meta": {
-        "country": "Colombia",
+        "country": "CO",
+        "country_name": "Colombia",
         "refs": [
           "https://en.wikipedia.org/wiki/National_Intelligence_Directorate_(Colombia)"
         ]
       },
       "related": [],
-      "uuid": "efda26ed-090a-4e0f-8a0d-81603e68fe23",
+      "uuid": "7c70bebd-8865-44a7-874c-b422fd4b1623",
       "value": "National Intelligence Directorate (Colombia)"
     },
     {
       "description": "National Intelligence Agency (ANR)",
       "meta": {
-        "country": "Democratic Republic of the Congo",
+        "country": "CD",
+        "country_name": "Democratic Republic of the Congo",
         "refs": [
           "https://en.wikipedia.org/wiki/National_Intelligence_Agency_(Democratic_Republic_of_the_Congo)"
         ]
       },
       "related": [],
-      "uuid": "18f4cb73-cf4d-4364-8f62-6b38ce3c9ba0",
+      "uuid": "efc440f4-8457-4e3b-a7f5-8ccc6a40abc2",
       "value": "National Intelligence Agency (Democratic Republic of the Congo)"
     },
     {
       "description": "General Staff of Military intelligence (ex-DEMIAP)",
       "meta": {
-        "country": "Democratic Republic of the Congo",
+        "country": "CD",
+        "country_name": "Democratic Republic of the Congo",
         "refs": [
           "https://en.wikipedia.org/wiki/DEMIAP"
         ]
       },
       "related": [],
-      "uuid": "36658777-a163-45ca-b197-d5ae07d36a2e",
+      "uuid": "d629f04e-63c4-4101-b29c-cfea77fdfcc1",
       "value": "DEMIAP"
     },
     {
       "description": "Sigurnosno-obavještajna agencija (SOA) (Security and Intelligence Agency)",
       "meta": {
-        "country": "Croatia",
+        "country": "HR",
+        "country_name": "Croatia",
         "refs": [
           "https://en.wikipedia.org/wiki/Security_and_Intelligence_Agency"
         ]
       },
       "related": [],
-      "uuid": "131d3cf0-1715-42f6-b0cd-5b3cb18a77bf",
+      "uuid": "0bd0ab6c-c317-4ad5-8a93-d99e4801c1bf",
       "value": "Security and Intelligence Agency"
     },
     {
       "description": "Vojna sigurnosno-obavještajna agencija (VSOA) (Military Security and Intelligence Agency)",
       "meta": {
-        "country": "Croatia",
+        "country": "HR",
+        "country_name": "Croatia",
         "refs": [
           "https://en.wikipedia.org/wiki/Vojna_sigurnosno-obavje%C5%A1tajna_agencija"
         ]
       },
       "related": [],
-      "uuid": "a2001f5d-fe87-415f-9012-596cd170ea6c",
+      "uuid": "3a1a953e-ce22-478a-b04c-b718f5b1d060",
       "value": "Vojna sigurnosno-obavještajna agencija"
     },
     {
       "description": "Military Counterintelligence Directorate",
       "meta": {
-        "country": "Cuba",
+        "country": "CU",
+        "country_name": "Cuba",
         "refs": [
           "https://en.wikipedia.org/wiki/Direcci%C3%B3n_de_Contra-Inteligencia_Militar"
         ]
       },
       "related": [],
-      "uuid": "5887262d-eb15-4446-ba52-0598d60c3478",
+      "uuid": "cb142c16-b059-4178-813b-c66db09e8bbf",
       "value": "Dirección de Contra-Inteligencia Militar"
     },
     {
       "description": "Dirección General de Inteligencia (DGI)",
       "meta": {
-        "country": "Cuba",
+        "country": "CU",
+        "country_name": "Cuba",
         "refs": [
           "https://en.wikipedia.org/wiki/Intelligence_Directorate"
         ]
       },
       "related": [],
-      "uuid": "19650ff1-b504-42fd-8e72-e8bd1f4bd3bc",
+      "uuid": "ebf0a22c-4d97-4764-b12d-ada01a2dc3ff",
       "value": "Intelligence Directorate"
     },
     {
       "description": "Cyprus Intelligence Service (CIS) (Κυπριακή Υπηρεσία Πληροφοριών)(ΚΥΠ), (former Central Intelligence Service-KYP)",
       "meta": {
-        "country": "Cyprus",
+        "country": "CY",
+        "country_name": "Cyprus",
         "refs": [
           "https://en.wikipedia.org/wiki/Cyprus_Intelligence_Service"
         ]
       },
       "related": [],
-      "uuid": "7bd7428c-4bc7-4603-95b0-509bfb499e14",
+      "uuid": "02e36b8c-649d-4fd3-a6c9-f16cf35ba207",
       "value": "Cyprus Intelligence Service"
     },
     {
       "description": "Security Information Service (Bezpečnostní informační služba, BIS)",
       "meta": {
-        "country": "Czech Republic",
+        "country": "CZ",
+        "country_name": "Czech Republic",
         "refs": [
           "https://en.wikipedia.org/wiki/Security_Information_Service"
         ]
       },
       "related": [],
-      "uuid": "b5f1e4b8-60a0-4b8c-9d37-377039f8d82e",
+      "uuid": "4780dcc1-f4df-4c69-90e7-4c48028cb1d2",
       "value": "Security Information Service"
     },
     {
       "description": "Office for Foreign Relations and Information (Úřad pro zahraniční styky a informace, ÚZSI)",
       "meta": {
-        "country": "Czech Republic",
+        "country": "CZ",
+        "country_name": "Czech Republic",
         "refs": [
           "https://en.wikipedia.org/wiki/Office_for_Foreign_Relations_and_Information"
         ]
       },
       "related": [],
-      "uuid": "ee4c57c8-66af-4f53-8158-260e9828ba1d",
+      "uuid": "82b91e06-591d-4079-8ac2-76f18a2385b5",
       "value": "Office for Foreign Relations and Information"
     },
     {
       "description": "Military Intelligence (Vojenské zpravodajství, VZ)",
       "meta": {
-        "country": "Czech Republic",
+        "country": "CZ",
+        "country_name": "Czech Republic",
         "refs": [
           "https://en.wikipedia.org/wiki/Military_Intelligence_(Czech_Republic)"
         ]
       },
       "related": [],
-      "uuid": "d28ae9d7-1c88-45b9-bac8-072c65811f2a",
+      "uuid": "caab8e76-cb39-4795-868f-c4ceb0e81ab8",
       "value": "Military Intelligence (Czech Republic)"
     },
     {
       "description": "Danish Security and Intelligence Service (Politiets Efterretningstjeneste (PET)).",
       "meta": {
-        "country": "Denmark",
+        "country": "DK",
+        "country_name": "Denmark",
         "refs": [
           "https://en.wikipedia.org/wiki/Danish_Security_and_Intelligence_Service"
         ]
       },
       "related": [],
-      "uuid": "4409d576-f0dd-4fd3-b351-4aedc762e7cc",
+      "uuid": "ca23f993-0ca0-4a89-bb29-7780cc2f9364",
       "value": "Danish Security and Intelligence Service"
     },
     {
       "description": "Danish Defence Intelligence Service (Forsvarets Efterretningstjeneste (FE)).",
       "meta": {
-        "country": "Denmark",
+        "country": "DK",
+        "country_name": "Denmark",
         "refs": [
           "https://en.wikipedia.org/wiki/Danish_Defence_Intelligence_Service"
         ]
       },
       "related": [],
-      "uuid": "3249024c-3b82-4fe6-b9d5-bc99bf749c21",
+      "uuid": "fb2f4cb8-a073-4aa6-87c0-b930179a9c58",
       "value": "Danish Defence Intelligence Service"
     },
     {
       "description": "Army Intelligence Center (Efterretningsregimentet (EFR)).",
       "meta": {
-        "country": "Denmark",
+        "country": "DK",
+        "country_name": "Denmark",
         "refs": [
           "https://en.wikipedia.org/wiki/Army_Intelligence_Center"
         ]
       },
       "related": [],
-      "uuid": "4a38cfe6-e34c-403e-b1b5-2d2d3c616dff",
+      "uuid": "9922e455-5bdf-4b59-8123-202bd41a6200",
       "value": "Army Intelligence Center"
     },
     {
       "description": "Gihaz al-Mukhabarat al-Amma (GIS) (General Intelligence Service)",
       "meta": {
-        "country": "Egypt",
+        "country": "EG",
+        "country_name": "Egypt",
         "refs": [
           "https://en.wikipedia.org/wiki/Egyptian_General_Intelligence_Directorate"
         ]
       },
       "related": [],
-      "uuid": "ce15b2bb-9b03-4c16-819a-1db4a62c1857",
+      "uuid": "e42b1d9f-00b0-4233-81c0-68dca185dea8",
       "value": "Egyptian General Intelligence Directorate"
     },
     {
       "description": "Idarat al-Mukhabarat al-Harbyya wa al-Istitla (OMIR) (Office of Military Intelligence and Reconnaissance)",
       "meta": {
-        "country": "Egypt",
+        "country": "EG",
+        "country_name": "Egypt",
         "refs": [
           "https://en.wikipedia.org/wiki/Military_intelligence_and_reconnaissance_(Egypt)"
         ]
       },
       "related": [],
-      "uuid": "6617d983-6d15-4da4-82ba-92c16dbee518",
+      "uuid": "ad07ad55-4f38-4266-9868-a337efadab75",
       "value": "Military intelligence and reconnaissance (Egypt)"
     },
     {
       "description": "Al-amn al-Watani (HS) (Homeland Security)",
       "meta": {
-        "country": "Egypt",
+        "country": "EG",
+        "country_name": "Egypt",
         "refs": [
           "https://en.wikipedia.org/wiki/Egyptian_Homeland_security"
         ]
       },
       "related": [],
-      "uuid": "1aa7a0e2-95af-436f-94dc-70dae06b2718",
+      "uuid": "c1ff3492-a3ac-4110-a64e-f8366a5bc02a",
       "value": "Egyptian Homeland security"
     },
     {
       "description": "National Security Office",
       "meta": {
-        "country": "Eritrea",
+        "country": "ER",
+        "country_name": "Eritrea",
         "refs": [
           "https://en.wikipedia.org/wiki/National_Security_Office_(Eritrea)"
         ]
       },
       "related": [],
-      "uuid": "019ecff2-c82e-428c-8a3c-763719f03463",
+      "uuid": "ff8eaf5c-4347-407f-9fba-1faaa15677bd",
       "value": "National Security Office (Eritrea)"
     },
     {
       "description": "Estonian Internal Security Service (KaPo) (Kaitsepolitseiamet)",
       "meta": {
-        "country": "Estonia",
+        "country": "EE",
+        "country_name": "Estonia",
         "refs": [
           "https://en.wikipedia.org/wiki/Estonian_Internal_Security_Service"
         ],
@@ -1354,13 +1463,14 @@
         ]
       },
       "related": [],
-      "uuid": "5fc18e0b-efcd-4573-8fa5-6fd219b160d4",
+      "uuid": "12f3e8d3-cd10-421b-9867-7158e0c76936",
       "value": "Estonian Internal Security Service"
     },
     {
       "description": "Estonian Foreign Intelligence Service (VLA) (Välisluureamet)",
       "meta": {
-        "country": "Estonia",
+        "country": "EE",
+        "country_name": "Estonia",
         "refs": [
           "https://en.wikipedia.org/wiki/Estonian_Foreign_Intelligence_Service"
         ],
@@ -1372,25 +1482,27 @@
         ]
       },
       "related": [],
-      "uuid": "9a43103f-b175-4e9e-8a34-4ea86a2acd6b",
+      "uuid": "1eb1f2d8-496d-493c-b55b-fbce26b5b866",
       "value": "Estonian Foreign Intelligence Service"
     },
     {
       "description": "National Intelligence and Security Service (NISS)",
       "meta": {
-        "country": "Ethiopia",
+        "country": "ET",
+        "country_name": "Ethiopia",
         "refs": [
           "https://en.wikipedia.org/wiki/National_Intelligence_and_Security_Service_(Ethiopia)"
         ]
       },
       "related": [],
-      "uuid": "58a8317e-a50b-4bf1-8043-d441783d60d2",
+      "uuid": "d3a03fa0-fd18-4f84-9324-31d8973990d9",
       "value": "National Intelligence and Security Service (Ethiopia)"
     },
     {
       "description": "Finnish Defence Intelligence Agency – Puolustusvoimien tiedustelulaitos (PVTIEDL) / Försvarsmaktens underrättelsetjänst",
       "meta": {
-        "country": "Finland",
+        "country": "FI",
+        "country_name": "Finland",
         "refs": [
           "https://en.wikipedia.org/wiki/Finnish_Defence_Intelligence_Agency"
         ],
@@ -1402,13 +1514,14 @@
         ]
       },
       "related": [],
-      "uuid": "cfde190a-6fde-4aae-9900-8df157094541",
+      "uuid": "d832ca69-f87f-424c-a333-fa70fd35d55c",
       "value": "Finnish Defence Intelligence Agency"
     },
     {
       "description": "Defense Command Intelligence Division – Pääesikunnan tiedusteluosasto (PE TIEDOS) / Huvudstabens underrättelseavdelning)",
       "meta": {
-        "country": "Finland",
+        "country": "FI",
+        "country_name": "Finland",
         "refs": [
           "https://en.wikipedia.org/wiki/Intelligence_Division_(Finland)"
         ],
@@ -1419,13 +1532,14 @@
         ]
       },
       "related": [],
-      "uuid": "b2b7e576-fc5f-432f-9614-1992d2c303c8",
+      "uuid": "eae466b1-e787-4797-9d58-7f2233f5f458",
       "value": "Intelligence Division (Finland)"
     },
     {
       "description": "Finnish Security Intelligence Service (SUPO) – Suojelupoliisi / Skyddspolisen",
       "meta": {
-        "country": "Finland",
+        "country": "FI",
+        "country_name": "Finland",
         "refs": [
           "https://en.wikipedia.org/wiki/Finnish_Security_Intelligence_Service"
         ],
@@ -1436,13 +1550,14 @@
         ]
       },
       "related": [],
-      "uuid": "3adca9a0-6160-4a47-a58b-2ab1094002db",
+      "uuid": "03f96301-d622-49cd-a5fc-9c0e1285526f",
       "value": "Finnish Security Intelligence Service"
     },
     {
       "description": "National Centre for Counter Terrorism (CNRLT, Coordination nationale du renseignement et de la lutte contre le terrorisme)",
       "meta": {
-        "country": "France",
+        "country": "FR",
+        "country_name": "France",
         "refs": [
           "https://en.wikipedia.org/wiki/National_Centre_for_Counter_Terrorism"
         ],
@@ -1453,13 +1568,14 @@
         ]
       },
       "related": [],
-      "uuid": "bfdd80f9-058b-46a4-a5be-a88c5237a1b2",
+      "uuid": "f5d34187-e8cc-4d0b-922b-5677073e29f3",
       "value": "National Centre for Counter Terrorism"
     },
     {
       "description": "General Directorate for Internal Security (DGSI; Direction générale de la sécurité intérieure) – Domestic counter-terrorism and counter-espionage intelligence.",
       "meta": {
-        "country": "France",
+        "country": "FR",
+        "country_name": "France",
         "refs": [
           "https://en.wikipedia.org/wiki/General_Directorate_for_Internal_Security"
         ],
@@ -1470,13 +1586,14 @@
         ]
       },
       "related": [],
-      "uuid": "0d16e663-be8d-4560-b696-f5d0ae4bbbcc",
+      "uuid": "e1e11b0f-dbf5-44fd-b4c2-e1ec559fd874",
       "value": "General Directorate for Internal Security"
     },
     {
       "description": "direction nationale du renseignement territorial  (DNRT)",
       "meta": {
-        "country": "France",
+        "country": "FR",
+        "country_name": "France",
         "synonyms": [
           [
             "direction nationale du renseignement territorial "
@@ -1484,13 +1601,14 @@
         ]
       },
       "related": [],
-      "uuid": "e3c6f868-95cb-4a3d-8f60-805dd38f9b08",
+      "uuid": "216db004-df60-4940-8aad-29a6f2cd34c0",
       "value": "direction nationale du renseignement territorial  (DNRT)"
     },
     {
       "description": "Sous-direction anti-terroriste (SDAT)",
       "meta": {
-        "country": "France",
+        "country": "FR",
+        "country_name": "France",
         "synonyms": [
           [
             "Sous-direction anti-terroriste"
@@ -1498,13 +1616,14 @@
         ]
       },
       "related": [],
-      "uuid": "57d2a3a4-13fd-4923-bbe8-a3689203c38d",
+      "uuid": "355cf90e-3fba-47c2-a275-f98214cc6b3f",
       "value": "Sous-direction anti-terroriste (SDAT)"
     },
     {
       "description": "Directorate-General for External Security (DGSE; Direction générale de la sécurité extérieure) – Foreign intelligence relating to national security.",
       "meta": {
-        "country": "France",
+        "country": "FR",
+        "country_name": "France",
         "refs": [
           "https://en.wikipedia.org/wiki/Directorate-General_for_External_Security"
         ],
@@ -1515,13 +1634,14 @@
         ]
       },
       "related": [],
-      "uuid": "412139c6-553f-4d33-8ad3-ed9a50308c02",
+      "uuid": "eb7185f4-d3d7-4b78-bb0e-3f90270eab62",
       "value": "Directorate-General for External Security"
     },
     {
       "description": "Direction du Renseignement et de la Sécurité de la Défense (DRSD; Direction du Renseignement et de la Sécurité de la Défense) – Foreign intelligence relating to national security.",
       "meta": {
-        "country": "France",
+        "country": "FR",
+        "country_name": "France",
         "refs": [
           "https://en.wikipedia.org/wiki/DRSD"
         ],
@@ -1532,61 +1652,66 @@
         ]
       },
       "related": [],
-      "uuid": "93db2ada-9ae1-4cea-94ee-086542ed5ac7",
+      "uuid": "02475533-f437-496a-b363-36c25784431c",
       "value": "DRSD"
     },
     {
       "description": "Directorate of Military Intelligence (DRM; Direction du renseignement militaire) – Military intelligence.",
       "meta": {
-        "country": "France",
+        "country": "FR",
+        "country_name": "France",
         "refs": [
           "https://en.wikipedia.org/wiki/Direction_du_renseignement_militaire"
         ]
       },
       "related": [],
-      "uuid": "93cd0bbb-eb00-474f-98b0-3f48364193a6",
+      "uuid": "770bdcd4-1047-4624-8d2e-6cc58b1adc70",
       "value": "Direction du renseignement militaire"
     },
     {
       "description": "Tracfin",
       "meta": {
-        "country": "France",
+        "country": "FR",
+        "country_name": "France",
         "refs": [
           "https://en.wikipedia.org/wiki/Tracfin"
         ]
       },
       "related": [],
-      "uuid": "4e2cea82-6ba6-4ffe-9fe4-0869169bd2b9",
+      "uuid": "f13cca03-f3cb-4db3-9238-eec9ee756b26",
       "value": "Tracfin"
     },
     {
       "description": "Direction Nationale du Renseignement et des Enquêtes Douanières (DNRED)",
       "meta": {
-        "country": "France",
+        "country": "FR",
+        "country_name": "France",
         "refs": [
           "https://en.wikipedia.org/wiki/Direction_Nationale_du_Renseignement_et_des_Enqu%C3%AAtes_Douani%C3%A8res"
         ]
       },
       "related": [],
-      "uuid": "b1c5c3e7-6b60-4102-9019-af123f56888c",
+      "uuid": "78ce1a8b-976d-4faa-b508-452210e68bf6",
       "value": "Direction Nationale du Renseignement et des Enquêtes Douanières"
     },
     {
       "description": "State Intelligence Services (the Gambia) (SIS)",
       "meta": {
-        "country": "Gambia",
+        "country": "GM",
+        "country_name": "Gambia",
         "refs": [
           "https://en.wikipedia.org/wiki/State_Intelligence_Services_(the_Gambia)"
         ]
       },
       "related": [],
-      "uuid": "c4f143c4-f540-45be-9702-1bf52e2ad37d",
+      "uuid": "834e73ba-a461-4e8d-a735-ba3c90584553",
       "value": "State Intelligence Services (the Gambia)"
     },
     {
       "description": "State Security Service (SSSG) − სახელმწიფო უშიშროების სამსახური",
       "meta": {
-        "country": "Georgia",
+        "country": "GE",
+        "country_name": "Georgia",
         "refs": [
           "https://en.wikipedia.org/wiki/State_Security_Service_(Georgia)"
         ],
@@ -1597,13 +1722,14 @@
         ]
       },
       "related": [],
-      "uuid": "079ca4ac-ce32-4c9d-8a50-d3222465007a",
+      "uuid": "927e2df1-b301-488b-be45-4db5e505ae59",
       "value": "State Security Service (Georgia)"
     },
     {
       "description": "Georgian Intelligence Service (GIS) − საქართველოს დაზვერვის სამსახური",
       "meta": {
-        "country": "Georgia",
+        "country": "GE",
+        "country_name": "Georgia",
         "refs": [
           "https://en.wikipedia.org/wiki/Georgian_Intelligence_Service"
         ],
@@ -1614,22 +1740,24 @@
         ]
       },
       "related": [],
-      "uuid": "58fb9521-6644-4e38-b989-a3f7f516087a",
+      "uuid": "7f066777-06a0-45ca-968b-d788c6fd51eb",
       "value": "Georgian Intelligence Service"
     },
     {
       "description": "Military Intelligence Department",
       "meta": {
-        "country": "Georgia"
+        "country": "GE",
+        "country_name": "Georgia"
       },
       "related": [],
-      "uuid": "c4a586c0-b722-4230-953e-027a27c7ba75",
+      "uuid": "b403456b-8753-453b-abdf-b36ac5c73837",
       "value": "Military Intelligence Department"
     },
     {
       "description": "Bundesnachrichtendienst (BND): Federal Intelligence Service",
       "meta": {
-        "country": "Germany",
+        "country": "DE",
+        "country_name": "Germany",
         "refs": [
           "https://en.wikipedia.org/wiki/Bundesnachrichtendienst"
         ],
@@ -1640,13 +1768,14 @@
         ]
       },
       "related": [],
-      "uuid": "e3f59c3c-4d69-4e74-8ec2-9f7a0de50537",
+      "uuid": "34052935-41a7-4fa0-8649-2a759a5a1f32",
       "value": "Bundesnachrichtendienst"
     },
     {
       "description": "Bundesamt für Verfassungsschutz (BfV): Federal Office for the Protection of the Constitution",
       "meta": {
-        "country": "Germany",
+        "country": "DE",
+        "country_name": "Germany",
         "refs": [
           "https://en.wikipedia.org/wiki/Bundesamt_f%C3%BCr_Verfassungsschutz"
         ],
@@ -1657,25 +1786,27 @@
         ]
       },
       "related": [],
-      "uuid": "782b696b-ba2b-4a79-b7dd-0e31ef98bd42",
+      "uuid": "4d9c3fda-2bb1-464e-9408-8606f1b6a5e4",
       "value": "Bundesamt für Verfassungsschutz"
     },
     {
       "description": "Bundesamt für Sicherheit in der Informationstechnik (BSI): Federal Office for Information Security",
       "meta": {
-        "country": "Germany",
+        "country": "DE",
+        "country_name": "Germany",
         "refs": [
           "https://en.wikipedia.org/wiki/Federal_Office_for_Information_Security"
         ]
       },
       "related": [],
-      "uuid": "8b8a5279-4e92-48f2-b81e-85df8f4f496f",
+      "uuid": "7b094d5d-610d-46c8-9324-f1b29fafe02f",
       "value": "Federal Office for Information Security"
     },
     {
       "description": "Zentrum für Informations- und Kommunikationstechnik (IKTZ): Center for information and communication technology",
       "meta": {
-        "country": "Germany",
+        "country": "DE",
+        "country_name": "Germany",
         "synonyms": [
           [
             "Center for information and communication technology"
@@ -1683,13 +1814,14 @@
         ]
       },
       "related": [],
-      "uuid": "01a5351d-ab56-4df7-b4d4-0f74e08559e6",
+      "uuid": "2985b51f-e747-4302-9128-9ea355d27dde",
       "value": "Zentrum für Informations- und Kommunikationstechnik (IKTZ): Center for information and communication technology"
     },
     {
       "description": "Militärischer Abschirmdienst (MAD): Military Counterintelligence Service",
       "meta": {
-        "country": "Germany",
+        "country": "DE",
+        "country_name": "Germany",
         "refs": [
           "https://en.wikipedia.org/wiki/Milit%C3%A4rischer_Abschirmdienst"
         ],
@@ -1700,37 +1832,40 @@
         ]
       },
       "related": [],
-      "uuid": "15e320d8-a1a8-463a-95bd-13f61a9877ce",
+      "uuid": "396482dc-0c4f-4ff7-bdda-e929eabfab81",
       "value": "Militärischer Abschirmdienst"
     },
     {
       "description": "Landesamt für Verfassungsschutz (LfV): (semi-independent) State Authority for the Protection of the Constitution for every single state",
       "meta": {
-        "country": "Germany",
+        "country": "DE",
+        "country_name": "Germany",
         "refs": [
           "https://en.wikipedia.org/wiki/State_Authority_for_the_Protection_of_the_Constitution"
         ]
       },
       "related": [],
-      "uuid": "ebd84cf3-1fe4-469e-99ac-b53790584be8",
+      "uuid": "5190ed5e-a9fa-40de-be78-5c79cdab46a8",
       "value": "State Authority for the Protection of the Constitution"
     },
     {
       "description": "Bureau of National Investigations (BNI) – (Internal Intelligence Agency)",
       "meta": {
-        "country": "Ghana",
+        "country": "GH",
+        "country_name": "Ghana",
         "refs": [
           "https://en.wikipedia.org/wiki/Bureau_of_National_Investigations"
         ]
       },
       "related": [],
-      "uuid": "3bed4dda-db2f-430c-8fce-3b86f8f3afee",
+      "uuid": "0f599d01-cef2-4cae-85db-9d64916535d3",
       "value": "Bureau of National Investigations"
     },
     {
       "description": "National Intelligence Service (ΕΥΠ) – Εθνική Υπηρεσία Πληροφοριών",
       "meta": {
-        "country": "Greece",
+        "country": "GR",
+        "country_name": "Greece",
         "refs": [
           "https://en.wikipedia.org/wiki/National_Intelligence_Service_(Greece)"
         ],
@@ -1741,268 +1876,291 @@
         ]
       },
       "related": [],
-      "uuid": "4a79e5f4-748b-41a3-83fb-71eee069375f",
+      "uuid": "c9912b77-b6de-483c-ae5a-7860ebda928e",
       "value": "National Intelligence Service (Greece)"
     },
     {
       "description": "E Division – Intelligence Division",
       "meta": {
-        "country": "Greece"
+        "country": "GR",
+        "country_name": "Greece"
       },
       "related": [],
-      "uuid": "98c22aec-1e9a-4631-8c44-a34aa65826a8",
+      "uuid": "77b11da2-29e9-4ef6-b8d1-f6e7bf382571",
       "value": "E Division – Intelligence Division"
     },
     {
       "description": "National Intelligence and Security Agency (NISA)[6][7][8][9]",
       "meta": {
-        "country": "Guyana",
+        "country": "GY",
+        "country_name": "Guyana",
         "refs": [
           "https://en.wikipedia.org#cite_note-6"
         ]
       },
       "related": [],
-      "uuid": "58065e67-7efe-4500-ad88-fac1c5632996",
+      "uuid": "265b9eaa-cf9f-4624-b667-870a0ee2ca96",
       "value": "National Intelligence and Security Agency (NISA)[6][7][8][9]"
     },
     {
       "description": "Service d'Intelligence National (SIN) (National Intelligence Service)",
       "meta": {
-        "country": "Haiti",
+        "country": "HT",
+        "country_name": "Haiti",
         "refs": [
           "https://en.wikipedia.org/wiki/Service_d%27Intelligence_National"
         ]
       },
       "related": [],
-      "uuid": "2cf3d2cd-14a2-4732-ad51-77dcff68fde6",
+      "uuid": "e17be80f-99a6-426a-96ad-ecc4f1263ea5",
       "value": "Service d'Intelligence National"
     },
     {
       "description": "Információs Hivatal (IH) (Information Office)",
       "meta": {
-        "country": "Hungary",
+        "country": "HU",
+        "country_name": "Hungary",
         "refs": [
           "https://en.wikipedia.org/wiki/Inform%C3%A1ci%C3%B3s_Hivatal"
         ]
       },
       "related": [],
-      "uuid": "592c1984-0548-4ae0-a028-d5d40b9d1a07",
+      "uuid": "de143280-0c1e-48a8-8536-58088ae2c7e5",
       "value": "Információs Hivatal"
     },
     {
       "description": "Alkotmányvédelmi Hivatal (AH) (Constitution Protection Office)",
       "meta": {
-        "country": "Hungary",
+        "country": "HU",
+        "country_name": "Hungary",
         "refs": [
           "https://en.wikipedia.org/wiki/Nemzetbiztons%C3%A1gi_Hivatal"
         ]
       },
       "related": [],
-      "uuid": "d847663b-861c-4714-837c-7ec7fb592a61",
+      "uuid": "57c2541a-27ee-4a0e-bbe6-42c135fca807",
       "value": "Nemzetbiztonsági Hivatal"
     },
     {
       "description": "Terrorelhárítási Központ (TEK) (Counter Terrorism Centre)",
       "meta": {
-        "country": "Hungary",
+        "country": "HU",
+        "country_name": "Hungary",
         "refs": [
           "https://en.wikipedia.org/wiki/Terrorelh%C3%A1r%C3%ADt%C3%A1si_K%C3%B6zpont"
         ]
       },
       "related": [],
-      "uuid": "e2448e45-0cc2-40b6-ba2a-779424114f47",
+      "uuid": "86fcd7b1-893c-4136-9443-532a3f85d774",
       "value": "Terrorelhárítási Központ"
     },
     {
       "description": "Nemzetbiztonsági Szakszolgálat (NBSZ) (Special Service for National Security)",
       "meta": {
-        "country": "Hungary"
+        "country": "HU",
+        "country_name": "Hungary"
       },
       "related": [],
-      "uuid": "0c7b1041-c63b-4704-ad2a-760472138ead",
+      "uuid": "ef2667c8-3af1-44f3-9a86-db5e6ca42ef1",
       "value": "Nemzetbiztonsági Szakszolgálat (NBSZ) (Special Service for National Security)"
     },
     {
       "description": "Nemzeti Információs Központ (NIK) (National Information Center)",
       "meta": {
-        "country": "Hungary"
+        "country": "HU",
+        "country_name": "Hungary"
       },
       "related": [],
-      "uuid": "9fb8bba5-9f4d-4290-ac01-2e93d58c50c2",
+      "uuid": "ea02ee7e-cc98-4cf1-abef-62b286373ca2",
       "value": "Nemzeti Információs Központ (NIK) (National Information Center)"
     },
     {
       "description": "The National Police Commissioner's Analysis Unit – Greiningardeild Ríkislögreglustjóra (GRLS)",
       "meta": {
-        "country": "Iceland",
+        "country": "IS",
+        "country_name": "Iceland",
         "refs": [
           "https://en.wikipedia.org/wiki/Icelandic_Police#The_Icelandic_Intelligence_Service"
         ]
       },
       "related": [],
-      "uuid": "8a4e572f-4199-41e3-a4ca-a491ebb715a4",
+      "uuid": "2dd52884-688a-4422-a4d6-86e1a4d3b6e8",
       "value": "Icelandic Police"
     },
     {
       "description": "Icelandic Defense Agency's Analysis Unit – Greiningardeild Varnarmálastofnunar Íslands (GVMSÍ) (Defunct)",
       "meta": {
-        "country": "Iceland",
+        "country": "IS",
+        "country_name": "Iceland",
         "refs": [
           "https://en.wikipedia.org/wiki/Icelandic_Crisis_Response_Unit#Intelligence_gathering"
         ]
       },
       "related": [],
-      "uuid": "7e695cdd-7a77-4ddd-a5e6-055a4ccac360",
+      "uuid": "429cd856-4c76-499c-93c4-797e889bfad0",
       "value": "Icelandic Crisis Response Unit"
     },
     {
       "description": "Research and Analysis Wing (R&AW)",
       "meta": {
-        "country": "India",
+        "country": "IN",
+        "country_name": "India",
         "refs": [
           "https://en.wikipedia.org/wiki/Research_and_Analysis_Wing"
         ]
       },
       "related": [],
-      "uuid": "abcf3b4c-cd9d-4952-ac03-6579337bed6c",
+      "uuid": "f8002504-323f-4acf-916d-e6d88f0728ee",
       "value": "Research and Analysis Wing"
     },
     {
       "description": "Intelligence Bureau (IB)",
       "meta": {
-        "country": "India",
+        "country": "IN",
+        "country_name": "India",
         "refs": [
           "https://en.wikipedia.org/wiki/Intelligence_Bureau_(India)"
         ]
       },
       "related": [],
-      "uuid": "072ada2e-b7fd-4aab-8a47-d25125ecb89b",
+      "uuid": "6de156e0-9e1b-4ff4-b6db-ebe8c3326bc3",
       "value": "Intelligence Bureau (India)"
     },
     {
       "description": "National Investigation Agency[10]",
       "meta": {
-        "country": "India",
+        "country": "IN",
+        "country_name": "India",
         "refs": [
           "https://en.wikipedia.org/wiki/National_Investigation_Agency"
         ]
       },
       "related": [],
-      "uuid": "6f31ab99-8586-462c-8bcd-0cb5c53d3a08",
+      "uuid": "16a4284e-8e14-4a99-a625-a825eeb4f4e5",
       "value": "National Investigation Agency"
     },
     {
       "description": "National Technical Research Organisation (NTRO)[10]",
       "meta": {
-        "country": "India",
+        "country": "IN",
+        "country_name": "India",
         "refs": [
           "https://en.wikipedia.org/wiki/National_Technical_Research_Organisation"
         ]
       },
       "related": [],
-      "uuid": "4fe2b645-2cf4-4648-9215-e2498c1413e6",
+      "uuid": "b8b864e1-c2b2-4bac-b690-8bc580240158",
       "value": "National Technical Research Organisation"
     },
     {
       "description": "Directorate of Revenue Intelligence",
       "meta": {
-        "country": "India",
+        "country": "IN",
+        "country_name": "India",
         "refs": [
           "https://en.wikipedia.org/wiki/Directorate_of_Revenue_Intelligence"
         ]
       },
       "related": [],
-      "uuid": "017f9f3d-29fc-4deb-9b29-0258203137e7",
+      "uuid": "9767c922-f74b-4c2b-b932-47c140d60466",
       "value": "Directorate of Revenue Intelligence"
     },
     {
       "description": "Economic Intelligence Council",
       "meta": {
-        "country": "India",
+        "country": "IN",
+        "country_name": "India",
         "refs": [
           "https://en.wikipedia.org/wiki/Ministry_of_Finance_(India)"
         ]
       },
       "related": [],
-      "uuid": "d2e0928d-b54a-4691-a7fc-a7e8b003e606",
+      "uuid": "99c8557c-85cb-4b8f-b209-1dd63900b25a",
       "value": "Ministry of Finance (India)"
     },
     {
       "description": "Enforcement Directorate",
       "meta": {
-        "country": "India",
+        "country": "IN",
+        "country_name": "India",
         "refs": [
           "https://en.wikipedia.org/wiki/Enforcement_Directorate"
         ]
       },
       "related": [],
-      "uuid": "6354ff63-b884-4f25-b60d-d9a9ec7cec99",
+      "uuid": "822b2c3d-4983-4b25-a799-2a086fa57a3f",
       "value": "Enforcement Directorate"
     },
     {
       "description": "Directorate General of GST Intelligence (DGGI)[11]",
       "meta": {
-        "country": "India",
+        "country": "IN",
+        "country_name": "India",
         "refs": [
           "https://en.wikipedia.org/wiki/Directorate_General_of_GST_Intelligence"
         ]
       },
       "related": [],
-      "uuid": "d5755ae3-fa64-4c91-928d-cb0e242f100b",
+      "uuid": "62e0f15d-3ee9-42b8-aa4e-de0e205ca980",
       "value": "Directorate General of GST Intelligence"
     },
     {
       "description": "Directorate of Military Intelligence",
       "meta": {
-        "country": "India",
+        "country": "IN",
+        "country_name": "India",
         "refs": [
           "https://en.wikipedia.org/wiki/Indian_Army"
         ]
       },
       "related": [],
-      "uuid": "991f5f53-1590-4b3f-af68-ff45ab27c778",
+      "uuid": "a51ce16c-f406-43f5-82cd-793134efdabd",
       "value": "Indian Army"
     },
     {
       "description": "Directorate of Air Intelligence",
       "meta": {
-        "country": "India",
+        "country": "IN",
+        "country_name": "India",
         "refs": [
           "https://en.wikipedia.org/wiki/Directorate_of_Air_Intelligence_(India)"
         ]
       },
       "related": [],
-      "uuid": "44e733b2-9433-4a53-8d42-a084c7ae6d8e",
+      "uuid": "3b8a9145-33fe-4c62-a85f-397a06f4000d",
       "value": "Directorate of Air Intelligence (India)"
     },
     {
       "description": "Directorate of Naval Intelligence",
       "meta": {
-        "country": "India",
+        "country": "IN",
+        "country_name": "India",
         "refs": [
           "https://en.wikipedia.org/wiki/Directorate_of_Naval_Intelligence_(India)"
         ]
       },
       "related": [],
-      "uuid": "88a19900-582b-4b17-ad8b-c3d0edf77f72",
+      "uuid": "9e582479-d8ee-461a-865f-bfebf036a54d",
       "value": "Directorate of Naval Intelligence (India)"
     },
     {
       "description": "Joint Cipher Bureau",
       "meta": {
-        "country": "India",
+        "country": "IN",
+        "country_name": "India",
         "refs": [
           "https://en.wikipedia.org/wiki/Joint_Cipher_Bureau"
         ]
       },
       "related": [],
-      "uuid": "82e2e69a-b522-44fc-95ee-f625f7882648",
+      "uuid": "38f019d4-f30f-4713-a6aa-a4b6ff545072",
       "value": "Joint Cipher Bureau"
     },
     {
       "description": "State Intelligence Agency (BIN) – Badan Intelijen Negara",
       "meta": {
-        "country": "Indonesia",
+        "country": "ID",
+        "country_name": "Indonesia",
         "refs": [
           "https://en.wikipedia.org/wiki/State_Intelligence_Agency_(Indonesia)"
         ],
@@ -2013,13 +2171,14 @@
         ]
       },
       "related": [],
-      "uuid": "1077d396-a996-45e4-a809-9e53219203ff",
+      "uuid": "5bd47826-d3c7-4302-9f53-aeb00af2d507",
       "value": "State Intelligence Agency (Indonesia)"
     },
     {
       "description": "Indonesian Strategic Intelligence Agency (BAIS) – Badan Intelijen Strategis Tentara Nasional Indonesia",
       "meta": {
-        "country": "Indonesia",
+        "country": "ID",
+        "country_name": "Indonesia",
         "refs": [
           "https://en.wikipedia.org/wiki/Indonesian_Strategic_Intelligence_Agency"
         ],
@@ -2030,13 +2189,14 @@
         ]
       },
       "related": [],
-      "uuid": "9abb4db2-6055-48cc-af97-35a9b00f6221",
+      "uuid": "c178c3c7-c69e-43e6-a811-05c51ab5dfd8",
       "value": "Indonesian Strategic Intelligence Agency"
     },
     {
       "description": "Indonesian Army Intelligence Centre (PUSINTELAD) – Pusat Intelijen Tentara Nasional Indonesia Angkatan Darat",
       "meta": {
-        "country": "Indonesia",
+        "country": "ID",
+        "country_name": "Indonesia",
         "refs": [
           "https://en.wikipedia.org/wiki/Indonesian_Army_Intelligence_Centre"
         ],
@@ -2047,13 +2207,14 @@
         ]
       },
       "related": [],
-      "uuid": "bea6d08f-5032-4412-8555-1c0a570ac727",
+      "uuid": "6af5e7d5-a767-497e-923f-a5c2fa291468",
       "value": "Indonesian Army Intelligence Centre"
     },
     {
       "description": "National Cyber and Crypto Agency (BSSN) – Badan Siber dan Sandi Negara",
       "meta": {
-        "country": "Indonesia",
+        "country": "ID",
+        "country_name": "Indonesia",
         "refs": [
           "https://en.wikipedia.org/wiki/National_Cyber_and_Crypto_Agency"
         ],
@@ -2064,13 +2225,14 @@
         ]
       },
       "related": [],
-      "uuid": "9574bf94-3eb2-478c-8e99-228495533021",
+      "uuid": "7488201c-d680-4ae6-b0d3-7bb127d23abc",
       "value": "National Cyber and Crypto Agency"
     },
     {
       "description": "Deputy Attorney General on Intelligence (Under the Attorney General's Office) – Jaksa Agung Muda Bidang Intelijen Kejaksaan Agung",
       "meta": {
-        "country": "Indonesia",
+        "country": "ID",
+        "country_name": "Indonesia",
         "refs": [
           "https://en.wikipedia.org/wiki/Attorney_General%27s_Office_of_Indonesia"
         ],
@@ -2081,13 +2243,14 @@
         ]
       },
       "related": [],
-      "uuid": "9ab6bb70-db49-47d6-a395-bb0a1a8966ce",
+      "uuid": "dd32f7c2-34fc-487d-906a-dbf5718da614",
       "value": "Attorney General's Office of Indonesia"
     },
     {
       "description": "Directorate of Immigration Intelligence – Direktorat Intelijen Imigrasi",
       "meta": {
-        "country": "Indonesia",
+        "country": "ID",
+        "country_name": "Indonesia",
         "refs": [
           "https://en.wikipedia.org/wiki/Directorate_General_of_Immigration_(Indonesia)"
         ],
@@ -2098,13 +2261,14 @@
         ]
       },
       "related": [],
-      "uuid": "773958ce-b79e-49b3-a6df-e59d8338cacc",
+      "uuid": "87a99491-a2df-4a54-a4c9-02c50711c93c",
       "value": "Directorate General of Immigration (Indonesia)"
     },
     {
       "description": "National Narcotics Agency Intelligence Section – Seksi Intelijen Badan Narkotika Nasional",
       "meta": {
-        "country": "Indonesia",
+        "country": "ID",
+        "country_name": "Indonesia",
         "refs": [
           "https://en.wikipedia.org/wiki/National_Anti-Narcotics_Agency_(Indonesia)"
         ],
@@ -2115,13 +2279,14 @@
         ]
       },
       "related": [],
-      "uuid": "5cc5cb1c-fa1c-4755-9170-df171cb3d7fd",
+      "uuid": "72fdcd1a-a27d-45d3-920b-683039811ac8",
       "value": "National Anti-Narcotics Agency (Indonesia)"
     },
     {
       "description": "Indonesian National Police Intelligence and Security Agency - Badan Intelijen dan Keamanan Kepolisian Negara Republik Indonesia",
       "meta": {
-        "country": "Indonesia",
+        "country": "ID",
+        "country_name": "Indonesia",
         "refs": [
           "https://en.wikipedia.orghttps://id.wikipedia.org/wiki/Badan_Intelijen_dan_Keamanan_Kepolisian_Negara_Republik_Indonesia"
         ],
@@ -2132,13 +2297,14 @@
         ]
       },
       "related": [],
-      "uuid": "dc5d6ed7-155a-449f-92f0-c4b71b796a6c",
+      "uuid": "724db1e0-8073-438e-8585-c62426f5c5c8",
       "value": "id:Badan Intelijen dan Keamanan Kepolisian Negara Republik Indonesia"
     },
     {
       "description": "Customs & Excise Sub-Directorate of Intelligence – Sub-Direktorat Intelijen Direktorat Jenderal Bea Cukai",
       "meta": {
-        "country": "Indonesia",
+        "country": "ID",
+        "country_name": "Indonesia",
         "refs": [
           "https://en.wikipedia.org/wiki/Directorate_General_of_Customs_and_Excise_(Indonesia)"
         ],
@@ -2149,13 +2315,14 @@
         ]
       },
       "related": [],
-      "uuid": "897f0990-a6e1-4477-a203-c64ed60851f5",
+      "uuid": "58694642-d310-49bd-8639-33059ba865f5",
       "value": "Directorate General of Customs and Excise (Indonesia)"
     },
     {
       "description": "Indonesian Financial Transaction Reports and Analysis Center (PPATK) – Pusat Pelaporan dan Analisis Transaksi Keuangan",
       "meta": {
-        "country": "Indonesia",
+        "country": "ID",
+        "country_name": "Indonesia",
         "refs": [
           "https://en.wikipedia.org/wiki/Indonesian_Financial_Transaction_Reports_and_Analysis_Center"
         ],
@@ -2166,775 +2333,840 @@
         ]
       },
       "related": [],
-      "uuid": "5c5196d6-f980-4232-9384-7ddcafdaf4e4",
+      "uuid": "a35699f7-49fc-4649-8283-4eac1cc9eaab",
       "value": "Indonesian Financial Transaction Reports and Analysis Center"
     },
     {
       "description": "Ministry of Intelligence (VAJA)",
       "meta": {
-        "country": "Iran",
+        "country": "IR",
+        "country_name": "Iran",
         "refs": [
           "https://en.wikipedia.org/wiki/Ministry_of_Intelligence_(Iran)"
         ]
       },
       "related": [],
-      "uuid": "ef2b6fc1-fabc-4935-999b-bb169f29f58d",
+      "uuid": "a0d14654-3730-4f8b-95f1-b0e29bffec10",
       "value": "Ministry of Intelligence (Iran)"
     },
     {
       "description": "Oghab 2 – Nuclear facilities security",
       "meta": {
-        "country": "Iran",
+        "country": "IR",
+        "country_name": "Iran",
         "refs": [
           "https://en.wikipedia.org/wiki/Oghab_2"
         ]
       },
       "related": [],
-      "uuid": "e917bd9e-9794-4cf3-b203-2cb559c9a7a5",
+      "uuid": "ba6f9381-6ace-4090-86a6-76c8eb8d43c3",
       "value": "Oghab 2"
     },
     {
       "description": "Council for Intelligence Coordination",
       "meta": {
-        "country": "Iran",
+        "country": "IR",
+        "country_name": "Iran",
         "refs": [
           "https://en.wikipedia.org/wiki/Council_for_Intelligence_Coordination"
         ]
       },
       "related": [],
-      "uuid": "0b95346f-297b-49bb-a306-b45c3300de19",
+      "uuid": "095531a8-00fc-4a2c-a058-b8a1bfa0672e",
       "value": "Council for Intelligence Coordination"
     },
     {
       "description": "Intelligence Protection Organization of Iranian Army (SAHEFAJA)",
       "meta": {
-        "country": "Iran",
+        "country": "IR",
+        "country_name": "Iran",
         "refs": [
           "https://en.wikipedia.org/wiki/Intelligence_Protection_Organization_of_Islamic_Republic_of_Iran_Army"
         ]
       },
       "related": [],
-      "uuid": "8d6458c0-e176-45d1-a485-048a4c63b223",
+      "uuid": "ac02e367-f780-449e-af74-6738d35936df",
       "value": "Intelligence Protection Organization of Islamic Republic of Iran Army"
     },
     {
       "description": "Intelligence Organization of IRGC",
       "meta": {
-        "country": "Iran",
+        "country": "IR",
+        "country_name": "Iran",
         "refs": [
           "https://en.wikipedia.org/wiki/Intelligence_Organization_of_Army_of_the_Guardians_of_the_Islamic_Revolution"
         ]
       },
       "related": [],
-      "uuid": "9ccf2e94-f9f3-471e-8093-a0c121fdc951",
+      "uuid": "de8ff87d-d621-4bdc-a11a-6805e2be6c9c",
       "value": "Intelligence Organization of Army of the Guardians of the Islamic Revolution"
     },
     {
       "description": "Intelligence Protection Organization of IRGC (SAHEFASA)",
       "meta": {
-        "country": "Iran",
+        "country": "IR",
+        "country_name": "Iran",
         "refs": [
           "https://en.wikipedia.org/wiki/Intelligence_Protection_Organization_of_Army_of_the_Guardians_of_the_Islamic_Revolution"
         ]
       },
       "related": [],
-      "uuid": "de19ebae-680b-4d8f-a941-68fa0b63c01c",
+      "uuid": "493c8ee2-15aa-4eab-be97-bf22881e9d2f",
       "value": "Intelligence Protection Organization of Army of the Guardians of the Islamic Revolution"
     },
     {
       "description": "General Security Directorate - (GSD) - (Internal security agency)",
       "meta": {
-        "country": "Iraq",
+        "country": "IQ",
+        "country_name": "Iraq",
         "refs": [
           "https://en.wikipedia.org/wiki/General_Security_Directorate_(Iraq)"
         ]
       },
       "related": [],
-      "uuid": "652232a1-4092-42fe-91d6-27582e403283",
+      "uuid": "7e8ec768-42df-4411-9b09-c69bceb8bcf8",
       "value": "General Security Directorate (Iraq)"
     },
     {
       "description": "Iraqi National Intelligence Service - (INIS) - (Foreign intelligence and Special operations)",
       "meta": {
-        "country": "Iraq",
+        "country": "IQ",
+        "country_name": "Iraq",
         "refs": [
           "https://en.wikipedia.org/wiki/Iraqi_National_Intelligence_Service"
         ]
       },
       "related": [],
-      "uuid": "75b05c4d-61c1-4086-9579-612e3aef56f6",
+      "uuid": "2a535734-f682-49f3-a854-81be874f01ad",
       "value": "Iraqi National Intelligence Service"
     },
     {
       "description": "Falcons Intelligence Cell - (FIC) - (Military intelligence)",
       "meta": {
-        "country": "Iraq",
+        "country": "IQ",
+        "country_name": "Iraq",
         "refs": [
           "https://en.wikipedia.org/wiki/Falcons_Intelligence_Cell"
         ]
       },
       "related": [],
-      "uuid": "ad89023e-a901-4a54-82e8-5289625f82bf",
+      "uuid": "22cea90f-062b-492e-bc9e-b1394cca8205",
       "value": "Falcons Intelligence Cell"
     },
     {
       "description": "Kurdistan Region Security Council (KRSC) - (Regional security agency)",
       "meta": {
-        "country": "Iraq",
+        "country": "IQ",
+        "country_name": "Iraq",
         "refs": [
           "https://en.wikipedia.org/wiki/Kurdistan_Region_Security_Council"
         ]
       },
       "related": [],
-      "uuid": "28c4d072-ee11-4b95-8f44-6b222f020af5",
+      "uuid": "722a297f-1391-4aa5-8bba-3995b2b6a919",
       "value": "Kurdistan Region Security Council"
     },
     {
       "description": "Intelligence and Counter-Terrorism Directorate - Ministry of Interior",
       "meta": {
-        "country": "Iraq"
+        "country": "IQ",
+        "country_name": "Iraq"
       },
       "related": [],
-      "uuid": "ebba80ee-46a8-475c-a53a-b6bbcbbfa0d8",
+      "uuid": "00299e80-ed2b-4457-ab09-6c3f6f672ea4",
       "value": "Intelligence and Counter-Terrorism Directorate - Ministry of Interior"
     },
     {
       "description": "Directorate of Military Intelligence (G2)",
       "meta": {
-        "country": "Ireland",
+        "country": "IE",
+        "country_name": "Ireland",
         "refs": [
           "https://en.wikipedia.org/wiki/Directorate_of_Military_Intelligence_(Ireland)"
         ]
       },
       "related": [],
-      "uuid": "6c0925fe-25c5-44f6-9ffe-960e2551d9a5",
+      "uuid": "43f1b15b-a27d-4e68-9e5f-bdd5dd24934e",
       "value": "Directorate of Military Intelligence (Ireland)"
     },
     {
       "description": "Communications and Information Services Corps (CIS) SIGINT Section",
       "meta": {
-        "country": "Ireland",
+        "country": "IE",
+        "country_name": "Ireland",
         "refs": [
           "https://en.wikipedia.org/wiki/CIS_Corps_(Ireland)"
         ]
       },
       "related": [],
-      "uuid": "ed89af3e-8773-4a0d-8b3a-6303d3ab109d",
+      "uuid": "5d48c8a7-3304-43b8-ac32-2539c637b56d",
       "value": "CIS Corps (Ireland)"
     },
     {
       "description": "Special Detective Unit (SDU)",
       "meta": {
-        "country": "Ireland",
+        "country": "IE",
+        "country_name": "Ireland",
         "refs": [
           "https://en.wikipedia.org/wiki/Special_Detective_Unit"
         ]
       },
       "related": [],
-      "uuid": "53488665-5b23-48fb-b0e7-0eaf0a345582",
+      "uuid": "c8b2fb87-dc32-4b20-a16e-c18a5b2c648c",
       "value": "Special Detective Unit"
     },
     {
       "description": "National Surveillance Unit (NSU)",
       "meta": {
-        "country": "Ireland",
+        "country": "IE",
+        "country_name": "Ireland",
         "refs": [
           "https://en.wikipedia.org/wiki/Garda_National_Surveillance_Unit"
         ]
       },
       "related": [],
-      "uuid": "7a5bc669-f813-4e4d-ba07-2ea77d7fe5df",
+      "uuid": "ad364289-a36b-4d56-9e98-b7dc362ee80c",
       "value": "Garda National Surveillance Unit"
     },
     {
       "description": "Financial Intelligence Unit (FIU)",
       "meta": {
-        "country": "Ireland",
+        "country": "IE",
+        "country_name": "Ireland",
         "refs": [
           "https://en.wikipedia.org/wiki/National_Economic_Crime_Bureau"
         ]
       },
       "related": [],
-      "uuid": "ccb04eaa-ff69-4f20-be2a-b75805c3ffc6",
+      "uuid": "346d8df1-7119-4d55-8f8e-1fae52d963c1",
       "value": "National Economic Crime Bureau"
     },
     {
       "description": "Mossad (Foreign Intelligence and Special Operations)",
       "meta": {
-        "country": "Israel",
+        "country": "IL",
+        "country_name": "Israel",
         "refs": [
           "https://en.wikipedia.org/wiki/Mossad"
         ]
       },
       "related": [],
-      "uuid": "5dd34791-637f-4944-9c56-d49c2ee0840c",
+      "uuid": "2dfba5c5-8fa3-411d-b298-e924b070a253",
       "value": "Mossad"
     },
     {
       "description": "Shin Bet (Internal Security Service)",
       "meta": {
-        "country": "Israel",
+        "country": "IL",
+        "country_name": "Israel",
         "refs": [
           "https://en.wikipedia.org/wiki/Shin_Bet"
         ]
       },
       "related": [],
-      "uuid": "45cfc48f-0e34-4e49-9601-013e5a9ca7e8",
+      "uuid": "7ee7caac-a14d-4ace-b5ae-51a267dd9f5e",
       "value": "Shin Bet"
     },
     {
       "description": "Aman (Military intelligence)",
       "meta": {
-        "country": "Israel",
+        "country": "IL",
+        "country_name": "Israel",
         "refs": [
           "https://en.wikipedia.org/wiki/Military_Intelligence_Directorate_(Israel)"
         ]
       },
       "related": [],
-      "uuid": "2f3be48a-ca0f-4915-bd21-103bee72b4c5",
+      "uuid": "8054fb6c-44e2-4649-aec3-56bb6199765b",
       "value": "Military Intelligence Directorate (Israel)"
     },
     {
       "description": "Lahav 433 (Police intelligence)",
       "meta": {
-        "country": "Israel",
+        "country": "IL",
+        "country_name": "Israel",
         "refs": [
           "https://en.wikipedia.org/wiki/Lahav_433"
         ]
       },
       "related": [],
-      "uuid": "31ca4a74-2e19-4d24-bfbc-37f68273156b",
+      "uuid": "b440a534-2741-417e-bd82-e0b06f7ee11a",
       "value": "Lahav 433"
     },
     {
       "description": "Agenzia Informazioni e Sicurezza Interna (AISI) - Agency for Internal Information and Security",
       "meta": {
-        "country": "Italy",
+        "country": "IT",
+        "country_name": "Italy",
         "refs": [
           "https://en.wikipedia.org/wiki/Agenzia_Informazioni_e_Sicurezza_Interna"
         ]
       },
       "related": [],
-      "uuid": "8bc3d321-5a06-4a53-a52c-adee36c1e4ef",
+      "uuid": "2cc357f1-5af4-41b7-883f-f0512b31d7c6",
       "value": "Agenzia Informazioni e Sicurezza Interna"
     },
     {
       "description": "Agenzia Informazioni e Sicurezza Esterna (AISE) - Agency for External Information and Security",
       "meta": {
-        "country": "Italy",
+        "country": "IT",
+        "country_name": "Italy",
         "refs": [
           "https://en.wikipedia.org/wiki/Agenzia_Informazioni_e_Sicurezza_Esterna"
         ]
       },
       "related": [],
-      "uuid": "7d5228d1-b5d1-4098-a4f7-88ffdd0120d6",
+      "uuid": "015df5e2-6eaf-4119-9af8-93460e1bb35f",
       "value": "Agenzia Informazioni e Sicurezza Esterna"
     },
     {
       "description": "Centro Intelligence Interforze (CII) - Joint Intelligence Center",
       "meta": {
-        "country": "Italy",
+        "country": "IT",
+        "country_name": "Italy",
         "refs": [
           "https://en.wikipedia.org/wiki/Centro_Intelligence_Interforze"
         ]
       },
       "related": [],
-      "uuid": "0f7bbef5-0718-4e2e-9d01-54db15e05010",
+      "uuid": "11f99138-3e95-4142-953f-754ad3d4fb9e",
       "value": "Centro Intelligence Interforze"
     },
     {
       "description": "Financial Investigations Division (FID)[14]",
       "meta": {
-        "country": "Jamaica",
+        "country": "JM",
+        "country_name": "Jamaica",
         "refs": [
           "https://en.wikipedia.org#cite_note-14"
         ]
       },
       "related": [],
-      "uuid": "4f69c540-0afd-4170-8774-efa4a5528f92",
+      "uuid": "b79d8ae4-c35d-4ba8-bee5-da600afd93b8",
       "value": "Financial Investigations Division (FID)[14]"
     },
     {
       "description": "Cabinet Intelligence and Research Office (CIRO)",
       "meta": {
-        "country": "Japan",
+        "country": "JP",
+        "country_name": "Japan",
         "refs": [
           "https://en.wikipedia.org/wiki/Cabinet_Intelligence_and_Research_Office"
         ]
       },
       "related": [],
-      "uuid": "290ab7cd-2459-4613-b5e2-9ed298a361c1",
+      "uuid": "61e20a0e-8151-46d1-92e0-df85fc65f5f9",
       "value": "Cabinet Intelligence and Research Office"
     },
     {
       "description": "Defense Intelligence Headquarters (DIH)",
       "meta": {
-        "country": "Japan",
+        "country": "JP",
+        "country_name": "Japan",
         "refs": [
           "https://en.wikipedia.org/wiki/Defense_Intelligence_Headquarters"
         ]
       },
       "related": [],
-      "uuid": "1e768c82-802a-46f4-b689-a25024fcab5b",
+      "uuid": "b0c0eb62-89a9-4853-a130-8fbae99b72ba",
       "value": "Defense Intelligence Headquarters"
     },
     {
       "description": "Public Security Intelligence Agency (PSIA)",
       "meta": {
-        "country": "Japan",
+        "country": "JP",
+        "country_name": "Japan",
         "refs": [
           "https://en.wikipedia.org/wiki/Public_Security_Intelligence_Agency"
         ]
       },
       "related": [],
-      "uuid": "e783bdf1-fe78-4156-94cc-221f3aa7e3d6",
+      "uuid": "20c45730-62cd-4374-888c-c79bb0403507",
       "value": "Public Security Intelligence Agency"
     },
     {
       "description": "General Intelligence Department (GID) - (Da’irat al-Mukhabarat al-’Ammah)",
       "meta": {
-        "country": "Jordan",
+        "country": "JO",
+        "country_name": "Jordan",
         "refs": [
           "https://en.wikipedia.org/wiki/Dairat_al-Mukhabarat_al-Ammah"
         ]
       },
       "related": [],
-      "uuid": "f4ff9460-a84c-4c90-9167-298021c124d0",
+      "uuid": "d235d6ab-1381-4b43-939a-6299c6cca4ae",
       "value": "Dairat al-Mukhabarat al-Ammah"
     },
     {
       "description": "National Intelligence Service(NIS)",
       "meta": {
-        "country": "Kenya",
+        "country": "KE",
+        "country_name": "Kenya",
         "refs": [
           "https://en.wikipedia.org/wiki/National_Intelligence_Service_(Kenya)"
         ]
       },
       "related": [],
-      "uuid": "4344c9a2-a1a0-4294-bd1e-df0cbebb011d",
+      "uuid": "252c3c22-5058-425f-8d8a-9bb4ce6cd1d3",
       "value": "National Intelligence Service (Kenya)"
     },
     {
       "description": "Directorate of Criminal Investigation(DCI)",
       "meta": {
-        "country": "Kenya",
+        "country": "KE",
+        "country_name": "Kenya",
         "refs": [
           "https://en.wikipedia.org/wiki/Criminal_Investigation_Department_(Kenya)"
         ]
       },
       "related": [],
-      "uuid": "a2e078b3-c1bd-49c1-a3c0-cf626b15c254",
+      "uuid": "4049ad80-62de-4280-b52c-7d90b6776030",
       "value": "Criminal Investigation Department (Kenya)"
     },
     {
       "description": "Military Intelligence(MI)",
       "meta": {
-        "country": "Kenya",
+        "country": "KE",
+        "country_name": "Kenya",
         "refs": [
           "https://en.wikipedia.orghttps://mod.go.ke/reports/cdf-opens-military-intelligence-corps-headquarters/"
         ]
       },
       "related": [],
-      "uuid": "5d8febf9-865f-4e2b-b4b3-9d6e54dcb1ae",
+      "uuid": "0acda0e6-b82b-4026-a1ed-b978d51dbafe",
       "value": "Military Intelligence(MI)"
     },
     {
       "description": "State Committee for National Security (UKMK/GKNB)",
       "meta": {
-        "country": "Kyrgyzstan",
+        "country": "KG",
+        "country_name": "Kyrgyzstan",
         "refs": [
           "https://en.wikipedia.org/wiki/State_Committee_for_National_Security_(Kyrgyzstan)"
         ]
       },
       "related": [],
-      "uuid": "26969b15-f7a4-4be4-8c02-a3bb97c945f7",
+      "uuid": "ee419bce-cbb6-434f-8ddc-40ae6bb9d3df",
       "value": "State Committee for National Security (Kyrgyzstan)"
     },
     {
       "description": "General Directorate of General Security",
       "meta": {
-        "country": "Lebanon",
+        "country": "LB",
+        "country_name": "Lebanon",
         "refs": [
           "https://en.wikipedia.org/wiki/General_Directorate_of_General_Security"
         ]
       },
       "related": [],
-      "uuid": "bf92b0ec-a628-44ac-b3f0-3ddd07987ff7",
+      "uuid": "b000c540-9d30-4192-8d7e-21540fbb1ec1",
       "value": "General Directorate of General Security"
     },
     {
       "description": "The Information Branch",
       "meta": {
-        "country": "Lebanon",
+        "country": "LB",
+        "country_name": "Lebanon",
         "refs": [
           "https://en.wikipedia.org/wiki/The_Information_Branch"
         ]
       },
       "related": [],
-      "uuid": "1f553216-bb0d-44c9-942f-a4a044458791",
+      "uuid": "6bc67724-3ca1-455b-b2be-0e213f5c23df",
       "value": "The Information Branch"
     },
     {
       "description": "Lebanese State Security",
       "meta": {
-        "country": "Lebanon",
+        "country": "LB",
+        "country_name": "Lebanon",
         "refs": [
           "https://en.wikipedia.org/wiki/Lebanese_State_Security"
         ]
       },
       "related": [],
-      "uuid": "f639a810-b2aa-4c1e-b982-529dd690675c",
+      "uuid": "2e0250b8-f093-42b8-9921-3f3a3706803c",
       "value": "Lebanese State Security"
     },
     {
       "description": "National Security Agency",
       "meta": {
-        "country": "Liberia",
+        "country": "LR",
+        "country_name": "Liberia",
         "refs": [
           "https://en.wikipedia.org/wiki/National_Security_Agency_(Liberia)"
         ]
       },
       "related": [],
-      "uuid": "0e6a7927-b0be-4de9-b835-7ca6c6bd2f38",
+      "uuid": "73c90c4b-9c2c-4e48-a7b7-897d86a56630",
       "value": "National Security Agency (Liberia)"
     },
     {
       "description": "State Security Department - (Valstybes saugumo departamentas (VSD))",
       "meta": {
-        "country": "Lithuania",
+        "country": "LT",
+        "country_name": "Lithuania",
         "refs": [
           "https://en.wikipedia.org/wiki/State_Security_Department_of_Lithuania"
         ]
       },
       "related": [],
-      "uuid": "e4621475-8c69-4698-b7dc-f783c3039d9a",
+      "uuid": "714982ec-515b-4e2f-bd6d-34416f47e904",
       "value": "State Security Department of Lithuania"
     },
     {
       "description": "Second Investigation Department - (Antrasis operatyvinių tarnybų departamentas (AOTD))",
       "meta": {
-        "country": "Lithuania",
+        "country": "LT",
+        "country_name": "Lithuania",
         "refs": [
           "https://en.wikipedia.org/wiki/Second_Investigation_Department"
         ]
       },
       "related": [],
-      "uuid": "e8c01f2a-e94e-473c-aeca-452053193770",
+      "uuid": "43bf2a86-f917-4fea-bbdf-4d2dd6999b6d",
       "value": "Second Investigation Department"
     },
     {
       "description": "Luxembourg State Intelligence Service - (Service de Renseignement de l'État Luxembourgeois)",
       "meta": {
-        "country": "Luxembourg",
+        "country": "LU",
+        "country_name": "Luxembourg",
         "refs": [
           "https://en.wikipedia.org/wiki/Service_de_Renseignement_de_l%E2%80%99%C3%89tat"
         ]
       },
       "related": [],
-      "uuid": "342a3284-8d00-4ecb-ac74-eb85cef22412",
+      "uuid": "87417b08-5633-465e-a11c-311442b63053",
       "value": "Service de Renseignement de l’État"
     },
     {
       "description": "Central Intelligence Service (CIS)[15]",
       "meta": {
-        "country": "Madagascar",
+        "country": "MG",
+        "country_name": "Madagascar",
         "refs": [
           "https://en.wikipedia.org#cite_note-15"
         ]
       },
       "related": [],
-      "uuid": "c98a189e-1a23-49dc-852f-621b03b061fd",
+      "uuid": "5822ae00-0f83-4986-847f-dd20853f44d4",
       "value": "Central Intelligence Service (CIS)[15]"
     },
     {
       "description": "Malaysian Defence Intelligence Organisation (Military Intelligence)[16]",
       "meta": {
-        "country": "Malaysia",
+        "country": "MY",
+        "country_name": "Malaysia",
         "refs": [
           "https://en.wikipedia.org/wiki/Malaysian_Defence_Intelligence_Organisation"
         ]
       },
       "related": [],
-      "uuid": "493a00fd-e8c4-4f12-8498-a4e74c4453f2",
+      "uuid": "b59519e9-863b-48a3-9b7e-c58b35df5a00",
       "value": "Malaysian Defence Intelligence Organisation"
     },
     {
       "description": "Malaysian External Intelligence Organisation (Foreign Intelligence)",
       "meta": {
-        "country": "Malaysia",
+        "country": "MY",
+        "country_name": "Malaysia",
         "refs": [
           "https://en.wikipedia.org/wiki/Research_Division_of_the_Prime_Minister%27s_Department"
         ]
       },
       "related": [],
-      "uuid": "027ca2ea-b415-45ea-a4f2-4fb35008cfdd",
+      "uuid": "38d5799d-5466-4287-9028-a5ddd39610b8",
       "value": "Research Division of the Prime Minister's Department"
     },
     {
       "description": "Malaysian Special Branch (Police & Internal Intelligence)[17]",
       "meta": {
-        "country": "Malaysia",
+        "country": "MY",
+        "country_name": "Malaysia",
         "refs": [
           "https://en.wikipedia.org/wiki/Malaysian_Special_Branch"
         ]
       },
       "related": [],
-      "uuid": "feb9892a-8fd2-4899-adae-ee4e33fd520c",
+      "uuid": "953e5de0-3331-47e9-b7cf-57c28dea8b89",
       "value": "Malaysian Special Branch"
     },
     {
       "description": "Crime-Combat Planning, Analysis and Information Center (CENAPI / PGR – Centro de Planeación, Análisis e Información para el Combate a la Delincuencia)",
       "meta": {
-        "country": "Mexico"
+        "country": "MX",
+        "country_name": "Mexico"
       },
       "related": [],
-      "uuid": "d4baf402-060b-482a-831f-d4c8508bc676",
+      "uuid": "7086ab5f-3cca-45b7-ab7a-3d48411a5e3d",
       "value": "Crime-Combat Planning, Analysis and Information Center (CENAPI / PGR – Centro de Planeación, Análisis e Información para el Combate a la Delincuencia)"
     },
     {
       "description": "Assistant Attorney General's Office for Special Investigations on Organized Crime (SEIDO / PGR)",
       "meta": {
-        "country": "Mexico",
+        "country": "MX",
+        "country_name": "Mexico",
         "refs": [
           "https://en.wikipedia.org/wiki/Assistant_Attorney_General%27s_Office_for_Special_Investigations_on_Organized_Crime"
         ]
       },
       "related": [],
-      "uuid": "3a1930b6-ecc6-4b67-9db0-39a2f200c49e",
+      "uuid": "fbc5dd89-3410-45f8-99bc-a1876e058db9",
       "value": "Assistant Attorney General's Office for Special Investigations on Organized Crime"
     },
     {
       "description": "Intelligence Division of the Federal Police (Division de Inteligencia – CNS / Policia Federal)",
       "meta": {
-        "country": "Mexico",
+        "country": "MX",
+        "country_name": "Mexico",
         "refs": [
           "https://en.wikipedia.org/wiki/Federal_Police_(Mexico)#Intelligence_Division"
         ]
       },
       "related": [],
-      "uuid": "47a5c47e-3b9f-44d5-9e8c-e7dc3870a9e6",
+      "uuid": "19cec65b-02b9-488b-8925-a871ae39accd",
       "value": "Federal Police (Mexico)"
     },
     {
       "description": "National Intelligence Centre (CNI)",
       "meta": {
-        "country": "Mexico",
+        "country": "MX",
+        "country_name": "Mexico",
         "refs": [
           "https://en.wikipedia.org/wiki/National_Intelligence_Centre_(M%C3%A9xico)"
         ]
       },
       "related": [],
-      "uuid": "9ed45f0a-df28-4811-8d4c-05b82e8488c3",
+      "uuid": "be271a50-4ed8-4915-b972-fce5d658783e",
       "value": "National Intelligence Centre (México)"
     },
     {
       "description": "2nd Section of the National Defense Intelligence Staff (SEDENA S-2 – Seccion 2da: Inteligencia del Estado Mayor)",
       "meta": {
-        "country": "Mexico",
+        "country": "MX",
+        "country_name": "Mexico",
         "refs": [
           "https://en.wikipedia.org/wiki/Estado_Mayor_Presidencial"
         ]
       },
       "related": [],
-      "uuid": "ca28e231-187d-4f83-98a1-6d4f8cc46f27",
+      "uuid": "ef2ba26a-a70e-4e48-8378-9b6eef5574ab",
       "value": "Estado Mayor Presidencial"
     },
     {
       "description": "Military Intelligence – National Defense Ministry (Inteligencia Militar – SEDENA / Ejercito y Fuerza Aerea)",
       "meta": {
-        "country": "Mexico",
+        "country": "MX",
+        "country_name": "Mexico",
         "refs": [
           "https://en.wikipedia.org/wiki/SEDENA"
         ]
       },
       "related": [],
-      "uuid": "7f7c120a-0b30-4ed1-82f1-f64342bb2d13",
+      "uuid": "fe3dab3e-3664-4680-ad4d-3b9a793d843b",
       "value": "SEDENA"
     },
     {
       "description": "Naval Intelligence - (Inteligencia Naval / SEMAR / Marina Armada)",
       "meta": {
-        "country": "Mexico",
+        "country": "MX",
+        "country_name": "Mexico",
         "refs": [
           "https://en.wikipedia.org/wiki/Secretariat_of_the_Navy"
         ]
       },
       "related": [],
-      "uuid": "b523f53b-9ed9-4eab-8e65-be9cd5ccf085",
+      "uuid": "2546ace4-b3a3-4353-8a21-885b8ccbde53",
       "value": "Secretariat of the Navy"
     },
     {
       "description": "Information and Security Service (SIS)[18]",
       "meta": {
-        "country": "Moldova",
+        "country": "MD",
+        "country_name": "Moldova",
         "refs": [
           "https://en.wikipedia.org/wiki/Information_and_Security_Service_of_the_Republic_of_Moldova"
         ]
       },
       "related": [],
-      "uuid": "c85c356a-e1f6-4aa6-8241-5016eb1bf7ae",
+      "uuid": "23f04577-7a74-4cb9-9e75-c8ba564aafce",
       "value": "Information and Security Service of the Republic of Moldova"
     },
     {
       "description": "General Intelligence Agency of Mongolia (GIA)",
       "meta": {
-        "country": "Mongolia",
+        "country": "MN",
+        "country_name": "Mongolia",
         "refs": [
           "https://en.wikipedia.org/wiki/General_Intelligence_Agency_of_Mongolia"
         ]
       },
       "related": [],
-      "uuid": "55777502-bbef-4184-9df9-b57e980576a7",
+      "uuid": "32e9e3bf-66d2-44d6-b31e-2b419df7a4f4",
       "value": "General Intelligence Agency of Mongolia"
     },
     {
       "description": "National Security Agency (ANB)",
       "meta": {
-        "country": "Montenegro",
+        "country": "ME",
+        "country_name": "Montenegro",
         "refs": [
           "https://en.wikipedia.org/wiki/National_Security_Agency_(Montenegro)"
         ]
       },
       "related": [],
-      "uuid": "bd108ae8-fad2-4569-b89e-cf22d61eb6d5",
+      "uuid": "0b01cb09-3704-4148-a40f-2b8ad4f17b62",
       "value": "National Security Agency (Montenegro)"
     },
     {
       "description": "General Directorate for Territorial Surveillance - Direction de la Surveillance du Territoire (DST)",
       "meta": {
-        "country": "Morocco",
+        "country": "MA",
+        "country_name": "Morocco",
         "refs": [
           "https://en.wikipedia.org/wiki/General_Directorate_for_Territorial_Surveillance_(Morocco)"
         ]
       },
       "related": [],
-      "uuid": "d8de0303-fa10-499d-a430-763cfab9dcc5",
+      "uuid": "d76b7421-fe5a-47a3-a601-1e8965288b12",
       "value": "General Directorate for Territorial Surveillance (Morocco)"
     },
     {
       "description": "Deuxième Bureau (Morocco) - Military secret service[19]",
       "meta": {
-        "country": "Morocco",
+        "country": "MA",
+        "country_name": "Morocco",
         "refs": [
           "https://en.wikipedia.org/wiki/Deuxi%C3%A8me_Bureau_(Morocco)"
         ]
       },
       "related": [],
-      "uuid": "92fd35d5-b044-4a5a-8a6d-8de01b08792d",
+      "uuid": "c60ad10c-b60d-4026-9491-58be15062389",
       "value": "Deuxième Bureau (Morocco)"
     },
     {
       "description": "Directorate of Research and Documentation - Direction Generale pour l'Etude et la Documentation (DGED)",
       "meta": {
-        "country": "Morocco",
+        "country": "MA",
+        "country_name": "Morocco",
         "refs": [
           "https://en.wikipedia.org/wiki/Direction_Generale_pour_l%27Etude_et_la_Documentation"
         ]
       },
       "related": [],
-      "uuid": "ac9da77b-e6c7-46af-8acf-392932689dd9",
+      "uuid": "f1389476-b777-4b47-8e9a-57c41e04093c",
       "value": "Direction Generale pour l'Etude et la Documentation"
     },
     {
       "description": "Office of the Chief of Military Security Affairs (OCMSA)",
       "meta": {
-        "country": "Myanmar",
+        "country": "MM",
+        "country_name": "Myanmar",
         "refs": [
           "https://en.wikipedia.org/wiki/Office_of_the_Chief_of_Military_Security_Affairs"
         ]
       },
       "related": [],
-      "uuid": "fcc92e87-de59-49ab-9332-5e48eef1fa7b",
+      "uuid": "46ce5c96-6072-489f-b4d1-4f55418555ab",
       "value": "Office of the Chief of Military Security Affairs"
     },
     {
       "description": "Bureau Of Special Investigation (BSI)",
       "meta": {
-        "country": "Myanmar",
+        "country": "MM",
+        "country_name": "Myanmar",
         "refs": [
           "https://en.wikipedia.org/wiki/Bureau_Of_Special_Investigation"
         ]
       },
       "related": [],
-      "uuid": "3fa0c735-60a6-49d9-b56b-fc09d536f0ac",
+      "uuid": "75a181c3-349b-4d1a-9c1f-f47e43fe05dc",
       "value": "Bureau Of Special Investigation"
     },
     {
       "description": "Special Intelligence Department (SID)",
       "meta": {
-        "country": "Myanmar",
+        "country": "MM",
+        "country_name": "Myanmar",
         "refs": [
           "https://en.wikipedia.org/wiki/Special_Intelligence_Department"
         ]
       },
       "related": [],
-      "uuid": "69e33942-bc8e-46ed-ade6-dd77280bd866",
+      "uuid": "577df338-bc79-4c4a-b0ea-3218ded324f9",
       "value": "Special Intelligence Department"
     },
     {
       "description": "Namibia Central Intelligence Service (NCIS)",
       "meta": {
-        "country": "Namibia",
+        "country": "NA",
+        "country_name": "Namibia",
         "refs": [
           "https://en.wikipedia.org/wiki/Namibia_Central_Intelligence_Service"
         ]
       },
       "related": [],
-      "uuid": "287fa8ae-487f-431f-b3f4-81d88c7d2189",
+      "uuid": "2020568c-f3a2-4599-b89d-78af387e0edb",
       "value": "Namibia Central Intelligence Service"
     },
     {
       "description": "Directorate of Military Intelligence (DMI)",
       "meta": {
-        "country": "Nepal",
+        "country": "NP",
+        "country_name": "Nepal",
         "refs": [
           "https://en.wikipedia.org/wiki/Directorate_of_Military_Intelligence,_Nepal"
         ]
       },
       "related": [],
-      "uuid": "75189e48-a3f9-4966-a288-b4456c071b3f",
+      "uuid": "1ded2d6e-1c59-409c-85de-9d05edcb8f0a",
       "value": "Directorate of Military Intelligence, Nepal"
     },
     {
       "description": "National Investigation Department (NID)",
       "meta": {
-        "country": "Nepal",
+        "country": "NP",
+        "country_name": "Nepal",
         "refs": [
           "https://en.wikipedia.org/wiki/National_Investigation_Department_of_Nepal"
         ]
       },
       "related": [],
-      "uuid": "2bf3bd7b-55d7-4749-8e27-073ed7c338a5",
+      "uuid": "cca7302a-67c8-4bb9-a0ed-e9e6d5f69bf7",
       "value": "National Investigation Department of Nepal"
     },
     {
       "description": "General Intelligence and Security Service - Algemene Inlichtingen en Veiligheidsdienst (AIVD)",
       "meta": {
-        "country": "Netherlands",
+        "country": "NL",
+        "country_name": "Netherlands",
         "refs": [
           "https://en.wikipedia.org/wiki/General_Intelligence_and_Security_Service"
         ]
       },
       "related": [],
-      "uuid": "707b8763-2dc2-4be8-add9-87e6283d4c02",
+      "uuid": "1d49f3d0-cefc-4387-9373-862f48abc2ba",
       "value": "General Intelligence and Security Service"
     },
     {
       "description": "Joint Sigint Cyber Unit (JSCU)",
       "meta": {
-        "country": "Netherlands",
+        "country": "NL",
+        "country_name": "Netherlands",
         "refs": [
           "https://en.wikipedia.org/wiki/Joint_Sigint_Cyber_Unit"
         ]
       },
       "related": [],
-      "uuid": "cdcb6b54-4797-4def-92f3-a5839880258e",
+      "uuid": "0ba8afde-2692-4f96-af6a-24061f32d0b7",
       "value": "Joint Sigint Cyber Unit"
     },
     {
       "description": "National Coordinator for Counterterrorism and Security - Nationaal Coördinator Terrorismebestrijding en Veiligheid (NCTV)",
       "meta": {
-        "country": "Netherlands",
+        "country": "NL",
+        "country_name": "Netherlands",
         "refs": [
           "https://en.wikipedia.org/wiki/National_Coordinator_for_Counterterrorism_and_Security"
         ],
@@ -2945,127 +3177,138 @@
         ]
       },
       "related": [],
-      "uuid": "f0f1f017-e260-485c-bc87-b134ae021685",
+      "uuid": "2167d502-895a-412a-a704-d83821092e18",
       "value": "National Coordinator for Counterterrorism and Security"
     },
     {
       "description": "Team Criminal Intelligence (KMar-TCI)",
       "meta": {
-        "country": "Netherlands"
+        "country": "NL",
+        "country_name": "Netherlands"
       },
       "related": [],
-      "uuid": "504dea41-803d-4abd-82a7-717494d806d1",
+      "uuid": "14c92528-5888-4fb3-8e2b-8ca052328375",
       "value": "Team Criminal Intelligence (KMar-TCI)"
     },
     {
       "description": "Team Criminal Intelligence (FIOD-TCI)",
       "meta": {
-        "country": "Netherlands"
+        "country": "NL",
+        "country_name": "Netherlands"
       },
       "related": [],
-      "uuid": "3e261b0e-212e-488e-b835-b9cc0ec3639b",
+      "uuid": "c1aa26a8-2e59-4b8c-87f2-f1affb017dca",
       "value": "Team Criminal Intelligence (FIOD-TCI)"
     },
     {
       "description": "Government Communications Security Bureau[20]",
       "meta": {
-        "country": "New Zealand",
+        "country": "NZ",
+        "country_name": "New Zealand",
         "refs": [
           "https://en.wikipedia.org/wiki/Government_Communications_Security_Bureau"
         ]
       },
       "related": [],
-      "uuid": "f3a1add2-1575-4556-a983-51cd89cab66d",
+      "uuid": "a0c4c87d-61d9-4480-93a5-168ef9f32489",
       "value": "Government Communications Security Bureau"
     },
     {
       "description": "New Zealand Security Intelligence Service[20]",
       "meta": {
-        "country": "New Zealand",
+        "country": "NZ",
+        "country_name": "New Zealand",
         "refs": [
           "https://en.wikipedia.org/wiki/New_Zealand_Security_Intelligence_Service"
         ]
       },
       "related": [],
-      "uuid": "79309d78-df9b-4129-9749-31babdcc1f1a",
+      "uuid": "2fad59d6-fceb-4cb2-91b1-7789e6fb6fff",
       "value": "New Zealand Security Intelligence Service"
     },
     {
       "description": "National Assessments Bureau[20]",
       "meta": {
-        "country": "New Zealand",
+        "country": "NZ",
+        "country_name": "New Zealand",
         "refs": [
           "https://en.wikipedia.org/wiki/National_Assessments_Bureau"
         ]
       },
       "related": [],
-      "uuid": "b3af994c-6f11-4bb0-bee6-46d5a8820e63",
+      "uuid": "41800b70-58cf-4fa0-8bd7-12f62b95baab",
       "value": "National Assessments Bureau"
     },
     {
       "description": "National Intelligence Agency (Foreign Intelligence and Counterintelligence)",
       "meta": {
-        "country": "Nigeria",
+        "country": "NG",
+        "country_name": "Nigeria",
         "refs": [
           "https://en.wikipedia.org/wiki/National_Intelligence_Agency_(Nigeria)"
         ]
       },
       "related": [],
-      "uuid": "69b2efc9-d1d1-49cc-8edb-696791a1c672",
+      "uuid": "aae07d31-075e-4f6c-8b4b-b166d1d860a5",
       "value": "National Intelligence Agency (Nigeria)"
     },
     {
       "description": "Defence Intelligence Agency (Military Intelligence)",
       "meta": {
-        "country": "Nigeria",
+        "country": "NG",
+        "country_name": "Nigeria",
         "refs": [
           "https://en.wikipedia.org/wiki/Defence_Intelligence_Agency_(Nigeria)"
         ]
       },
       "related": [],
-      "uuid": "51c4ca97-540b-43ea-8bdb-a65cae740eee",
+      "uuid": "1fbd31db-8bdf-4dda-bbfb-0a7adc0b134c",
       "value": "Defence Intelligence Agency (Nigeria)"
     },
     {
       "description": "State Security Service (Internal Security)",
       "meta": {
-        "country": "Nigeria",
+        "country": "NG",
+        "country_name": "Nigeria",
         "refs": [
           "https://en.wikipedia.org/wiki/State_Security_Service_(Nigeria)"
         ]
       },
       "related": [],
-      "uuid": "4b936de0-9a29-41a3-ac41-a453066bb2af",
+      "uuid": "35be5335-7a1c-4dad-be38-6af11be255c2",
       "value": "State Security Service (Nigeria)"
     },
     {
       "description": "Reconnaissance General Bureau[21]",
       "meta": {
-        "country": "North Korea",
+        "country": "KP",
+        "country_name": "North Korea",
         "refs": [
           "https://en.wikipedia.org/wiki/Reconnaissance_General_Bureau"
         ]
       },
       "related": [],
-      "uuid": "11eab03f-aca2-4aea-89b3-a9dddf49760f",
+      "uuid": "a0cd97f4-42bb-4786-81d1-f59033e2a4b3",
       "value": "Reconnaissance General Bureau"
     },
     {
       "description": "Ministry of State Security[22]",
       "meta": {
-        "country": "North Korea",
+        "country": "KP",
+        "country_name": "North Korea",
         "refs": [
           "https://en.wikipedia.org/wiki/Ministry_of_State_Security_(North_Korea)"
         ]
       },
       "related": [],
-      "uuid": "ed78e791-c97d-4868-960a-e6029c2b7ad6",
+      "uuid": "0de9fa38-0d00-4390-9018-f23789bd392f",
       "value": "Ministry of State Security (North Korea)"
     },
     {
       "description": "Administration for Security and Counterintelligence (Uprava za bezbednost i kontrarazuznavanje) (Police Agency)",
       "meta": {
-        "country": "North Macedonia",
+        "country": "MK",
+        "country_name": "North Macedonia",
         "refs": [
           "https://en.wikipedia.org/wiki/Administration_for_Security_and_Counterintelligence"
         ],
@@ -3076,13 +3319,14 @@
         ]
       },
       "related": [],
-      "uuid": "da498210-cea7-42b3-88b2-d59204a52946",
+      "uuid": "7776fe8b-b24a-4d8d-86e4-2cd783c4dec1",
       "value": "Administration for Security and Counterintelligence"
     },
     {
       "description": "Intelligence Agency (Agencija za Razuznavanje) (Civilian Agency) IA",
       "meta": {
-        "country": "North Macedonia",
+        "country": "MK",
+        "country_name": "North Macedonia",
         "refs": [
           "https://en.wikipedia.org/wiki/Intelligence_Agency_of_North_Macedonia"
         ],
@@ -3093,13 +3337,14 @@
         ]
       },
       "related": [],
-      "uuid": "38d34ded-cf1b-4b54-be9c-04db0532e2e6",
+      "uuid": "0fdb2968-e9fb-4c3f-ba3f-813c67d0dd7a",
       "value": "Intelligence Agency of North Macedonia"
     },
     {
       "description": "Military Service for Security and Intelligence (Voena služba za razuznuvanje i bezbednost) (Military Agency) [1]",
       "meta": {
-        "country": "North Macedonia",
+        "country": "MK",
+        "country_name": "North Macedonia",
         "refs": [
           "https://en.wikipedia.org/wiki/Military_Service_for_Security_and_Intelligence"
         ],
@@ -3110,361 +3355,391 @@
         ]
       },
       "related": [],
-      "uuid": "33ed1255-a84a-4e6f-a6e9-07476f11f5f1",
+      "uuid": "855b9048-13b0-43cf-a878-9042611df2f3",
       "value": "Military Service for Security and Intelligence"
     },
     {
       "description": "Nasjonal sikkerhetsmyndighet (NSM) (National Security Authority)",
       "meta": {
-        "country": "Norway",
+        "country": "NO",
+        "country_name": "Norway",
         "refs": [
           "https://en.wikipedia.org/wiki/Nasjonal_sikkerhetsmyndighet"
         ]
       },
       "related": [],
-      "uuid": "2fbdc4a8-9c9b-452f-a699-5bdebc3a94fd",
+      "uuid": "b6c34089-0d80-4459-9d31-30c234fced22",
       "value": "Nasjonal sikkerhetsmyndighet"
     },
     {
       "description": "Politiets sikkerhetstjeneste (PST) (Police Security Service)",
       "meta": {
-        "country": "Norway",
+        "country": "NO",
+        "country_name": "Norway",
         "refs": [
           "https://en.wikipedia.org/wiki/Politiets_sikkerhetstjeneste"
         ]
       },
       "related": [],
-      "uuid": "65484b33-b1a0-41c4-8165-95514475b042",
+      "uuid": "5ba49986-7c36-4ee0-a87d-0021a3224903",
       "value": "Politiets sikkerhetstjeneste"
     },
     {
       "description": "Etterretningstjenesten (NIS) (Norwegian Intelligence Service)",
       "meta": {
-        "country": "Norway",
+        "country": "NO",
+        "country_name": "Norway",
         "refs": [
           "https://en.wikipedia.org/wiki/Etterretningstjenesten"
         ]
       },
       "related": [],
-      "uuid": "d9b8eb7c-f40b-4f69-9982-07f46bc6c3a8",
+      "uuid": "19bbb240-7483-4c12-a1b9-35674487da68",
       "value": "Etterretningstjenesten"
     },
     {
       "description": "Forsvarets sikkerhetstjeneste (FOST) – Norwegian Defence Security Service (NORDSS)",
       "meta": {
-        "country": "Norway",
+        "country": "NO",
+        "country_name": "Norway",
         "refs": [
           "https://en.wikipedia.org/wiki/Forsvarets_sikkerhetstjeneste"
         ]
       },
       "related": [],
-      "uuid": "12df0c5b-b0ef-42e7-a35e-9aaa2712c7bb",
+      "uuid": "89feb1b6-3adb-4f95-813d-67275bf3a2ff",
       "value": "Forsvarets sikkerhetstjeneste"
     },
     {
       "description": "The Palace Office [Foreign Intelligence]",
       "meta": {
-        "country": "Oman",
+        "country": "OM",
+        "country_name": "Oman",
         "refs": [
           "https://en.wikipedia.org/wiki/Palace_Office_(Oman)"
         ]
       },
       "related": [],
-      "uuid": "7a4f626b-f713-4704-9a48-3c7e2943a3e5",
+      "uuid": "9a64b06f-6940-4215-be6c-efdacb356cb5",
       "value": "Palace Office (Oman)"
     },
     {
       "description": "Internal Security Service [Internal Security]",
       "meta": {
-        "country": "Oman",
+        "country": "OM",
+        "country_name": "Oman",
         "refs": [
           "https://en.wikipedia.org/wiki/Internal_Security_Service"
         ]
       },
       "related": [],
-      "uuid": "d4ba794d-b350-47f9-9a9a-46a3dd217ce4",
+      "uuid": "c0d8d217-b592-4e16-8cbc-3b20fc240f24",
       "value": "Internal Security Service"
     },
     {
       "description": "Inter-Services Intelligence (ISI)",
       "meta": {
-        "country": "Pakistan",
+        "country": "PK",
+        "country_name": "Pakistan",
         "refs": [
           "https://en.wikipedia.org/wiki/Inter-Services_Intelligence"
         ]
       },
       "related": [],
-      "uuid": "8f52c3b2-ac9f-4739-84e8-ee663b50d874",
+      "uuid": "40a4334b-3c54-4e64-8b53-5894f5f58914",
       "value": "Inter-Services Intelligence"
     },
     {
       "description": "Air Intelligence (AI)",
       "meta": {
-        "country": "Pakistan",
+        "country": "PK",
+        "country_name": "Pakistan",
         "refs": [
           "https://en.wikipedia.org/wiki/Air_Intelligence_(Pakistan)"
         ]
       },
       "related": [],
-      "uuid": "635e2710-10d6-4e0c-8148-18f50d14a6b6",
+      "uuid": "865406a2-fff5-49a9-819d-8201869c54e4",
       "value": "Air Intelligence (Pakistan)"
     },
     {
       "description": "Military Intelligence (MI)",
       "meta": {
-        "country": "Pakistan",
+        "country": "PK",
+        "country_name": "Pakistan",
         "refs": [
           "https://en.wikipedia.org/wiki/Military_Intelligence_(Pakistan)"
         ]
       },
       "related": [],
-      "uuid": "8727783d-0100-4482-ba8a-696464b093ad",
+      "uuid": "cb694f6a-8ead-411b-bcae-5020b0837449",
       "value": "Military Intelligence (Pakistan)"
     },
     {
       "description": "Naval Intelligence (NI)",
       "meta": {
-        "country": "Pakistan",
+        "country": "PK",
+        "country_name": "Pakistan",
         "refs": [
           "https://en.wikipedia.org/wiki/Naval_Intelligence_(Pakistan)"
         ]
       },
       "related": [],
-      "uuid": "3defc795-1c4a-4e11-8a41-68d81dc9e551",
+      "uuid": "1625f7a8-509c-438e-b05f-6379283e5b82",
       "value": "Naval Intelligence (Pakistan)"
     },
     {
       "description": "Intelligence Bureau (IB)",
       "meta": {
-        "country": "Pakistan",
+        "country": "PK",
+        "country_name": "Pakistan",
         "refs": [
           "https://en.wikipedia.org/wiki/Intelligence_Bureau_(Pakistan)"
         ]
       },
       "related": [],
-      "uuid": "83540320-8c7f-47fc-83af-2a3201aae1aa",
+      "uuid": "abec2392-ef0c-4efe-b864-fda578ac5d65",
       "value": "Intelligence Bureau (Pakistan)"
     },
     {
       "description": "Federal Investigation Agency (FIA)",
       "meta": {
-        "country": "Pakistan",
+        "country": "PK",
+        "country_name": "Pakistan",
         "refs": [
           "https://en.wikipedia.org/wiki/Federal_Investigation_Agency"
         ]
       },
       "related": [],
-      "uuid": "cd9419df-80c2-44ec-b59f-2782bebe5940",
+      "uuid": "3de379dc-ef31-4401-9857-b45694935872",
       "value": "Federal Investigation Agency"
     },
     {
       "description": "National Counter Terrorism Authority (NACTA)",
       "meta": {
-        "country": "Pakistan",
+        "country": "PK",
+        "country_name": "Pakistan",
         "refs": [
           "https://en.wikipedia.org/wiki/National_Counter_Terrorism_Authority"
         ]
       },
       "related": [],
-      "uuid": "771ba87c-4698-467f-81b8-45a55d0d0fb8",
+      "uuid": "b5783d83-b729-4660-a2a9-2d9de1192732",
       "value": "National Counter Terrorism Authority"
     },
     {
       "description": "Counter Terrorism Department (CTD)",
       "meta": {
-        "country": "Pakistan",
+        "country": "PK",
+        "country_name": "Pakistan",
         "refs": [
           "https://en.wikipedia.org/wiki/Counter_Terrorism_Department_(Pakistan)"
         ]
       },
       "related": [],
-      "uuid": "b1280a2c-b60c-464a-acbd-b7a9026938a1",
+      "uuid": "f15e4052-2a3f-4d09-9fb9-ea734f3845f0",
       "value": "Counter Terrorism Department (Pakistan)"
     },
     {
       "description": "National Intelligence Directorate (NID)",
       "meta": {
-        "country": "Pakistan",
+        "country": "PK",
+        "country_name": "Pakistan",
         "refs": [
           "https://en.wikipedia.org/wiki/National_Intelligence_Directorate_(Pakistan)"
         ]
       },
       "related": [],
-      "uuid": "e7260132-d58d-48d4-bc5f-8e05de57d565",
+      "uuid": "aafc0145-7192-488c-b4ce-2272a525ce58",
       "value": "National Intelligence Directorate (Pakistan)"
     },
     {
       "description": "Special Branch (Pakistan)",
       "meta": {
-        "country": "Pakistan",
+        "country": "PK",
+        "country_name": "Pakistan",
         "refs": [
           "https://en.wikipedia.org/wiki/Special_Branch_(Pakistan)"
         ]
       },
       "related": [],
-      "uuid": "4266241b-6761-40ad-901f-3df7f8b6390f",
+      "uuid": "11b12a92-89a0-459b-a219-e98a6ad1466e",
       "value": "Special Branch (Pakistan)"
     },
     {
       "description": "Directorate-General of Intelligence and Investigation (DGII)",
       "meta": {
-        "country": "Pakistan",
+        "country": "PK",
+        "country_name": "Pakistan",
         "refs": [
           "https://en.wikipedia.org/wiki/Directorate_General_of_Intelligence_and_Investigation"
         ]
       },
       "related": [],
-      "uuid": "cc33aeed-6a21-4f24-94d6-dccf0ba29f11",
+      "uuid": "301d29d2-4cdf-4da7-9dd0-d9cdd78a14b7",
       "value": "Directorate General of Intelligence and Investigation"
     },
     {
       "description": "Financial Monitoring Unit (FMU)",
       "meta": {
-        "country": "Pakistan",
+        "country": "PK",
+        "country_name": "Pakistan",
         "refs": [
           "https://en.wikipedia.org/wiki/Financial_Monitoring_Unit"
         ]
       },
       "related": [],
-      "uuid": "06bd1abd-3bb5-466c-bf43-00d098bc10be",
+      "uuid": "49f8e631-d9bd-43b1-9b13-8e9e4822c28a",
       "value": "Financial Monitoring Unit"
     },
     {
       "description": "National Accountability Bureau (NAB)",
       "meta": {
-        "country": "Pakistan",
+        "country": "PK",
+        "country_name": "Pakistan",
         "refs": [
           "https://en.wikipedia.org/wiki/National_Accountability_Bureau"
         ]
       },
       "related": [],
-      "uuid": "0d3f4337-e812-4573-ab26-1f9066ab9328",
+      "uuid": "cb09af5c-cbbd-447b-874c-f11bda9576c9",
       "value": "National Accountability Bureau"
     },
     {
       "description": "Security and Exchange Commission Pakistan (SECP)",
       "meta": {
-        "country": "Pakistan",
+        "country": "PK",
+        "country_name": "Pakistan",
         "refs": [
           "https://en.wikipedia.org/wiki/Security_and_Exchange_Commission_of_Pakistan"
         ]
       },
       "related": [],
-      "uuid": "bfdbbb89-87f5-49d4-9adf-46c1c6433f0e",
+      "uuid": "610a8c8d-40ab-4349-81a1-05833f37e64b",
       "value": "Security and Exchange Commission of Pakistan"
     },
     {
       "description": "Anti-Narcotics Force (ANF)",
       "meta": {
-        "country": "Pakistan",
+        "country": "PK",
+        "country_name": "Pakistan",
         "refs": [
           "https://en.wikipedia.org/wiki/Anti-Narcotics_Force"
         ]
       },
       "related": [],
-      "uuid": "3edf1112-d595-4669-ab55-2bca9f7ee982",
+      "uuid": "bcc520c6-5e2d-4657-b4e9-0616744690b7",
       "value": "Anti-Narcotics Force"
     },
     {
       "description": "National Crises Management Cell (NCMC)",
       "meta": {
-        "country": "Pakistan",
+        "country": "PK",
+        "country_name": "Pakistan",
         "refs": [
           "https://en.wikipedia.org/wiki/National_Crises_Management_Cell"
         ]
       },
       "related": [],
-      "uuid": "22b8b239-b54c-4f54-8ca1-b5b5a7cc351a",
+      "uuid": "f01a4d18-e5bb-4d56-a49e-b1140e423725",
       "value": "National Crises Management Cell"
     },
     {
       "description": "Palestinian Preventive Security (internal security)",
       "meta": {
-        "country": "Palestine",
+        "country": "PS",
+        "country_name": "Palestine",
         "refs": [
           "https://en.wikipedia.org/wiki/Palestinian_Preventive_Security"
         ]
       },
       "related": [],
-      "uuid": "9a11c24b-4b81-4758-8c9b-f74586d1382c",
+      "uuid": "544e1a96-24e0-4671-bd3c-18dd6dc65d35",
       "value": "Palestinian Preventive Security"
     },
     {
       "description": "Palestinian National Security Forces",
       "meta": {
-        "country": "Palestine",
+        "country": "PS",
+        "country_name": "Palestine",
         "refs": [
           "https://en.wikipedia.org/wiki/Palestinian_National_Security_Forces"
         ]
       },
       "related": [],
-      "uuid": "7d743ca6-252b-4f67-876e-ae0c3f61e85d",
+      "uuid": "a89b7aea-69dd-4675-a11e-db6be2d0a37d",
       "value": "Palestinian National Security Forces"
     },
     {
       "description": "National Police Intelligence Directorate (DNIP) – Dirección Nacional de Inteligencia Policial",
       "meta": {
-        "country": "Panama",
+        "country": "PA",
+        "country_name": "Panama",
         "refs": [
           "https://en.wikipedia.org/wiki/National_Police_Intelligence_Directorate"
         ]
       },
       "related": [],
-      "uuid": "f3db963f-5058-46aa-b9e5-89f5cdf5bcd4",
+      "uuid": "d89e367d-e822-4399-9cac-5a8c1187f696",
       "value": "National Police Intelligence Directorate"
     },
     {
       "description": "General Directorate of Analysis and Strategic Intelligence - Direccion General de Analisis e Inteligencia Estrategica (DGAIE)[23]",
       "meta": {
-        "country": "Panama",
+        "country": "PA",
+        "country_name": "Panama",
         "refs": [
           "https://en.wikipedia.org/w/index.php?title=General_Directorate_of_Analysis_and_Strategic_Intelligence_(Panama)&action=edit&redlink=1"
         ]
       },
       "related": [],
-      "uuid": "c41b60af-0118-406e-9327-3a1c53d1bc1e",
+      "uuid": "300e094d-d196-4ccd-9d6e-5a46ec5ac4b3",
       "value": "General Directorate of Analysis and Strategic Intelligence (Panama) (page does not exist)"
     },
     {
       "description": "National Intelligence and Security Service - Servicio Nacional de Inteligencia y Seguridad (SENIS)[24]",
       "meta": {
-        "country": "Panama",
+        "country": "PA",
+        "country_name": "Panama",
         "refs": [
           "https://en.wikipedia.org/w/index.php?title=National_Intelligence_and_Security_Service_(Panama)&action=edit&redlink=1"
         ]
       },
       "related": [],
-      "uuid": "76fd16a3-8191-47de-b9e4-e42337f261e0",
+      "uuid": "53512229-2259-47b4-a03f-1e99570218f2",
       "value": "National Intelligence and Security Service (Panama) (page does not exist)"
     },
     {
       "description": "National Intelligence Organization (NIO)",
       "meta": {
-        "country": "Papua New Guinea",
+        "country": "PG",
+        "country_name": "Papua New Guinea",
         "refs": [
           "https://en.wikipedia.org/wiki/National_Intelligence_Organization_(Papua_New_Guinea)"
         ]
       },
       "related": [],
-      "uuid": "e65a1730-46a8-480b-95c8-8b8fea39e8a5",
+      "uuid": "d22e0190-7303-4ee1-8698-a673f0dea732",
       "value": "National Intelligence Organization (Papua New Guinea)"
     },
     {
       "description": "National Directorate of Intelligence - Dirección Nacional de Inteligencia (DINI)",
       "meta": {
-        "country": "Peru",
+        "country": "PE",
+        "country_name": "Peru",
         "refs": [
           "https://en.wikipedia.org/wiki/National_Directorate_of_Intelligence_(Peru)"
         ]
       },
       "related": [],
-      "uuid": "9054f8a5-c498-4c21-8f8b-a225a5d17b50",
+      "uuid": "4ce3d457-1fc1-4098-8754-3c87b9f4e329",
       "value": "National Directorate of Intelligence (Peru)"
     },
     {
       "description": "National Intelligence Coordinating Agency (NICA) – Pambansang Ahensiya sa Ugnayang Intelihensiya",
       "meta": {
-        "country": "Philippines",
+        "country": "PH",
+        "country_name": "Philippines",
         "refs": [
           "https://en.wikipedia.org/wiki/National_Intelligence_Coordinating_Agency"
         ],
@@ -3475,13 +3750,14 @@
         ]
       },
       "related": [],
-      "uuid": "03bd32fe-3cef-4a87-9097-c19ed29eb8a2",
+      "uuid": "d548cead-eb63-4b93-9461-1a41ab00c7ea",
       "value": "National Intelligence Coordinating Agency"
     },
     {
       "description": "National Bureau of Investigation (NBI) – Pambansang Kawanihan ng Pagsisiyasat",
       "meta": {
-        "country": "Philippines",
+        "country": "PH",
+        "country_name": "Philippines",
         "refs": [
           "https://en.wikipedia.org/wiki/National_Bureau_of_Investigation_(Philippines)"
         ],
@@ -3492,121 +3768,131 @@
         ]
       },
       "related": [],
-      "uuid": "a7eae963-95d5-4577-8f67-c14a3c379459",
+      "uuid": "9503befa-bdf3-4918-a3cb-c7636ccd4344",
       "value": "National Bureau of Investigation (Philippines)"
     },
     {
       "description": "Foreign Intelligence Agency - Agencja Wywiadu (AW)",
       "meta": {
-        "country": "Poland",
+        "country": "PL",
+        "country_name": "Poland",
         "refs": [
           "https://en.wikipedia.org/wiki/Agencja_Wywiadu"
         ]
       },
       "related": [],
-      "uuid": "9ab55403-414c-4c81-b6e9-39ba168bb6f8",
+      "uuid": "a3df7167-6d57-4323-8e5f-4302c3b804fa",
       "value": "Agencja Wywiadu"
     },
     {
       "description": "Internal Security Agency - Agencja Bezpieczeństwa Wewnętrznego (ABW)",
       "meta": {
-        "country": "Poland",
+        "country": "PL",
+        "country_name": "Poland",
         "refs": [
           "https://en.wikipedia.org/wiki/Agencja_Bezpiecze%C5%84stwa_Wewn%C4%99trznego"
         ]
       },
       "related": [],
-      "uuid": "5cd67ab0-e91f-41e6-bf06-7d89436af147",
+      "uuid": "ca47cfdc-257d-438b-93cf-1d6aefed8534",
       "value": "Agencja Bezpieczeństwa Wewnętrznego"
     },
     {
       "description": "Military Intelligence Service - Służba Wywiadu Wojskowego (SWW)",
       "meta": {
-        "country": "Poland",
+        "country": "PL",
+        "country_name": "Poland",
         "refs": [
           "https://en.wikipedia.org/w/index.php?title=S%C5%82u%C5%BCba_Wywiadu_Wojskowego&action=edit&redlink=1"
         ]
       },
       "related": [],
-      "uuid": "2fbca365-1b18-43ea-a9bf-d5441e3c9217",
+      "uuid": "8857d86b-7995-492c-a2b5-9da649c4b21b",
       "value": "Służba Wywiadu Wojskowego (page does not exist)"
     },
     {
       "description": "Military Counter-intelligence Service - Służba Kontrwywiadu Wojskowego (SKW)",
       "meta": {
-        "country": "Poland",
+        "country": "PL",
+        "country_name": "Poland",
         "refs": [
           "https://en.wikipedia.org/wiki/S%C5%82u%C5%BCba_Kontrwywiadu_Wojskowego"
         ]
       },
       "related": [],
-      "uuid": "c3517a6c-d802-449a-a910-ba30050eb2c7",
+      "uuid": "755b502e-dff2-4c48-8482-07deb25d6dd0",
       "value": "Służba Kontrwywiadu Wojskowego"
     },
     {
       "description": "Operations and Investigations Directorate of the Border Guard Headquarters - Zarząd Operacyjno-Śledczy Komendy Głównej Straży Granicznej (KGSG, ZOŚ, KGSG)",
       "meta": {
-        "country": "Poland",
+        "country": "PL",
+        "country_name": "Poland",
         "refs": [
           "https://en.wikipedia.org/wiki/Border_Guard_(Poland)"
         ]
       },
       "related": [],
-      "uuid": "5cb6f510-302d-4cd0-bda5-627e90783ab0",
+      "uuid": "61c8e03d-f828-48cc-8511-8e476b7379ab",
       "value": "Border Guard (Poland)"
     },
     {
       "description": "Security Intelligence Service - Serviço de Informações de Segurança (SIS)",
       "meta": {
-        "country": "Portugal",
+        "country": "PT",
+        "country_name": "Portugal",
         "refs": [
           "https://en.wikipedia.org/wiki/Servi%C3%A7o_de_Informa%C3%A7%C3%B5es_de_Seguran%C3%A7a"
         ]
       },
       "related": [],
-      "uuid": "db9a8d2f-253a-478b-9e90-6d26e4222ce4",
+      "uuid": "c3d7839b-177b-4080-a8bd-cd261d647b97",
       "value": "Serviço de Informações de Segurança"
     },
     {
       "description": "Defense Strategic Intelligence Service - Serviço de Informações Estratégicas de Defesa (SIED)",
       "meta": {
-        "country": "Portugal",
+        "country": "PT",
+        "country_name": "Portugal",
         "refs": [
           "https://en.wikipedia.org/wiki/Servi%C3%A7o_de_Informa%C3%A7%C3%B5es_Estrat%C3%A9gicas_de_Defesa"
         ]
       },
       "related": [],
-      "uuid": "182f33cb-4691-47b7-a0e6-2e7d915f51fb",
+      "uuid": "2be500bb-1227-415b-8bab-20594c9c1392",
       "value": "Serviço de Informações Estratégicas de Defesa"
     },
     {
       "description": "Military Intelligence and Security Service - Centro de Informações e Segurança Militares (CISMIL)",
       "meta": {
-        "country": "Portugal",
+        "country": "PT",
+        "country_name": "Portugal",
         "refs": [
           "https://en.wikipedia.org/wiki/CISMIL"
         ]
       },
       "related": [],
-      "uuid": "4c5913e4-775a-4d3e-9fb7-68651cb72777",
+      "uuid": "f7755921-b46c-4b7e-9f6d-eec6e3abf14a",
       "value": "CISMIL"
     },
     {
       "description": "Qatar State Security",
       "meta": {
-        "country": "Qatar",
+        "country": "QA",
+        "country_name": "Qatar",
         "refs": [
           "https://en.wikipedia.org/wiki/Qatar_State_Security"
         ]
       },
       "related": [],
-      "uuid": "1cf305d8-4c57-495c-a7d3-bfe18fb6f19e",
+      "uuid": "08b51be2-f9c3-45f3-9fdd-e0b19293bafc",
       "value": "Qatar State Security"
     },
     {
       "description": "Romanian Intelligence Service (SRI) – Serviciul Român de Informații",
       "meta": {
-        "country": "Romania",
+        "country": "RO",
+        "country_name": "Romania",
         "refs": [
           "https://en.wikipedia.org/wiki/Romanian_Intelligence_Service"
         ],
@@ -3617,13 +3903,14 @@
         ]
       },
       "related": [],
-      "uuid": "13b4f6c2-b27a-4f4b-ac9f-86830eb8ba7c",
+      "uuid": "b09a920a-778c-48df-bda6-730ec68e55ed",
       "value": "Romanian Intelligence Service"
     },
     {
       "description": "Foreign Intelligence Service (SIE) – Serviciul de Informații Externe",
       "meta": {
-        "country": "Romania",
+        "country": "RO",
+        "country_name": "Romania",
         "refs": [
           "https://en.wikipedia.org/wiki/Foreign_Intelligence_Service_(Romania)"
         ],
@@ -3634,37 +3921,40 @@
         ]
       },
       "related": [],
-      "uuid": "0f3bdb82-9285-41d1-880d-0a414c8d199b",
+      "uuid": "26df2cec-5678-4d69-9a78-fd6a2425b2d1",
       "value": "Foreign Intelligence Service (Romania)"
     },
     {
       "description": "Special Telecommunication Service (STS) – Serviciul de Telecomunicații Speciale",
       "meta": {
-        "country": "Romania",
+        "country": "RO",
+        "country_name": "Romania",
         "refs": [
           "https://en.wikipedia.org/wiki/Serviciul_de_Telecomunica%C8%9Bii_Speciale"
         ]
       },
       "related": [],
-      "uuid": "135d6867-e04f-421a-b91d-d7fc7a4944cf",
+      "uuid": "d87c1aff-b4b6-44e8-989c-c2b7bf4b8298",
       "value": "Serviciul de Telecomunicații Speciale"
     },
     {
       "description": "General Directorate for Defense Intelligence (DGIA) – Direcția Generală de Informații a Apărării",
       "meta": {
-        "country": "Romania",
+        "country": "RO",
+        "country_name": "Romania",
         "refs": [
           "https://en.wikipedia.org/wiki/Direc%C8%9Bia_General%C4%83_de_Informa%C8%9Bii_a_Ap%C4%83r%C4%83rii"
         ]
       },
       "related": [],
-      "uuid": "f3308022-7963-4e95-9d18-89438d74625f",
+      "uuid": "a4519edd-bbf1-4dee-8e10-28329e17a7fb",
       "value": "Direcția Generală de Informații a Apărării"
     },
     {
       "description": "General Directorate for Internal Security (DGPI) – Direcția Generală de Protecție Internă",
       "meta": {
-        "country": "Romania",
+        "country": "RO",
+        "country_name": "Romania",
         "refs": [
           "https://en.wikipedia.org/wiki/Direc%C8%9Bia_General%C4%83_de_Informa%C8%9Bii_%C8%99i_Protec%C8%9Bie_Intern%C4%83"
         ],
@@ -3675,13 +3965,14 @@
         ]
       },
       "related": [],
-      "uuid": "7e9229a7-dc45-4e4a-80f2-253fb05390be",
+      "uuid": "2705de7c-b66f-4f5f-909d-f5eafc9c61bd",
       "value": "Direcția Generală de Informații și Protecție Internă"
     },
     {
       "description": "Federal Security Service (FSB) – Федеральная служба безопасности",
       "meta": {
-        "country": "Russia",
+        "country": "RU",
+        "country_name": "Russia",
         "refs": [
           "https://en.wikipedia.org/wiki/Federal_Security_Service_(Russia)"
         ],
@@ -3692,13 +3983,14 @@
         ]
       },
       "related": [],
-      "uuid": "a3fb49ce-69e7-4384-9ab6-341e54c1229f",
+      "uuid": "921f6da7-5341-4fee-8da5-6594de7bf3d3",
       "value": "Federal Security Service (Russia)"
     },
     {
       "description": "Main Directorate of Special Programs of the President of the Russian Federation (GUSP) – Главное управление специальных программ Президента Российской Федерации",
       "meta": {
-        "country": "Russia",
+        "country": "RU",
+        "country_name": "Russia",
         "refs": [
           "https://en.wikipedia.org/wiki/Main_Directorate_of_Special_Programs_of_the_President_of_the_Russian_Federation"
         ],
@@ -3709,13 +4001,14 @@
         ]
       },
       "related": [],
-      "uuid": "d4a29fbb-e3e4-4748-8673-960a227dcfa5",
+      "uuid": "2d17b56a-b8f1-4b83-9597-aa1843895820",
       "value": "Main Directorate of Special Programs of the President of the Russian Federation"
     },
     {
       "description": "Foreign Intelligence Service (Russia) (SVR) – Служба Внешней Разведки",
       "meta": {
-        "country": "Russia",
+        "country": "RU",
+        "country_name": "Russia",
         "refs": [
           "https://en.wikipedia.org/wiki/Foreign_Intelligence_Service_(Russia)"
         ],
@@ -3726,13 +4019,14 @@
         ]
       },
       "related": [],
-      "uuid": "be868b49-a81a-448b-a487-0408180e8d60",
+      "uuid": "8ed9ee72-dcc7-4ea9-892a-fb4e28bd22fb",
       "value": "Foreign Intelligence Service (Russia)"
     },
     {
       "description": "Main Intelligence Directorate (GRU) – Главное Разведывательное Управление",
       "meta": {
-        "country": "Russia",
+        "country": "RU",
+        "country_name": "Russia",
         "refs": [
           "https://en.wikipedia.org/wiki/GRU_(Russian_Federation)"
         ],
@@ -3743,13 +4037,14 @@
         ]
       },
       "related": [],
-      "uuid": "178069ac-736d-40fe-81be-9558c53e11ff",
+      "uuid": "8662a76c-3919-4890-86f6-1be131079e5c",
       "value": "GRU (Russian Federation)"
     },
     {
       "description": "Special Communications Service of Russia – Служба специальной связи и информации",
       "meta": {
-        "country": "Russia",
+        "country": "RU",
+        "country_name": "Russia",
         "refs": [
           "https://en.wikipedia.org/wiki/Special_Communications_Service_of_Russia"
         ],
@@ -3760,1456 +4055,1582 @@
         ]
       },
       "related": [],
-      "uuid": "c1121b7c-a1aa-40db-b860-ad88ea9262e8",
+      "uuid": "05a49f7e-6948-4355-aa2f-3dd42d3960c0",
       "value": "Special Communications Service of Russia"
     },
     {
       "description": "National Intelligence and Security Service (Rwanda)",
       "meta": {
-        "country": "Rwanda",
+        "country": "RW",
+        "country_name": "Rwanda",
         "refs": [
           "https://en.wikipedia.org/wiki/National_Intelligence_and_Security_Service_(Rwanda)"
         ]
       },
       "related": [],
-      "uuid": "658d6e9c-4b23-46ad-90e2-5fbb1705b1da",
+      "uuid": "230030aa-9b15-4b74-a74a-8e7ec8b59100",
       "value": "National Intelligence and Security Service (Rwanda)"
     },
     {
       "description": "Council of Political and Security Affairs (CPSA) – مجلس الشؤون السياسية والأمنية",
       "meta": {
-        "country": "Saudi Arabia",
+        "country": "SA",
+        "country_name": "Saudi Arabia",
         "refs": [
           "https://en.wikipedia.org/wiki/Council_of_Political_and_Security_Affairs_(Saudi_Arabia)"
         ]
       },
       "related": [],
-      "uuid": "e04212da-9407-4f8b-8422-41f4c7332bfb",
+      "uuid": "9c2f25bf-cf88-4106-843d-a35df261297b",
       "value": "Council of Political and Security Affairs (Saudi Arabia)"
     },
     {
       "description": "General Intelligence Presidency (GIP) – رئاسة الاستخبارات العامة",
       "meta": {
-        "country": "Saudi Arabia",
+        "country": "SA",
+        "country_name": "Saudi Arabia",
         "refs": [
           "https://en.wikipedia.org/wiki/Al_Mukhabarat_Al_A%27amah"
         ]
       },
       "related": [],
-      "uuid": "d2fb5679-9365-4163-bd29-adb949958e9a",
+      "uuid": "1753852a-9cbc-4d55-89cd-000d9f142117",
       "value": "Al Mukhabarat Al A'amah"
     },
     {
       "description": "Mabahith (GDI) – المباحث العامة",
       "meta": {
-        "country": "Saudi Arabia",
+        "country": "SA",
+        "country_name": "Saudi Arabia",
         "refs": [
           "https://en.wikipedia.org/wiki/Mabahith"
         ]
       },
       "related": [],
-      "uuid": "7ee5a44e-7e68-48a6-a9aa-4e53f51d8908",
+      "uuid": "bf9e83cb-303a-4a57-9d3e-cd340b3b1474",
       "value": "Mabahith"
     },
     {
       "description": "Saudi Arabia Border Guards Intelligence Directorate – استخبارات حرس الحدود",
       "meta": {
-        "country": "Saudi Arabia",
+        "country": "SA",
+        "country_name": "Saudi Arabia",
         "refs": [
           "https://en.wikipedia.org/wiki/Saudi_Arabian_Border_Guards"
         ]
       },
       "related": [],
-      "uuid": "ebc6c031-2f5c-4632-bf93-274fe2ad221d",
+      "uuid": "1873fc92-e45c-493e-81d9-4bb8ee08c4bf",
       "value": "Saudi Arabian Border Guards"
     },
     {
       "description": "The National Cyber Security Commission[25] (NCSC) – الهيئة الوطنية للأمن السيبراني",
       "meta": {
-        "country": "Saudi Arabia",
+        "country": "SA",
+        "country_name": "Saudi Arabia",
         "refs": [
           "https://en.wikipedia.org#cite_note-25"
         ]
       },
       "related": [],
-      "uuid": "f41d9583-e738-49aa-9d53-ed292081ecdc",
+      "uuid": "ec296e88-bbd8-49de-9af9-9e35f979cd01",
       "value": "The National Cyber Security Commission[25] (NCSC) – الهيئة الوطنية للأمن السيبراني"
     },
     {
       "description": "Security Intelligence Agency – Безбедносно-информативна агенција (BIA)",
       "meta": {
-        "country": "Serbia",
+        "country": "RS",
+        "country_name": "Serbia",
         "refs": [
           "https://en.wikipedia.org/wiki/Security_Intelligence_Agency"
         ]
       },
       "related": [],
-      "uuid": "4939b946-5d04-4f35-a766-c4ab67681367",
+      "uuid": "e4a12e65-0cd0-451c-b12c-b8ae929582ff",
       "value": "Security Intelligence Agency"
     },
     {
       "description": "Military Security Agency – Војнобезбедносна агенција (VBA)",
       "meta": {
-        "country": "Serbia",
+        "country": "RS",
+        "country_name": "Serbia",
         "refs": [
           "https://en.wikipedia.org/wiki/Military_Security_Agency_(Serbia)"
         ]
       },
       "related": [],
-      "uuid": "e9e97ef7-57d1-4685-9bcf-b78a238c67dc",
+      "uuid": "c88b7778-83bd-4d94-ac6c-531a1fac5c56",
       "value": "Military Security Agency (Serbia)"
     },
     {
       "description": "Military Intelligence Agency – Војнообавештајна агенција (VOA)",
       "meta": {
-        "country": "Serbia",
+        "country": "RS",
+        "country_name": "Serbia",
         "refs": [
           "https://en.wikipedia.org/wiki/Vojnoobave%C5%A1tajna_agencija"
         ]
       },
       "related": [],
-      "uuid": "e0473e43-8a6c-4905-8653-64c728a6cdf8",
+      "uuid": "5942fb05-a000-46c3-a3fb-91a532660f7a",
       "value": "Vojnoobaveštajna agencija"
     },
     {
       "description": "Security and Intelligence Division (SID)",
       "meta": {
-        "country": "Singapore",
+        "country": "SG",
+        "country_name": "Singapore",
         "refs": [
           "https://en.wikipedia.org/wiki/Security_and_Intelligence_Division"
         ]
       },
       "related": [],
-      "uuid": "81380bf5-5f76-4194-9094-2a1c79d8aca8",
+      "uuid": "553e4431-87c4-455e-b837-27fdce861d96",
       "value": "Security and Intelligence Division"
     },
     {
       "description": "Internal Security Department (ISD)",
       "meta": {
-        "country": "Singapore",
+        "country": "SG",
+        "country_name": "Singapore",
         "refs": [
           "https://en.wikipedia.org/wiki/Internal_Security_Department_(Singapore)"
         ]
       },
       "related": [],
-      "uuid": "29dd7be6-d033-496e-b0f1-d4c4d42fb36d",
+      "uuid": "d78ec6f0-36a7-46dd-9af2-7df791d338b4",
       "value": "Internal Security Department (Singapore)"
     },
     {
       "description": "Slovak Information Service - Slovenská informačná služba (SIS)",
       "meta": {
-        "country": "Slovakia",
+        "country": "SK",
+        "country_name": "Slovakia",
         "refs": [
           "https://en.wikipedia.org/wiki/Slovak_Information_Service"
         ]
       },
       "related": [],
-      "uuid": "ba573421-af20-4ca5-b702-6f5184e69927",
+      "uuid": "02459a8e-24b1-4916-91a3-920d7b2ddc07",
       "value": "Slovak Information Service"
     },
     {
       "description": "Military Intelligence - Vojenské spravodajstvo",
       "meta": {
-        "country": "Slovakia",
+        "country": "SK",
+        "country_name": "Slovakia",
         "refs": [
           "https://en.wikipedia.org/wiki/Vojensk%C3%A9_spravodajstvo"
         ]
       },
       "related": [],
-      "uuid": "ba45a06a-7edf-4fd7-b192-cd57ba8e79e7",
+      "uuid": "18d10129-51e9-431f-82e1-cf7cef30a9f4",
       "value": "Vojenské spravodajstvo"
     },
     {
       "description": "National Security Bureau - Národný bezpečnostný úrad (NBÚ)",
       "meta": {
-        "country": "Slovakia",
+        "country": "SK",
+        "country_name": "Slovakia",
         "refs": [
           "https://en.wikipedia.org/wiki/National_Security_Bureau_(Slovakia)"
         ]
       },
       "related": [],
-      "uuid": "ca1e8a29-b119-4436-8068-92e90105744c",
+      "uuid": "98ad9a5e-e86a-470c-863e-12a1319bad14",
       "value": "National Security Bureau (Slovakia)"
     },
     {
       "description": "Slovenian Intelligence and Security Agency - Slovenska Obveščevalno-Varnostna Agencija (SOVA)",
       "meta": {
-        "country": "Slovenia",
+        "country": "SI",
+        "country_name": "Slovenia",
         "refs": [
           "https://en.wikipedia.org/wiki/Slovenska_Obve%C5%A1%C4%8Devalno-Varnostna_Agencija"
         ]
       },
       "related": [],
-      "uuid": "eb1ae01f-08e2-491d-8994-f164dfe67437",
+      "uuid": "639c793b-cfdc-454f-bf47-75700d891ab1",
       "value": "Slovenska Obveščevalno-Varnostna Agencija"
     },
     {
       "description": "Intelligence and Security Service of Slovenian Ministry of Defence - Obveščevalno Varnostna Služba (OVS)[26]",
       "meta": {
-        "country": "Slovenia",
+        "country": "SI",
+        "country_name": "Slovenia",
         "refs": [
           "https://en.wikipedia.org#cite_note-26"
         ]
       },
       "related": [],
-      "uuid": "55ee1c46-2ff1-4cce-bf6c-b4cc60faed4e",
+      "uuid": "19a1a114-171f-4b19-8c84-ac03555ce097",
       "value": "Intelligence and Security Service of Slovenian Ministry of Defence - Obveščevalno Varnostna Služba (OVS)[26]"
     },
     {
       "description": "General Staff SAF – Section for intelligence matters – J2 - General štab SV – Sektor za obveščevalne zadeve – J2 (GŠSV-J2)[27]",
       "meta": {
-        "country": "Slovenia",
+        "country": "SI",
+        "country_name": "Slovenia",
         "refs": [
           "https://en.wikipedia.org#cite_note-27"
         ]
       },
       "related": [],
-      "uuid": "cdcaf38b-b01c-459e-bb64-b2b78ba024c9",
+      "uuid": "38dc9159-cdbc-4762-9bbd-212a37372ca1",
       "value": "General Staff SAF – Section for intelligence matters – J2 - General štab SV – Sektor za obveščevalne zadeve – J2 (GŠSV-J2)[27]"
     },
     {
       "description": "National Intelligence and Security Agency (NISA)",
       "meta": {
-        "country": "Somalia",
+        "country": "SO",
+        "country_name": "Somalia",
         "refs": [
           "https://en.wikipedia.org/wiki/National_Intelligence_and_Security_Agency"
         ]
       },
       "related": [],
-      "uuid": "b6ba6a80-3523-447e-8587-737ef990b014",
+      "uuid": "09522e77-f6d5-41b0-9577-24f5f5f41cfd",
       "value": "National Intelligence and Security Agency"
     },
     {
       "description": "State Security Agency (SSA)",
       "meta": {
-        "country": "South Africa",
+        "country": "ZA",
+        "country_name": "South Africa",
         "refs": [
           "https://en.wikipedia.org/wiki/State_Security_Agency_(South_Africa)"
         ]
       },
       "related": [],
-      "uuid": "b849b274-3106-447e-b170-873139c26148",
+      "uuid": "d02ee713-2513-4103-9d48-ac16b78b1841",
       "value": "State Security Agency (South Africa)"
     },
     {
       "description": "South African National Defence Force, Intelligence Division (SANDF-ID)",
       "meta": {
-        "country": "South Africa",
+        "country": "ZA",
+        "country_name": "South Africa",
         "refs": [
           "https://en.wikipedia.org/wiki/South_African_National_Defence_Force_Intelligence_Division"
         ]
       },
       "related": [],
-      "uuid": "afdc4131-b308-471a-8a3c-6a76899b248b",
+      "uuid": "97f8dc34-d5ce-4482-9a82-3b45fa6d942b",
       "value": "South African National Defence Force Intelligence Division"
     },
     {
       "description": "Crime Intelligence Division, South African Police Service",
       "meta": {
-        "country": "South Africa",
+        "country": "ZA",
+        "country_name": "South Africa",
         "refs": [
           "https://en.wikipedia.org/wiki/Crime_Intelligence_(SAPS)"
         ]
       },
       "related": [],
-      "uuid": "d48b7ca7-6099-4dea-b872-6e3e649f08bf",
+      "uuid": "f678ab52-1fd4-4b02-8ebe-557837cec8ad",
       "value": "Crime Intelligence (SAPS)"
     },
     {
       "description": "National Intelligence Service (NIS)",
       "meta": {
-        "country": "South Korea",
+        "country": "KR",
+        "country_name": "South Korea",
         "refs": [
           "https://en.wikipedia.org/wiki/National_Intelligence_Service_(South_Korea)"
         ]
       },
       "related": [],
-      "uuid": "956b381d-7f91-4260-a720-a77053453685",
+      "uuid": "8bbe44cb-02f3-4aa0-a0e5-6b254d79bdcd",
       "value": "National Intelligence Service (South Korea)"
     },
     {
       "description": "Defense Intelligence Agency (DIA)",
       "meta": {
-        "country": "South Korea",
+        "country": "KR",
+        "country_name": "South Korea",
         "refs": [
           "https://en.wikipedia.org/wiki/Defense_Intelligence_Agency_(South_Korea)"
         ]
       },
       "related": [],
-      "uuid": "187bf742-20bc-4f87-946b-16346ca806c5",
+      "uuid": "e809c6f3-bce1-4aed-9a5e-cab44470e2cd",
       "value": "Defense Intelligence Agency (South Korea)"
     },
     {
       "description": "Defence Intelligence Command [ko] (DIC)",
       "meta": {
-        "country": "South Korea",
+        "country": "KR",
+        "country_name": "South Korea",
         "refs": [
           "https://en.wikipedia.org/w/index.php?title=Defence_Intelligence_Command&action=edit&redlink=1"
         ]
       },
       "related": [],
-      "uuid": "2be51cc3-eaf3-41d7-9032-006cbb718188",
+      "uuid": "52b71853-cc32-47e6-961d-5ec82e5eb6de",
       "value": "Defence Intelligence Command (page does not exist)"
     },
     {
       "description": "Defense Security Support Command [ko] (DSSC)",
       "meta": {
-        "country": "South Korea",
+        "country": "KR",
+        "country_name": "South Korea",
         "refs": [
           "https://en.wikipedia.org/w/index.php?title=Defense_Security_Support_Command&action=edit&redlink=1"
         ]
       },
       "related": [],
-      "uuid": "9013bc4f-db7b-4e09-a5f7-aa8a10f213c3",
+      "uuid": "a8d9767e-c2ed-45cf-8281-4ab07cb6a065",
       "value": "Defense Security Support Command (page does not exist)"
     },
     {
       "description": "Department of Homeland Security (DSN)",
       "meta": {
-        "country": "Spain",
+        "country": "ES",
+        "country_name": "Spain",
         "refs": [
           "https://en.wikipedia.org/wiki/Department_of_Homeland_Security_(Spain)"
         ]
       },
       "related": [],
-      "uuid": "041360c3-d1c9-4358-92b8-e6b8a04dcf4c",
+      "uuid": "e2336a5d-3cf9-40ef-b9d6-346a99db3847",
       "value": "Department of Homeland Security (Spain)"
     },
     {
       "description": "National Cryptologic Center - (Centro Criptológico Nacional) (CCN)",
       "meta": {
-        "country": "Spain",
+        "country": "ES",
+        "country_name": "Spain",
         "refs": [
           "https://en.wikipedia.org/wiki/National_Cryptologic_Center"
         ]
       },
       "related": [],
-      "uuid": "136ce6e1-b3ff-4bb9-aa6b-1c6a39be1dd3",
+      "uuid": "ef103be3-aec7-4597-b0c4-ae5d48c5a8f2",
       "value": "National Cryptologic Center"
     },
     {
       "description": "Armed Forces Intelligence Center (CIFAS)",
       "meta": {
-        "country": "Spain",
+        "country": "ES",
+        "country_name": "Spain",
         "refs": [
           "https://en.wikipedia.org/wiki/Spanish_Armed_Forces_Intelligence_Center"
         ]
       },
       "related": [],
-      "uuid": "df5b7c0f-62d0-41c4-b533-541225ff58d2",
+      "uuid": "3919e531-f895-4987-b50e-69d303f283dd",
       "value": "Spanish Armed Forces Intelligence Center"
     },
     {
       "description": "Joint Cyberspace Command (MCCE)",
       "meta": {
-        "country": "Spain",
+        "country": "ES",
+        "country_name": "Spain",
         "refs": [
           "https://en.wikipedia.org/wiki/Joint_Cyberspace_Command"
         ]
       },
       "related": [],
-      "uuid": "96e96064-4315-4280-a0f2-3eac6acb9b07",
+      "uuid": "9cdfa49e-114b-4181-ae7e-2022ac7bf869",
       "value": "Joint Cyberspace Command"
     },
     {
       "description": "Intelligence Center for Counter-Terrorism and Organized Crime - (Centro de Inteligencia contra el Terrorismo y el Crimen Organizado) (CITCO)",
       "meta": {
-        "country": "Spain",
+        "country": "ES",
+        "country_name": "Spain",
         "refs": [
           "https://en.wikipedia.org/wiki/Centro_de_Inteligencia_contra_el_Terrorismo_y_el_Crimen_Organizado"
         ]
       },
       "related": [],
-      "uuid": "8423d9e5-bd81-4e4f-9e13-b14dbbc638bc",
+      "uuid": "768cdcf3-fb7e-4cfb-8581-1d42a5160764",
       "value": "Centro de Inteligencia contra el Terrorismo y el Crimen Organizado"
     },
     {
       "description": "Technological Research Brigade (BIT)",
       "meta": {
-        "country": "Spain",
+        "country": "ES",
+        "country_name": "Spain",
         "refs": [
           "https://en.wikipedia.org/wiki/Brigada_de_Investigaci%C3%B3n_Tecnol%C3%B3gica"
         ]
       },
       "related": [],
-      "uuid": "9f47e8bc-e400-414f-8966-6fb98897c910",
+      "uuid": "7efb1026-402d-4406-a176-b0910c75bb5e",
       "value": "Brigada de Investigación Tecnológica"
     },
     {
       "description": "General Commissariat of Information - (Comisaría General de la Información) (CGI)",
       "meta": {
-        "country": "Spain",
+        "country": "ES",
+        "country_name": "Spain",
         "refs": [
           "https://en.wikipedia.org/wiki/General_Commissariat_of_Information"
         ]
       },
       "related": [],
-      "uuid": "6c651786-1d3a-4afb-acb4-a6e527bf2e38",
+      "uuid": "b23bfab5-076f-4104-ac9f-49b1ba22e991",
       "value": "General Commissariat of Information"
     },
     {
       "description": "General Commissariat of Judiciary Police - (Comisaría General de Policía Judicial) (CGPJ)",
       "meta": {
-        "country": "Spain",
+        "country": "ES",
+        "country_name": "Spain",
         "refs": [
           "https://en.wikipedia.org/wiki/General_Commissariat_of_Judiciary_Police"
         ]
       },
       "related": [],
-      "uuid": "223f5725-f730-47bf-8420-40f51dd87bfb",
+      "uuid": "c0054365-a8db-481e-99f7-586a6fe075ea",
       "value": "General Commissariat of Judiciary Police"
     },
     {
       "description": "State Intelligence Service (Sri Lanka)",
       "meta": {
-        "country": "Sri Lanka",
+        "country": "LK",
+        "country_name": "Sri Lanka",
         "refs": [
           "https://en.wikipedia.org/wiki/State_Intelligence_Service_(Sri_Lanka)"
         ]
       },
       "related": [],
-      "uuid": "62946c22-351f-44a1-a424-838b8c5e37fc",
+      "uuid": "4016cc2c-0d14-4ba3-8671-76907751ce25",
       "value": "State Intelligence Service (Sri Lanka)"
     },
     {
       "description": "Special Branch",
       "meta": {
-        "country": "Sri Lanka"
+        "country": "LK",
+        "country_name": "Sri Lanka"
       },
       "related": [],
-      "uuid": "0df81880-e825-42f6-b17a-379f900c7944",
+      "uuid": "7ee96458-af7b-423e-8300-002a7389e934",
       "value": "Special Branch"
     },
     {
       "description": "Terrorist Investigation Division",
       "meta": {
-        "country": "Sri Lanka"
+        "country": "LK",
+        "country_name": "Sri Lanka"
       },
       "related": [],
-      "uuid": "9007198a-06ac-4153-9226-3b786df6dce7",
+      "uuid": "3599c868-4eff-4473-b2e1-3b5c63c577d7",
       "value": "Terrorist Investigation Division"
     },
     {
       "description": "Criminal Investigation Department (Sri Lanka)",
       "meta": {
-        "country": "Sri Lanka",
+        "country": "LK",
+        "country_name": "Sri Lanka",
         "refs": [
           "https://en.wikipedia.org/wiki/Criminal_Investigation_Department_(Sri_Lanka)"
         ]
       },
       "related": [],
-      "uuid": "339b89d3-76e7-44bb-8f2c-f13ea47f439e",
+      "uuid": "105445b9-647f-4452-8b26-ec9529987afb",
       "value": "Criminal Investigation Department (Sri Lanka)"
     },
     {
       "description": "Financial Crimes Investigation Division",
       "meta": {
-        "country": "Sri Lanka",
+        "country": "LK",
+        "country_name": "Sri Lanka",
         "refs": [
           "https://en.wikipedia.org/wiki/Financial_Crimes_Investigation_Division"
         ]
       },
       "related": [],
-      "uuid": "01ca0959-fcbe-419d-986d-b6df34a1996e",
+      "uuid": "6767ad18-5b80-46bf-9acb-2bf7b97f60e0",
       "value": "Financial Crimes Investigation Division"
     },
     {
       "description": "Directorate of Military Intelligence (Sri Lanka)",
       "meta": {
-        "country": "Sri Lanka",
+        "country": "LK",
+        "country_name": "Sri Lanka",
         "refs": [
           "https://en.wikipedia.org/wiki/Directorate_of_Military_Intelligence_(Sri_Lanka)"
         ]
       },
       "related": [],
-      "uuid": "5e5c1525-cb5a-45eb-8089-697cf53a6556",
+      "uuid": "d3e7eb77-6d1e-4a52-a962-12e41a803b34",
       "value": "Directorate of Military Intelligence (Sri Lanka)"
     },
     {
       "description": "Military Intelligence Corps (Sri Lanka)",
       "meta": {
-        "country": "Sri Lanka",
+        "country": "LK",
+        "country_name": "Sri Lanka",
         "refs": [
           "https://en.wikipedia.org/wiki/Military_Intelligence_Corps_(Sri_Lanka)"
         ]
       },
       "related": [],
-      "uuid": "f8ae9a15-bd3d-47fa-b0a5-aeb5d0b12c3a",
+      "uuid": "4f18ad06-0b18-4526-95ac-2b8aef5b19e9",
       "value": "Military Intelligence Corps (Sri Lanka)"
     },
     {
       "description": "Department of Naval Intelligence",
       "meta": {
-        "country": "Sri Lanka"
+        "country": "LK",
+        "country_name": "Sri Lanka"
       },
       "related": [],
-      "uuid": "389d4a8b-6e76-48c0-a021-28f626faabde",
+      "uuid": "abf7e5ad-ea59-4214-9d40-3621f78a252e",
       "value": "Department of Naval Intelligence"
     },
     {
       "description": "Directorate of Air Intelligence",
       "meta": {
-        "country": "Sri Lanka"
+        "country": "LK",
+        "country_name": "Sri Lanka"
       },
       "related": [],
-      "uuid": "6eb716f8-4709-4271-ab48-c53827e4ccfe",
+      "uuid": "94afcb8b-293f-43d2-af0a-69dc6db4cb2f",
       "value": "Directorate of Air Intelligence"
     },
     {
       "description": "Financial Intelligence Unit (Sri Lanka),",
       "meta": {
-        "country": "Sri Lanka"
+        "country": "LK",
+        "country_name": "Sri Lanka"
       },
       "related": [],
-      "uuid": "3dd5de58-802f-4b91-96d8-5bf31a22607b",
+      "uuid": "733dd5d2-0d9b-4976-bf17-f3d65cdee784",
       "value": "Financial Intelligence Unit (Sri Lanka),"
     },
     {
       "description": "General Intelligence Service",
       "meta": {
-        "country": "Sudan",
+        "country": "SD",
+        "country_name": "Sudan",
         "refs": [
           "https://en.wikipedia.org/wiki/General_Intelligence_Service_(Sudan)"
         ]
       },
       "related": [],
-      "uuid": "54d50d4c-3f48-4c0a-b35d-d1bc40d00dbd",
+      "uuid": "1403e5c2-0732-49af-bdf8-0b1d6351eddd",
       "value": "General Intelligence Service (Sudan)"
     },
     {
       "description": "Office for Special Acquisition – Kontoret för särskild inhämtning (KSI)",
       "meta": {
-        "country": "Sweden",
+        "country": "SE",
+        "country_name": "Sweden",
         "refs": [
           "https://en.wikipedia.org/wiki/Kontoret_f%C3%B6r_s%C3%A4rskild_inh%C3%A4mtning"
         ]
       },
       "related": [],
-      "uuid": "556446e9-b995-4e14-bcb7-d4a5133f4e3f",
+      "uuid": "f27d73bc-69ba-49f2-a289-8caf5ff60b5b",
       "value": "Kontoret för särskild inhämtning"
     },
     {
       "description": "National Defence Radio Establishment – Försvarets Radioanstalt (FRA)",
       "meta": {
-        "country": "Sweden",
+        "country": "SE",
+        "country_name": "Sweden",
         "refs": [
           "https://en.wikipedia.org/wiki/National_Defence_Radio_Establishment"
         ]
       },
       "related": [],
-      "uuid": "ee23028d-793b-409f-874c-47d0a2fc7d0c",
+      "uuid": "642dee04-d14a-4118-ba8f-84234562da9e",
       "value": "National Defence Radio Establishment"
     },
     {
       "description": "Swedish Security Service – Säkerhetspolisen (Säpo)",
       "meta": {
-        "country": "Sweden",
+        "country": "SE",
+        "country_name": "Sweden",
         "refs": [
           "https://en.wikipedia.org/wiki/Swedish_Security_Service"
         ]
       },
       "related": [],
-      "uuid": "1eee3d21-7868-43b6-b91b-0b49de98f634",
+      "uuid": "536683a5-1503-4400-9f62-21fac4d2c621",
       "value": "Swedish Security Service"
     },
     {
       "description": "Federal Intelligence Service - Nachrichtendienst des Bundes (NDB)",
       "meta": {
-        "country": "Switzerland",
+        "country": "CH",
+        "country_name": "Switzerland",
         "refs": [
           "https://en.wikipedia.org/wiki/Swiss_intelligence_agencies"
         ]
       },
       "related": [],
-      "uuid": "31d8feb7-05b6-49ec-a983-27a7747be046",
+      "uuid": "7fb5de6e-0f7b-4b31-a20d-29fd280f9644",
       "value": "Swiss intelligence agencies"
     },
     {
       "description": "Military Intelligence Service - Militärischer Nachrichtendienst (MND)",
       "meta": {
-        "country": "Switzerland",
+        "country": "CH",
+        "country_name": "Switzerland",
         "refs": [
           "https://en.wikipedia.org/wiki/Milit%C3%A4rischer_Nachrichtendienst"
         ]
       },
       "related": [],
-      "uuid": "5de0cc7d-9a5f-47cc-a55e-6b43a8093c33",
+      "uuid": "86861d82-a6d3-41b4-b838-bd150a8e64bb",
       "value": "Militärischer Nachrichtendienst"
     },
     {
       "description": "Air Force Intelligence Directorate",
       "meta": {
-        "country": "Syria",
+        "country": "SY",
+        "country_name": "Syria",
         "refs": [
           "https://en.wikipedia.org/wiki/Air_Force_Intelligence_Directorate"
         ]
       },
       "related": [],
-      "uuid": "a99ea7f7-9ba8-42f9-a65f-f94cd92493c4",
+      "uuid": "9950663f-5859-47e3-b9bf-18cc8e1eef27",
       "value": "Air Force Intelligence Directorate"
     },
     {
       "description": "General Intelligence Directorate",
       "meta": {
-        "country": "Syria",
+        "country": "SY",
+        "country_name": "Syria",
         "refs": [
           "https://en.wikipedia.org/wiki/General_Intelligence_Directorate_(Syria)"
         ]
       },
       "related": [],
-      "uuid": "2e69d2aa-0826-4f03-b287-87c5768d0145",
+      "uuid": "e2d6c9ef-ee5c-4c19-935a-5c5f674e0d76",
       "value": "General Intelligence Directorate (Syria)"
     },
     {
       "description": "Political Security Directorate",
       "meta": {
-        "country": "Syria",
+        "country": "SY",
+        "country_name": "Syria",
         "refs": [
           "https://en.wikipedia.org/wiki/Political_Security_Directorate"
         ]
       },
       "related": [],
-      "uuid": "6bf2a7e9-b60c-4686-bb99-d84bac945777",
+      "uuid": "029ef95f-7b7b-4605-94a5-a0b0e903ae34",
       "value": "Political Security Directorate"
     },
     {
       "description": "Military Intelligence Directorate",
       "meta": {
-        "country": "Syria",
+        "country": "SY",
+        "country_name": "Syria",
         "refs": [
           "https://en.wikipedia.org/wiki/Military_Intelligence_Directorate_(Syria)"
         ]
       },
       "related": [],
-      "uuid": "e179e460-1ea0-4484-9191-10b4d4a5aab4",
+      "uuid": "30d315dc-3758-4ce7-a22e-c7a0415c42d7",
       "value": "Military Intelligence Directorate (Syria)"
     },
     {
       "description": "National Security Bureau (NSB)",
       "meta": {
-        "country": "Taiwan",
+        "country": "TW",
+        "country_name": "Taiwan",
         "refs": [
           "https://en.wikipedia.org/wiki/National_Security_Bureau_(Republic_of_China)"
         ]
       },
       "related": [],
-      "uuid": "5966e91c-d583-4739-896e-5365b32e1fa3",
+      "uuid": "72ae3e8d-da55-4705-abb7-71c23615cf7e",
       "value": "National Security Bureau (Republic of China)"
     },
     {
       "description": "Investigation Bureau (MJIB)",
       "meta": {
-        "country": "Taiwan",
+        "country": "TW",
+        "country_name": "Taiwan",
         "refs": [
           "https://en.wikipedia.org/wiki/Bureau_of_Investigation_(Taiwan)"
         ]
       },
       "related": [],
-      "uuid": "c2bfc24e-5d55-4984-b859-c7266720a95a",
+      "uuid": "83bc5db7-672b-4d52-808e-ac100807b9ca",
       "value": "Bureau of Investigation (Taiwan)"
     },
     {
       "description": "National Police Agency (NPA)",
       "meta": {
-        "country": "Taiwan",
+        "country": "TW",
+        "country_name": "Taiwan",
         "refs": [
           "https://en.wikipedia.org/wiki/National_Police_Agency_of_the_ROC_(Taiwan)"
         ]
       },
       "related": [],
-      "uuid": "4ec8c38f-466a-4066-a43a-fcf06b5e60f3",
+      "uuid": "c7633fe9-2a56-4d0a-8896-1f038657e5c2",
       "value": "National Police Agency of the ROC (Taiwan)"
     },
     {
       "description": "Military Police Command (ROCMP)",
       "meta": {
-        "country": "Taiwan",
+        "country": "TW",
+        "country_name": "Taiwan",
         "refs": [
           "https://en.wikipedia.org/wiki/Republic_of_China_Military_Police"
         ]
       },
       "related": [],
-      "uuid": "3434e276-b3fe-4c0f-aa07-8abb303e0cdb",
+      "uuid": "e4981478-7753-46d3-8487-f9c1ba34f4dd",
       "value": "Republic of China Military Police"
     },
     {
       "description": "Military Intelligence Bureau (MIB)",
       "meta": {
-        "country": "Taiwan",
+        "country": "TW",
+        "country_name": "Taiwan",
         "refs": [
           "https://en.wikipedia.org/wiki/Bureau_of_Military_Intelligence"
         ]
       },
       "related": [],
-      "uuid": "f7e97dda-525d-446a-a064-7a67d7fbfbce",
+      "uuid": "979f3d9c-b646-4cd5-854a-6aa958392d47",
       "value": "Bureau of Military Intelligence"
     },
     {
       "description": "State Committee for National Security (SCNS) – Кумитаи давлатии амнияти милли (КДАМ)/Государственный комитет национальной безопасности (ГКНБ)",
       "meta": {
-        "country": "Tajikistan",
+        "country": "TJ",
+        "country_name": "Tajikistan",
         "refs": [
           "https://en.wikipedia.org/wiki/State_Committee_for_National_Security_(Tajikistan)"
         ]
       },
       "related": [],
-      "uuid": "d01f7dcd-bd76-4921-a8ae-f63e9e39f7cf",
+      "uuid": "60b60e71-3f54-4009-a9d0-ce65c982f77a",
       "value": "State Committee for National Security (Tajikistan)"
     },
     {
       "description": "Tanzania Intelligence and Security Service (TISS)",
       "meta": {
-        "country": "Tanzania",
+        "country": "TZ",
+        "country_name": "Tanzania",
         "refs": [
           "https://en.wikipedia.org/wiki/Tanzania_Intelligence_and_Security_Service"
         ]
       },
       "related": [],
-      "uuid": "e82480cc-a869-4eab-ab35-49b4c35ecfd9",
+      "uuid": "0930f0e2-6d70-4579-bb11-7226972b3512",
       "value": "Tanzania Intelligence and Security Service"
     },
     {
       "description": "News Division",
       "meta": {
-        "country": "Thailand"
+        "country": "TH",
+        "country_name": "Thailand"
       },
       "related": [],
-      "uuid": "3db541cb-ff07-479d-a3a7-74b4142660df",
+      "uuid": "5a42034e-60e2-461b-973a-4de04df64f1e",
       "value": "News Division"
     },
     {
       "description": "Internal Security Affairs Bureau (ISAB)",
       "meta": {
-        "country": "Thailand"
+        "country": "TH",
+        "country_name": "Thailand"
       },
       "related": [],
-      "uuid": "7fa11560-8c61-4938-b600-d578f61125ae",
+      "uuid": "e74d6786-fe13-4b31-928e-539350d45c9f",
       "value": "Internal Security Affairs Bureau (ISAB)"
     },
     {
       "description": "Bureau of Intelligence (BI)",
       "meta": {
-        "country": "Thailand"
+        "country": "TH",
+        "country_name": "Thailand"
       },
       "related": [],
-      "uuid": "bb431855-9c47-4950-99b9-167f5cf75829",
+      "uuid": "89d6387c-4eaf-4e53-8546-9057f5a9539a",
       "value": "Bureau of Intelligence (BI)"
     },
     {
       "description": "Intelligence Bureau (IB)",
       "meta": {
-        "country": "Thailand"
+        "country": "TH",
+        "country_name": "Thailand"
       },
       "related": [],
-      "uuid": "9c0029b0-cccd-4269-850a-96276b7b13dd",
+      "uuid": "ec0051fe-3bc3-47ce-8621-a8af125b951c",
       "value": "Intelligence Bureau (IB)"
     },
     {
       "description": "Armed Forces Security Center (AFSC)",
       "meta": {
-        "country": "Thailand"
+        "country": "TH",
+        "country_name": "Thailand"
       },
       "related": [],
-      "uuid": "2d8f18b5-b655-4211-a2dc-b20960b54ff5",
+      "uuid": "b8f2860a-b113-460f-bf88-06a57458b75f",
       "value": "Armed Forces Security Center (AFSC)"
     },
     {
       "description": "Army Military Intelligence Command (AMIC)",
       "meta": {
-        "country": "Thailand"
+        "country": "TH",
+        "country_name": "Thailand"
       },
       "related": [],
-      "uuid": "433d7e16-c4be-498a-a01f-b9545d38c227",
+      "uuid": "371a1ca0-bdf2-40d9-9657-8127e85deb99",
       "value": "Army Military Intelligence Command (AMIC)"
     },
     {
       "description": "Department of Border Affair (DBA)",
       "meta": {
-        "country": "Thailand"
+        "country": "TH",
+        "country_name": "Thailand"
       },
       "related": [],
-      "uuid": "554971f7-4c14-4ebd-92ef-cb53e335c40c",
+      "uuid": "9ee8aa2e-6cc3-4d4f-be8f-5e70e5756527",
       "value": "Department of Border Affair (DBA)"
     },
     {
       "description": "Directorate of Joint Intelligence (DJI)",
       "meta": {
-        "country": "Thailand"
+        "country": "TH",
+        "country_name": "Thailand"
       },
       "related": [],
-      "uuid": "be35fdfa-d662-4a5f-9808-21521db23d0e",
+      "uuid": "57da211a-7354-4846-a6dc-e3b282ee1a34",
       "value": "Directorate of Joint Intelligence (DJI)"
     },
     {
       "description": "Directorate of Intelligence Royal Thai Army (DINTRTA)",
       "meta": {
-        "country": "Thailand"
+        "country": "TH",
+        "country_name": "Thailand"
       },
       "related": [],
-      "uuid": "a4adbb07-95dc-42ad-8d74-fedf084698f9",
+      "uuid": "f979ace4-8da6-4822-aabe-33005b2724ab",
       "value": "Directorate of Intelligence Royal Thai Army (DINTRTA)"
     },
     {
       "description": "Directorate of Intelligence, RTAF (INTELLRTAF)",
       "meta": {
-        "country": "Thailand"
+        "country": "TH",
+        "country_name": "Thailand"
       },
       "related": [],
-      "uuid": "d6e8c1c7-b84f-4491-8f0f-583cb0f5db7b",
+      "uuid": "8670c74f-a357-42e3-a991-9f70754aa256",
       "value": "Directorate of Intelligence, RTAF (INTELLRTAF)"
     },
     {
       "description": "Naval Intelligence Department (NID)",
       "meta": {
-        "country": "Thailand"
+        "country": "TH",
+        "country_name": "Thailand"
       },
       "related": [],
-      "uuid": "b5d49acd-5c8d-4c97-ace5-5ee602420837",
+      "uuid": "c078b9ae-ab54-43c8-a92a-5ef22d72c066",
       "value": "Naval Intelligence Department (NID)"
     },
     {
       "description": "Financial Intelligence Division (FID)",
       "meta": {
-        "country": "Thailand"
+        "country": "TH",
+        "country_name": "Thailand"
       },
       "related": [],
-      "uuid": "9ec610f6-5b5f-4dd2-9d7f-8348d7da6e93",
+      "uuid": "2bcc3285-db99-4d2e-ab1c-8f5a60e21f16",
       "value": "Financial Intelligence Division (FID)"
     },
     {
       "description": "Internal Security Operations Command (ISOC)",
       "meta": {
-        "country": "Thailand",
+        "country": "TH",
+        "country_name": "Thailand",
         "refs": [
           "https://en.wikipedia.org/wiki/Internal_Security_Operations_Command"
         ]
       },
       "related": [],
-      "uuid": "778ba294-8aed-4262-a826-6e287da1d13b",
+      "uuid": "1f424daf-cce0-4c54-b4cf-9f9339f58d47",
       "value": "Internal Security Operations Command"
     },
     {
       "description": "National Intelligence Agency (NIA)",
       "meta": {
-        "country": "Thailand",
+        "country": "TH",
+        "country_name": "Thailand",
         "refs": [
           "https://en.wikipedia.org/wiki/National_Intelligence_Agency_(Thailand)"
         ]
       },
       "related": [],
-      "uuid": "a70b0f6e-9f8b-475c-93b6-19e40bce2654",
+      "uuid": "90b914c3-c6b3-44a7-af72-8c6300baac49",
       "value": "National Intelligence Agency (Thailand)"
     },
     {
       "description": "National Intelligence Cooperating Center (NICC)",
       "meta": {
-        "country": "Thailand"
+        "country": "TH",
+        "country_name": "Thailand"
       },
       "related": [],
-      "uuid": "49be6bb3-09c3-45a2-9d9a-49f1ea0c3442",
+      "uuid": "2b234f28-f59c-434b-84ab-5c4fd488d5f9",
       "value": "National Intelligence Cooperating Center (NICC)"
     },
     {
       "description": "Drug Intelligence Division (DID)",
       "meta": {
-        "country": "Thailand"
+        "country": "TH",
+        "country_name": "Thailand"
       },
       "related": [],
-      "uuid": "d9f0e6ae-f540-4334-859c-31d7c4e6df42",
+      "uuid": "8fbb4b33-67cd-4c4f-9d1e-724981a83123",
       "value": "Drug Intelligence Division (DID)"
     },
     {
       "description": "Special Branch Bureau (SBB)",
       "meta": {
-        "country": "Thailand",
+        "country": "TH",
+        "country_name": "Thailand",
         "refs": [
           "https://en.wikipedia.org/wiki/Special_Branch_Bureau"
         ]
       },
       "related": [],
-      "uuid": "182636f2-4d0b-44fb-8294-73e55a35207e",
+      "uuid": "611d997a-64ef-4b4e-a744-e9e70354dcc5",
       "value": "Special Branch Bureau"
     },
     {
       "description": "Strategic Services Agency (SSA)[28]",
       "meta": {
-        "country": "Trinidad & Tobago",
+        "country": "TT",
+        "country_name": "Trinidad & Tobago",
         "refs": [
           "https://en.wikipedia.org#cite_note-28"
         ]
       },
       "related": [],
-      "uuid": "1c030287-a3e2-4443-b268-748cf8de69f8",
+      "uuid": "032afb04-9adb-42b4-916e-480caddb18e1",
       "value": "Strategic Services Agency (SSA)[28]"
     },
     {
       "description": "Organised Crime and Intelligence Unit[30]",
       "meta": {
-        "country": "Trinidad & Tobago",
+        "country": "TT",
+        "country_name": "Trinidad & Tobago",
         "refs": [
           "https://en.wikipedia.org#cite_note-30"
         ]
       },
       "related": [],
-      "uuid": "b5fbd48c-8d63-4a6b-bc8e-65aa478704a7",
+      "uuid": "b9b9eee3-caea-40a7-87c3-dafc90109ccf",
       "value": "Organised Crime and Intelligence Unit[30]"
     },
     {
       "description": "Financial Intelligence Unit Trinidad and Tobago (FIUTT)[31]",
       "meta": {
-        "country": "Trinidad & Tobago",
+        "country": "TT",
+        "country_name": "Trinidad & Tobago",
         "refs": [
           "https://en.wikipedia.org#cite_note-31"
         ]
       },
       "related": [],
-      "uuid": "7eba0b26-56f9-4123-8778-f18604e61878",
+      "uuid": "9889c0d4-1031-49c1-acef-f936533cb5e6",
       "value": "Financial Intelligence Unit Trinidad and Tobago (FIUTT)[31]"
     },
     {
       "description": "National Intelligence Organization (MİT)",
       "meta": {
-        "country": "Turkey",
+        "country": "TR",
+        "country_name": "Turkey",
         "refs": [
           "https://en.wikipedia.org/wiki/National_Intelligence_Organization_(Turkey)"
         ]
       },
       "related": [],
-      "uuid": "775b31ed-c334-4aa5-8685-339fd06b4ec5",
+      "uuid": "a49d9001-8a8e-43da-89a5-4b92c2535b94",
       "value": "National Intelligence Organization (Turkey)"
     },
     {
       "description": "Department of Smuggling, Intelligence, Operations and Information Collection (intelligence coordination)",
       "meta": {
-        "country": "Turkey",
+        "country": "TR",
+        "country_name": "Turkey",
         "refs": [
           "https://en.wikipedia.org/w/index.php?title=Department_of_Smuggling,_Intelligence,_Operations_and_Information_Collection&action=edit&redlink=1"
         ]
       },
       "related": [],
-      "uuid": "05981749-7ad6-45f6-91d2-aa2148add9f0",
+      "uuid": "16beb23f-1219-4a64-9922-dd11ba216086",
       "value": "Department of Smuggling, Intelligence, Operations and Information Collection (page does not exist)"
     },
     {
       "description": "Emniyet Genel Müdürlüğü İstihbarat Başkanlığı (Intelligence Directorate)",
       "meta": {
-        "country": "Turkey",
+        "country": "TR",
+        "country_name": "Turkey",
         "refs": [
           "https://en.wikipedia.org/w/index.php?title=Emniyet_Genel_M%C3%BCd%C3%BCrl%C3%BC%C4%9F%C3%BC_%C4%B0stihbarat_Ba%C5%9Fkanl%C4%B1%C4%9F%C4%B1&action=edit&redlink=1"
         ]
       },
       "related": [],
-      "uuid": "2cd64303-a775-480d-a6e2-fe4d8f17ecf8",
+      "uuid": "aa97aa00-15a3-4639-a5a2-e567edbfee0a",
       "value": "Emniyet Genel Müdürlüğü İstihbarat Başkanlığı (page does not exist)"
     },
     {
       "description": "Terörle Mücadele Dairesi Başkanlığı(TEM) (Anti-Terrorism Department)",
       "meta": {
-        "country": "Turkey",
+        "country": "TR",
+        "country_name": "Turkey",
         "refs": [
           "https://en.wikipedia.org/w/index.php?title=Ter%C3%B6rle_M%C3%BCcadele_Dairesi_Ba%C5%9Fkanl%C4%B1%C4%9F%C4%B1(TEM)&action=edit&redlink=1"
         ]
       },
       "related": [],
-      "uuid": "49854ddf-a0e6-47ae-bead-874ceb04594b",
+      "uuid": "1b24e7f0-dfd7-48ce-bbca-7999fd8ead21",
       "value": "Terörle Mücadele Dairesi Başkanlığı(TEM) (page does not exist)"
     },
     {
       "description": "Gendarmerie Intelligence Directorate (law enforcement)",
       "meta": {
-        "country": "Turkey",
+        "country": "TR",
+        "country_name": "Turkey",
         "refs": [
           "https://en.wikipedia.org/w/index.php?title=Gendarmerie_Intelligence_Directorate&action=edit&redlink=1"
         ]
       },
       "related": [],
-      "uuid": "5a2b86a5-6060-4f89-a79d-1a404ea6f18c",
+      "uuid": "653aa77b-efc8-49ae-9b54-8534d883cea0",
       "value": "Gendarmerie Intelligence Directorate (page does not exist)"
     },
     {
       "description": "Coast Guard Intelligence Directorate (law enforcement)",
       "meta": {
-        "country": "Turkey",
+        "country": "TR",
+        "country_name": "Turkey",
         "refs": [
           "https://en.wikipedia.org/w/index.php?title=Coast_Guard_Intelligence_Directorate&action=edit&redlink=1"
         ]
       },
       "related": [],
-      "uuid": "0a1024d5-2608-49cc-9591-30ec349049f0",
+      "uuid": "a3db0bff-a040-45b5-aa38-682a453c09cb",
       "value": "Coast Guard Intelligence Directorate (page does not exist)"
     },
     {
       "description": "General Staff Intelligence Directorate (military intelligence)",
       "meta": {
-        "country": "Turkey",
+        "country": "TR",
+        "country_name": "Turkey",
         "refs": [
           "https://en.wikipedia.org/w/index.php?title=General_Staff_Intelligence_Directorate&action=edit&redlink=1"
         ]
       },
       "related": [],
-      "uuid": "ea07901f-639c-4de7-a6e9-6b1af74f96cb",
+      "uuid": "645b147c-2112-4fe0-8130-aa48c5629120",
       "value": "General Staff Intelligence Directorate (page does not exist)"
     },
     {
       "description": "Army Intelligence Department (military intelligence)",
       "meta": {
-        "country": "Turkey",
+        "country": "TR",
+        "country_name": "Turkey",
         "refs": [
           "https://en.wikipedia.org/w/index.php?title=Army_Intelligence_Department&action=edit&redlink=1"
         ]
       },
       "related": [],
-      "uuid": "23e12122-6a78-4566-b557-fca76b1922f4",
+      "uuid": "7042c5e0-4997-4231-8b29-1d52f188e4d7",
       "value": "Army Intelligence Department (page does not exist)"
     },
     {
       "description": "navy Intelligence Department (military intelligence)",
       "meta": {
-        "country": "Turkey",
+        "country": "TR",
+        "country_name": "Turkey",
         "refs": [
           "https://en.wikipedia.org/w/index.php?title=Navy_Intelligence_Department&action=edit&redlink=1"
         ]
       },
       "related": [],
-      "uuid": "f2b6b94e-9f77-45a0-831a-63d4229a457a",
+      "uuid": "61fee767-1d18-45ac-9f26-6b66504301e5",
       "value": "Navy Intelligence Department (page does not exist)"
     },
     {
       "description": "Air Force Intelligence Department (military intelligence)",
       "meta": {
-        "country": "Turkey",
+        "country": "TR",
+        "country_name": "Turkey",
         "refs": [
           "https://en.wikipedia.org/w/index.php?title=Air_Force_Intelligence_Department&action=edit&redlink=1"
         ]
       },
       "related": [],
-      "uuid": "b8f2d860-5c8b-46c1-83dd-6a34629d8949",
+      "uuid": "2000ac29-5f1d-4891-b703-8e7d562224e0",
       "value": "Air Force Intelligence Department (page does not exist)"
     },
     {
       "description": "Ministry for National Security (MNS)",
       "meta": {
-        "country": "Turkmenistan",
+        "country": "TM",
+        "country_name": "Turkmenistan",
         "refs": [
           "https://en.wikipedia.org/wiki/Ministry_for_National_Security_(Turkmenistan)"
         ]
       },
       "related": [],
-      "uuid": "c9f92db3-d7b7-4730-9356-58417a568b0e",
+      "uuid": "9890e433-5244-4d76-8976-072848ebd3e2",
       "value": "Ministry for National Security (Turkmenistan)"
     },
     {
       "description": "Central Intelligence Directorate – Holovne Upravlinnya Rozvidky (HUR)",
       "meta": {
-        "country": "Ukraine",
+        "country": "UA",
+        "country_name": "Ukraine",
         "refs": [
           "https://en.wikipedia.org/wiki/Chief_directorate_of_intelligence_of_the_Ministry_of_Defence_of_Ukraine"
         ]
       },
       "related": [],
-      "uuid": "507d3b0f-c0f8-4d59-b777-a8d7ff4a75cb",
+      "uuid": "e1892686-31e8-4f9d-909b-2e156cd79414",
       "value": "Chief directorate of intelligence of the Ministry of Defence of Ukraine"
     },
     {
       "description": "Foreign Intelligence Service of Ukraine – Sluzhba Zovnishnioyi Rozvidky Ukrayiny (SZR or SZRU)",
       "meta": {
-        "country": "Ukraine",
+        "country": "UA",
+        "country_name": "Ukraine",
         "refs": [
           "https://en.wikipedia.org/wiki/Foreign_Intelligence_Service_of_Ukraine"
         ]
       },
       "related": [],
-      "uuid": "293aed74-1a66-45c5-a22e-7ca0e01ebea8",
+      "uuid": "1758087e-b928-41af-8786-fc404ffb7eff",
       "value": "Foreign Intelligence Service of Ukraine"
     },
     {
       "description": "State Bureau of Investigation – Derzhavne Biuro Rozsliduvan (DBR)",
       "meta": {
-        "country": "Ukraine",
+        "country": "UA",
+        "country_name": "Ukraine",
         "refs": [
           "https://en.wikipedia.org/wiki/State_Bureau_of_Investigation_(Ukraine)"
         ]
       },
       "related": [],
-      "uuid": "0a74c7eb-62e1-4238-8d82-eb0496dbce35",
+      "uuid": "5608edbd-eaea-4b7b-86ae-7fa1c904bc63",
       "value": "State Bureau of Investigation (Ukraine)"
     },
     {
       "description": "Security Service of Ukraine – Sluzhba Bezpeky Ukrayiny (SBU)",
       "meta": {
-        "country": "Ukraine",
+        "country": "UA",
+        "country_name": "Ukraine",
         "refs": [
           "https://en.wikipedia.org/wiki/Security_Service_of_Ukraine"
         ]
       },
       "related": [],
-      "uuid": "4740406c-2740-4378-8b02-71b68cffb524",
+      "uuid": "14bd0b5f-1165-44cd-947c-9b87572128c4",
       "value": "Security Service of Ukraine"
     },
     {
       "description": "Signals Intelligence Agency (SIA)",
       "meta": {
-        "country": "United Arab Emirates",
+        "country": "AE",
+        "country_name": "United Arab Emirates",
         "refs": [
           "https://en.wikipedia.org/wiki/Signals_Intelligence_Agency"
         ]
       },
       "related": [],
-      "uuid": "5dcbe12a-c642-41cf-a202-03924dd104fa",
+      "uuid": "c50b56b6-1818-4980-b41f-35461bab15de",
       "value": "Signals Intelligence Agency"
     },
     {
       "description": "Joint Intelligence Organisation (JIO)[32] – Joint intelligence analysis.",
       "meta": {
-        "country": "United Kingdom",
+        "country": "GB",
+        "country_name": "United Kingdom",
         "refs": [
           "https://en.wikipedia.org/wiki/Joint_Intelligence_Organisation_(United_Kingdom)"
         ]
       },
       "related": [],
-      "uuid": "bdb3dfbb-b9f1-4de1-a02f-7508f26d5732",
+      "uuid": "bf9bf6ac-0d45-4540-b630-474d3487fb77",
       "value": "Joint Intelligence Organisation (United Kingdom)"
     },
     {
       "description": "Security Service/MI5[33] – Domestic counter terrorism and counter espionage intelligence gathering and analysis.",
       "meta": {
-        "country": "United Kingdom",
+        "country": "GB",
+        "country_name": "United Kingdom",
         "refs": [
           "https://en.wikipedia.org/wiki/MI5"
         ]
       },
       "related": [],
-      "uuid": "dc15daf1-094b-4518-95d7-03e12f3cc943",
+      "uuid": "75d83b53-acf6-48f7-bb80-549f53d90a40",
       "value": "MI5"
     },
     {
       "description": "Office for Security and Counter-Terrorism (OSCT) – Counter terrorism and protecting critical national infrastructure.",
       "meta": {
-        "country": "United Kingdom",
+        "country": "GB",
+        "country_name": "United Kingdom",
         "refs": [
           "https://en.wikipedia.org/wiki/Office_for_Security_and_Counter-Terrorism"
         ]
       },
       "related": [],
-      "uuid": "1c889b6d-f80c-4a3b-be5f-d1e883eb3aba",
+      "uuid": "4850870b-fb48-4ba4-9697-39688874a61b",
       "value": "Office for Security and Counter-Terrorism"
     },
     {
       "description": "National Domestic Extremism and Disorder Intelligence Unit (NDEDIU)[34] – Domestic counter extremism and public disorder intelligence gathering and analysis.",
       "meta": {
-        "country": "United Kingdom",
+        "country": "GB",
+        "country_name": "United Kingdom",
         "refs": [
           "https://en.wikipedia.org/wiki/National_Domestic_Extremism_and_Disorder_Intelligence_Unit"
         ]
       },
       "related": [],
-      "uuid": "e8b27508-7540-442f-98d3-d68966d117d1",
+      "uuid": "48512ff9-837f-4103-8fd8-1a05c76becde",
       "value": "National Domestic Extremism and Disorder Intelligence Unit"
     },
     {
       "description": "National Ballistics Intelligence Service (NBIS)[35] – Illegal firearms intelligence analysis.",
       "meta": {
-        "country": "United Kingdom",
+        "country": "GB",
+        "country_name": "United Kingdom",
         "refs": [
           "https://en.wikipedia.org/wiki/National_Ballistics_Intelligence_Service"
         ]
       },
       "related": [],
-      "uuid": "2bcd1e13-a1c1-4b12-82a7-5dfe8fcdfef0",
+      "uuid": "2db8d41f-6d57-4b08-ba70-13e18c54d965",
       "value": "National Ballistics Intelligence Service"
     },
     {
       "description": "National Fraud Intelligence Bureau (NFIB)[36] – Economic crime intelligence gathering and analysis.",
       "meta": {
-        "country": "United Kingdom",
+        "country": "GB",
+        "country_name": "United Kingdom",
         "refs": [
           "https://en.wikipedia.org/wiki/National_Fraud_Intelligence_Bureau"
         ]
       },
       "related": [],
-      "uuid": "650ff541-7c93-4805-9922-d551a08aab7a",
+      "uuid": "60703abe-743a-4f15-90d2-53df5c517549",
       "value": "National Fraud Intelligence Bureau"
     },
     {
       "description": "Secret Intelligence Service (SIS)/MI6[37] – Foreign intelligence gathering and analysis.",
       "meta": {
-        "country": "United Kingdom",
+        "country": "GB",
+        "country_name": "United Kingdom",
         "refs": [
           "https://en.wikipedia.org/wiki/Secret_Intelligence_Service"
         ]
       },
       "related": [],
-      "uuid": "8a4185a9-2654-4cbf-a8cc-9478c9192f5d",
+      "uuid": "3e9250af-c51e-4913-adf5-0ed7f0af88a6",
       "value": "Secret Intelligence Service"
     },
     {
       "description": "Defence Intelligence (DI)[38] – Military intelligence analysis.",
       "meta": {
-        "country": "United Kingdom",
+        "country": "GB",
+        "country_name": "United Kingdom",
         "refs": [
           "https://en.wikipedia.org/wiki/Defence_Intelligence"
         ]
       },
       "related": [],
-      "uuid": "15e74221-b244-4c97-8b0b-ff09b59fc5e9",
+      "uuid": "f79dc3d6-441e-45a6-8351-fe6f24f6d02a",
       "value": "Defence Intelligence"
     },
     {
       "description": "Government Communications Headquarters (GCHQ)[39] – Signals intelligence gathering and analysis.",
       "meta": {
-        "country": "United Kingdom",
+        "country": "GB",
+        "country_name": "United Kingdom",
         "refs": [
           "https://en.wikipedia.org/wiki/Government_Communications_Headquarters"
         ]
       },
       "related": [],
-      "uuid": "cf3f7d8a-0571-4b45-99a9-80bbecf7aa24",
+      "uuid": "af10356e-79cb-47c2-98bd-43a6eb4fa242",
       "value": "Government Communications Headquarters"
     },
     {
       "description": "National Crime Agency (NCA)[40] – Organised crime intelligence gathering and analysis. Agency utilizes Unexplained wealth orders and the Investigatory Powers Act 2016.[41][42] NCA officers are posted overseas in around 50 countries.[43] They operate the UK Protected Persons Service, which includes witness protection.[44]",
       "meta": {
-        "country": "United Kingdom",
+        "country": "GB",
+        "country_name": "United Kingdom",
         "refs": [
           "https://en.wikipedia.org/wiki/National_Crime_Agency"
         ]
       },
       "related": [],
-      "uuid": "2ef0d454-2e23-47f9-b728-0138b1f5cc17",
+      "uuid": "059ee2b0-df41-4f91-a621-25366d2211e7",
       "value": "National Crime Agency"
     },
     {
       "description": "Gangmasters and Labour Abuse Authority - Human trafficking, slavery, economic, and serious organised crime.",
       "meta": {
-        "country": "United Kingdom",
+        "country": "GB",
+        "country_name": "United Kingdom",
         "refs": [
           "https://en.wikipedia.org/wiki/Gangmasters_and_Labour_Abuse_Authority"
         ]
       },
       "related": [],
-      "uuid": "d4bfd128-1047-4604-8d29-f9c8fdece736",
+      "uuid": "58c000fc-9235-4d09-b041-d2af3e992082",
       "value": "Gangmasters and Labour Abuse Authority"
     },
     {
       "description": "Office of the Director of National Intelligence (ODNI)",
       "meta": {
-        "country": "United States",
+        "country": "US",
+        "country_name": "United States",
         "refs": [
           "https://en.wikipedia.org/wiki/Director_of_National_Intelligence"
         ]
       },
       "related": [],
-      "uuid": "576cd406-d342-404a-b2a9-7bb0ce9f7872",
+      "uuid": "014ce741-dba8-499a-8e6e-768f717c5f96",
       "value": "Director of National Intelligence"
     },
     {
       "description": "Central Intelligence Agency (CIA)",
       "meta": {
-        "country": "United States",
+        "country": "US",
+        "country_name": "United States",
         "refs": [
           "https://en.wikipedia.org/wiki/Central_Intelligence_Agency"
         ]
       },
       "related": [],
-      "uuid": "5c849fd2-c5b0-4556-9b97-7428c5280851",
+      "uuid": "3672b759-5a90-454f-9d4c-15ea9cbd5911",
       "value": "Central Intelligence Agency"
     },
     {
       "description": "Defense Intelligence Agency (DIA)",
       "meta": {
-        "country": "United States",
+        "country": "US",
+        "country_name": "United States",
         "refs": [
           "https://en.wikipedia.org/wiki/Defense_Intelligence_Agency"
         ]
       },
       "related": [],
-      "uuid": "96a13685-b634-484e-877a-fc58328a3786",
+      "uuid": "1de555bd-3a5b-44ac-ab11-0126c6fbeff2",
       "value": "Defense Intelligence Agency"
     },
     {
       "description": "National Security Agency (NSA)",
       "meta": {
-        "country": "United States",
+        "country": "US",
+        "country_name": "United States",
         "refs": [
           "https://en.wikipedia.org/wiki/National_Security_Agency"
         ]
       },
       "related": [],
-      "uuid": "9a8bd24a-3240-44f9-a419-867ea9628bed",
+      "uuid": "5effdda2-803d-4023-b00f-8c7eed39235f",
       "value": "National Security Agency"
     },
     {
       "description": "National Geospatial-Intelligence Agency (NGA)",
       "meta": {
-        "country": "United States",
+        "country": "US",
+        "country_name": "United States",
         "refs": [
           "https://en.wikipedia.org/wiki/National_Geospatial-Intelligence_Agency"
         ]
       },
       "related": [],
-      "uuid": "c1b888fb-3ce0-4129-b1e8-478dcdf34994",
+      "uuid": "76663df1-c983-4b3a-ba74-156dc4d9ddfe",
       "value": "National Geospatial-Intelligence Agency"
     },
     {
       "description": "National Reconnaissance Office (NRO)",
       "meta": {
-        "country": "United States",
+        "country": "US",
+        "country_name": "United States",
         "refs": [
           "https://en.wikipedia.org/wiki/National_Reconnaissance_Office"
         ]
       },
       "related": [],
-      "uuid": "6bb88a0b-4d26-4e82-b4bd-e8edd668d14b",
+      "uuid": "7f0a6763-62e5-4ff4-9797-9e5355cc019e",
       "value": "National Reconnaissance Office"
     },
     {
       "description": "Military Intelligence Corps (MIC)",
       "meta": {
-        "country": "United States",
+        "country": "US",
+        "country_name": "United States",
         "refs": [
           "https://en.wikipedia.org/wiki/Military_Intelligence_Corps_(United_States_Army)"
         ]
       },
       "related": [],
-      "uuid": "cbd85ba4-c45b-461a-bd90-223af45bc3cd",
+      "uuid": "3f479e3f-1c4f-45f2-932b-c758fc732b72",
       "value": "Military Intelligence Corps (United States Army)"
     },
     {
       "description": "Marine Corps Intelligence (MCI)",
       "meta": {
-        "country": "United States",
+        "country": "US",
+        "country_name": "United States",
         "refs": [
           "https://en.wikipedia.org/wiki/Marine_Corps_Intelligence"
         ]
       },
       "related": [],
-      "uuid": "056fabea-f03a-4d22-ac5a-801bfca34136",
+      "uuid": "76505373-782c-47fc-9f24-c6611faabd2f",
       "value": "Marine Corps Intelligence"
     },
     {
       "description": "Office of Naval Intelligence (ONI)",
       "meta": {
-        "country": "United States",
+        "country": "US",
+        "country_name": "United States",
         "refs": [
           "https://en.wikipedia.org/wiki/Office_of_Naval_Intelligence"
         ]
       },
       "related": [],
-      "uuid": "9ef77450-fcfe-4b6d-995a-c4f6d85d0a10",
+      "uuid": "24fbccb3-3c62-4896-b22b-8513ad65498e",
       "value": "Office of Naval Intelligence"
     },
     {
       "description": "Sixteenth Air Force (16 AF)",
       "meta": {
-        "country": "United States",
+        "country": "US",
+        "country_name": "United States",
         "refs": [
           "https://en.wikipedia.org/wiki/Sixteenth_Air_Force"
         ]
       },
       "related": [],
-      "uuid": "d8dfeb14-4f84-4298-89b3-cfc61e293971",
+      "uuid": "ce2fd165-351a-47e3-b28a-d8353011c964",
       "value": "Sixteenth Air Force"
     },
     {
       "description": "Space Delta 18 (DEL 18)",
       "meta": {
-        "country": "United States",
+        "country": "US",
+        "country_name": "United States",
         "refs": [
           "https://en.wikipedia.org/wiki/Space_Delta_18"
         ]
       },
       "related": [],
-      "uuid": "e945eda0-a3d6-4b63-ab58-35ea9c9326f5",
+      "uuid": "e4f7b9b5-6870-4d78-81ed-3ec8f3454ff7",
       "value": "Space Delta 18"
     },
     {
       "description": "Office of Intelligence and Counterintelligence (OICI)",
       "meta": {
-        "country": "United States",
+        "country": "US",
+        "country_name": "United States",
         "refs": [
           "https://en.wikipedia.org/wiki/Office_of_Intelligence_and_Counterintelligence"
         ]
       },
       "related": [],
-      "uuid": "0421660a-ba5e-49eb-8598-8c2250dc974a",
+      "uuid": "8317258b-1ab9-4b03-b68c-6bc3e99c5a22",
       "value": "Office of Intelligence and Counterintelligence"
     },
     {
       "description": "Coast Guard Intelligence (CGI)",
       "meta": {
-        "country": "United States",
+        "country": "US",
+        "country_name": "United States",
         "refs": [
           "https://en.wikipedia.org/wiki/Coast_Guard_Intelligence"
         ]
       },
       "related": [],
-      "uuid": "73d42f35-6c26-4615-b316-26a939c93b43",
+      "uuid": "4b633372-c042-48bb-80d8-51202b8befd8",
       "value": "Coast Guard Intelligence"
     },
     {
       "description": "DHS Office of Intelligence and Analysis (I&A)",
       "meta": {
-        "country": "United States",
+        "country": "US",
+        "country_name": "United States",
         "refs": [
           "https://en.wikipedia.org/wiki/DHS_Office_of_Intelligence_and_Analysis"
         ]
       },
       "related": [],
-      "uuid": "ac124d55-bfff-413e-b132-38365e617233",
+      "uuid": "062a2ddf-adc0-440d-b1b6-9f4ae77db4e8",
       "value": "DHS Office of Intelligence and Analysis"
     },
     {
       "description": "DEA Office of National Security Intelligence (ONSI)",
       "meta": {
-        "country": "United States",
+        "country": "US",
+        "country_name": "United States",
         "refs": [
           "https://en.wikipedia.org/wiki/DEA_Office_of_National_Security_Intelligence"
         ]
       },
       "related": [],
-      "uuid": "c90b1b51-71c2-4764-bdd4-b9bdb501fa88",
+      "uuid": "c4b8d752-e926-4bd7-b95e-a023d1077f96",
       "value": "DEA Office of National Security Intelligence"
     },
     {
       "description": "FBI Intelligence Branch (IB)",
       "meta": {
-        "country": "United States",
+        "country": "US",
+        "country_name": "United States",
         "refs": [
           "https://en.wikipedia.org/wiki/FBI_Intelligence_Branch"
         ]
       },
       "related": [],
-      "uuid": "c50b02a8-cff2-4102-9796-e0475b29c974",
+      "uuid": "6806ab12-5d16-44a2-878d-af9505a48859",
       "value": "FBI Intelligence Branch"
     },
     {
       "description": "Bureau of Intelligence and Research (IR)",
       "meta": {
-        "country": "United States",
+        "country": "US",
+        "country_name": "United States",
         "refs": [
           "https://en.wikipedia.org/wiki/Bureau_of_Intelligence_and_Research"
         ]
       },
       "related": [],
-      "uuid": "a292cadc-b6c6-47b3-a9e9-4c241a6d4ec5",
+      "uuid": "2fa63ffd-68a5-402b-9c8f-48b9350a59a0",
       "value": "Bureau of Intelligence and Research"
     },
     {
       "description": "Office of Terrorism and Financial Intelligence (TFI)",
       "meta": {
-        "country": "United States",
+        "country": "US",
+        "country_name": "United States",
         "refs": [
           "https://en.wikipedia.org/wiki/Office_of_Terrorism_and_Financial_Intelligence"
         ]
       },
       "related": [],
-      "uuid": "34f104bb-73ec-4ef1-91d7-05169c1c74b4",
+      "uuid": "3b561876-0e93-4f7d-8c1f-1b6533f51aea",
       "value": "Office of Terrorism and Financial Intelligence"
     },
     {
       "description": "State Secretariat of Strategic Intelligence - Secretaría de Inteligencia Estratégica de Estado (SIEE)",
       "meta": {
-        "country": "Uruguay",
+        "country": "UY",
+        "country_name": "Uruguay",
         "refs": [
           "https://en.wikipedia.orghttps://es.wikipedia.org/wiki/Secretar%C3%ADa_de_Inteligencia_Estrat%C3%A9gica_de_Estado"
         ],
@@ -5220,148 +5641,152 @@
         ]
       },
       "related": [],
-      "uuid": "9a8c3757-83b5-4023-8116-e2969e8342d2",
+      "uuid": "35ff75a5-9d96-4588-b5d3-abfdebdeb155",
       "value": "es:Secretaría de Inteligencia Estratégica de Estado"
     },
     {
       "description": "National Directorate of Information and Intelligence - Dirección Nacional de Información e Inteligencia (DNII)",
       "meta": {
-        "country": "Uruguay"
+        "country": "UY",
+        "country_name": "Uruguay"
       },
       "related": [],
-      "uuid": "6eaf8c19-4513-43e1-b84b-75a426885bb9",
+      "uuid": "dc4949ab-7981-4a20-9cd0-44f3db5b3c9f",
       "value": "National Directorate of Information and Intelligence - Dirección Nacional de Información e Inteligencia (DNII)"
     },
     {
       "description": "State Security Service - Davlat Xavfsizlik Xizmati (DXX)/ Служба государственной безопасности (СГБ)",
       "meta": {
-        "country": "Uzbekistan",
+        "country": "UZ",
+        "country_name": "Uzbekistan",
         "refs": [
           "https://en.wikipedia.org/wiki/State_Security_Service_(Uzbekistan)"
         ]
       },
       "related": [],
-      "uuid": "e1ec5395-222a-4aef-88f9-2573c657ee05",
+      "uuid": "00e38a32-7af2-4390-bb16-658c17c53f71",
       "value": "State Security Service (Uzbekistan)"
     },
     {
       "description": "Bolivarian National Intelligence Service - Servicio Bolivariano de Inteligencia (SEBIN)",
       "meta": {
-        "country": "Venezuela",
+        "country": "VE",
+        "country_name": "Venezuela",
         "refs": [
           "https://en.wikipedia.org/wiki/Bolivarian_National_Intelligence_Service"
         ]
       },
       "related": [],
-      "uuid": "c336da68-da80-43e8-8829-01125fd748c4",
+      "uuid": "837b80b3-7b23-47a0-a383-7d96c3a728d5",
       "value": "Bolivarian National Intelligence Service"
     },
     {
       "description": "Directorate General of Military Intelligence – Dirección General de Contrainteligencia Militar (DGCIM)",
       "meta": {
-        "country": "Venezuela",
+        "country": "VE",
+        "country_name": "Venezuela",
         "refs": [
           "https://en.wikipedia.org/wiki/Direcci%C3%B3n_General_de_Contrainteligencia_Militar"
         ]
       },
       "related": [],
-      "uuid": "55a58b05-52bc-4f3d-803e-0759fe63dc4e",
+      "uuid": "4768b8c4-503d-4c94-b4cd-2451a3bd9612",
       "value": "Dirección General de Contrainteligencia Militar"
     },
     {
       "description": "General Department of Defence Intelligence (GDDI)/General Department II - Tổng cục Tình báo Quốc phòng (TBQP)/Tổng cục II (TC2)",
       "meta": {
-        "country": "Vietnam",
+        "country": "VN",
+        "country_name": "Vietnam",
         "refs": [
           "https://en.wikipedia.org/wiki/General_Department_of_Military_Intelligence"
         ]
       },
       "related": [],
-      "uuid": "090102a2-0e8f-487f-acd8-8cc15625b8a7",
+      "uuid": "c9267c1a-40e3-46b8-9e63-3415023092cc",
       "value": "General Department of Military Intelligence"
     },
     {
       "description": "Political Security Organization (PSO)",
       "meta": {
-        "country": "Yemen",
+        "country": "YE",
+        "country_name": "Yemen",
         "refs": [
           "https://en.wikipedia.org/wiki/Political_Security_Organization"
         ]
       },
       "related": [],
-      "uuid": "6351d167-23fa-4db4-9536-5aa0f217820e",
+      "uuid": "14de9de1-0468-4ed7-b7ec-c49f1d2d93ff",
       "value": "Political Security Organization"
     },
     {
       "description": "National Security Bureau  (NSB)",
       "meta": {
-        "country": "Yemen",
+        "country": "YE",
+        "country_name": "Yemen",
         "refs": [
           "https://en.wikipedia.org/wiki/National_Security_Bureau_(Yemen)"
         ]
       },
       "related": [],
-      "uuid": "5ca3a4e3-060b-489a-85ca-ebf176815a71",
+      "uuid": "bee20f3a-bd1e-4eec-bff5-b99860722009",
       "value": "National Security Bureau (Yemen)"
     },
     {
       "description": "Central Intelligence Organisation (CIO)",
       "meta": {
-        "country": "Zimbabwe",
+        "country": "ZW",
+        "country_name": "Zimbabwe",
         "refs": [
           "https://en.wikipedia.org/wiki/Central_Intelligence_Organisation"
         ]
       },
       "related": [],
-      "uuid": "a6b1f3bc-4e60-4ca4-ae2d-df5d9645e3cc",
+      "uuid": "ff30c669-3fd7-4937-83a6-6f4bda8b8358",
       "value": "Central Intelligence Organisation"
     },
     {
       "description": "Counter Terrorism Group (CTG)",
       "meta": {
-        "country": "European Union",
         "refs": [
           "https://en.wikipedia.org/wiki/Counter_Terrorism_Group"
         ]
       },
       "related": [],
-      "uuid": "5e5e08a4-3130-49d8-be40-b6b300e4bd86",
+      "uuid": "5173efb0-4391-47cc-aadd-4b8397e3dc43",
       "value": "Counter Terrorism Group"
     },
     {
       "description": "European Union Military Staff (EUMS)",
       "meta": {
-        "country": "European Union",
         "refs": [
           "https://en.wikipedia.org/wiki/European_Union_Military_Staff"
         ]
       },
       "related": [],
-      "uuid": "4f50484a-1475-4098-a046-1bcb030b72c8",
+      "uuid": "ac82f2fd-29b4-4010-92b7-0f1ba675c767",
       "value": "European Union Military Staff"
     },
     {
       "description": "European Union Satellite Centre (EU SatCen)",
       "meta": {
-        "country": "European Union",
         "refs": [
           "https://en.wikipedia.org/wiki/European_Union_Satellite_Centre"
         ]
       },
       "related": [],
-      "uuid": "bed4ba5f-b82e-411b-8e63-266128466049",
+      "uuid": "56d9d246-ec0c-47d9-811c-17b88cf7f3fe",
       "value": "European Union Satellite Centre"
     },
     {
       "description": "Regional Anti-Terrorist Structure (RATS)",
       "meta": {
-        "country": "Shanghai Cooperation Organisation",
         "refs": [
           "https://en.wikipedia.org/wiki/Regional_Anti-Terrorist_Structure"
         ]
       },
       "related": [],
-      "uuid": "62d10927-a4a2-4168-81d7-50f3b751b466",
+      "uuid": "6d997a58-7ec3-4ba8-a518-d12f3299a586",
       "value": "Regional Anti-Terrorist Structure"
     }
   ],
diff --git a/tools/IntelAgencies/main.py b/tools/IntelAgencies/main.py
index 8f095cb..fcc362b 100644
--- a/tools/IntelAgencies/main.py
+++ b/tools/IntelAgencies/main.py
@@ -5,6 +5,7 @@ import uuid
 import json
 
 from bs4 import BeautifulSoup
+import pycountry
 
 CLUSTER_PATH = '../../clusters'
 GALAXY_PATH = '../../galaxies'
@@ -12,6 +13,28 @@ GALAXY_NAME = 'intelligence-agencies'
 UUID = "3ef969e7-96cd-4048-aa83-191ac457d0db"
 WIKIPEDIA_URL = "https://en.wikipedia.org"
 
+COUNTRY_CODES = {
+    "Brunei": "BN",
+    "People's Republic of China": "CN",
+    "Democratic Republic of the Congo": "CD",  # Note: This is for the Democratic Republic of the Congo, not to be confused with the Republic of the Congo (CG)
+    "Czech Republic": "CZ",
+    "Iran": "IR",
+    "Moldova": "MD",  # Officially known as the Republic of Moldova
+    "North Korea": "KP",  # Officially the Democratic People's Republic of Korea (DPRK)
+    "Palestine": "PS",
+    "Russia": "RU",  # Officially the Russian Federation
+    "South Korea": "KR",  # Officially the Republic of Korea (ROK)
+    "Syria": "SY",  # Officially the Syrian Arab Republic
+    "Taiwan": "TW",  # ISO code is assigned as "Taiwan, Province of China"
+    "Tanzania": "TZ",  # Officially the United Republic of Tanzania
+    "Trinidad & Tobago": "TT",
+    "Turkey": "TR",
+    "Venezuela": "VE",  # Officially the Bolivarian Republic of Venezuela
+    "Vietnam": "VN",  # Officially the Socialist Republic of Vietnam
+    "European Union": None,  # Not a country, no ISO code
+    "Shanghai Cooperation Organisation": None  # Not a country, no ISO code
+}
+
 def get_UUIDs():
     if f"{GALAXY_NAME}.json" in os.listdir(CLUSTER_PATH):
         uuids = {}
@@ -85,10 +108,23 @@ def get_agencies_from_country(heading, current_country, uuids):
     for content in contents:
         agency_names = get_notes_on_lower_level(content)
         for name, links, description, synonyms in agency_names:
-            if uuids and name in uuids:
-                agencies.append(IntelAgency(value=name, uuid=uuids[name], meta=Meta(country=current_country, refs=[links], synonyms=[synonyms]), description=description))
+            country_code = pycountry.countries.get(name=current_country)
+
+            # Set country
+            country_name = current_country
+
+            if country_code:
+                country_code = country_code.alpha_2
             else:
-                agencies.append(IntelAgency(value=name, meta=Meta(country=current_country, refs=[links], synonyms=[synonyms]), uuid=str(uuid.uuid4()), description=description))
+                country_code = COUNTRY_CODES.get(current_country)
+
+            if current_country in ["European Union", "Shanghai Cooperation Organisation"]: # Not a country
+                country_name = None
+            
+            if uuids and name in uuids:
+                agencies.append(IntelAgency(value=name, uuid=uuids[name], meta=Meta(country=country_code, country_name=country_name, refs=[links], synonyms=[synonyms]), description=description))
+            else:
+                agencies.append(IntelAgency(value=name, meta=Meta(country=country_code, country_name=country_name, refs=[links], synonyms=[synonyms]), uuid=str(uuid.uuid4()), description=description))
     
     return agencies
     
@@ -110,7 +146,6 @@ if __name__ == '__main__':
     wiki = WikipediaAPI()
     page_title = 'List of intelligence agencies'
     content = wiki.get_page_html(page_title)
-    # print(content)
     uuids = get_UUIDs()
     if content and uuids:
         agencies = extract_info(content, uuids)
diff --git a/tools/IntelAgencies/modules/intel.py b/tools/IntelAgencies/modules/intel.py
index 4c3dd82..dce5c53 100644
--- a/tools/IntelAgencies/modules/intel.py
+++ b/tools/IntelAgencies/modules/intel.py
@@ -3,29 +3,51 @@ import json
 
 @dataclass
 class Meta:
-    country: str = ""
+    country: str = None
+    country_name: str = None
     refs: list = field(default_factory=list)
     synonyms: list = field(default_factory=list)
 
+# def custom_asdict(obj):
+#     if is_dataclass(obj):
+#         result = {}
+#         for field_name, field_def in obj.__dataclass_fields__.items():
+#             value = getattr(obj, field_name)
+#             if field_name == 'meta': 
+#                 meta_value = custom_asdict(value) 
+#                 meta_value = {k: v for k, v in meta_value.items() if not (k in ['refs', 'synonyms'] and (not v or all(e is None for e in v)))}
+#                 value = meta_value
+#             elif isinstance(value, (list, tuple)) and all(is_dataclass(i) for i in value):
+#                 value = [custom_asdict(i) for i in value]
+#             elif isinstance(value, list) and all(e is None for e in value): 
+#                 continue 
+#             result[field_name] = value
+#         return result
+#     else:
+#         return obj
+    
 def custom_asdict(obj):
     if is_dataclass(obj):
         result = {}
         for field_name, field_def in obj.__dataclass_fields__.items():
             value = getattr(obj, field_name)
             if field_name == 'meta': 
-                meta_value = custom_asdict(value) 
-                meta_value = {k: v for k, v in meta_value.items() if not (k in ['refs', 'synonyms'] and (not v or all(e is None for e in v)))}
+                meta_value = custom_asdict(value)
+                # Filter out 'refs', 'synonyms', 'country', and 'country_name' if they are None or if 'refs' and 'synonyms' are empty
+                meta_value = {k: v for k, v in meta_value.items() if v is not None and not (k in ['refs', 'synonyms'] and (not v or all(e is None for e in v)))}
                 value = meta_value
             elif isinstance(value, (list, tuple)) and all(is_dataclass(i) for i in value):
                 value = [custom_asdict(i) for i in value]
-            elif isinstance(value, list) and all(e is None for e in value): 
-                continue 
+            elif isinstance(value, list) and all(e is None for e in value):
+                continue
+            # Skip the field if the value is None (specifically for 'country' and 'country_name')
+            if value is None and field_name in ['country', 'country_name']:
+                continue
             result[field_name] = value
         return result
     else:
         return obj
 
-
 @dataclass
 class IntelAgency:
     description: str = ""