diff --git a/firstdata/indexes/all-sources.json b/firstdata/indexes/all-sources.json
index 2603d91..be9ac19 100644
--- a/firstdata/indexes/all-sources.json
+++ b/firstdata/indexes/all-sources.json
@@ -1,6 +1,6 @@
 {
   "metadata": {
-    "generated_at": "2026-03-28T18:59:30.613275+00:00",
+    "generated_at": "2026-03-29T17:17:09.284112+00:00",
     "total_sources": 313,
     "version": "2.0",
     "schema_version": "v2.0.0"
@@ -1190,7 +1190,7 @@
         "ocean",
         "land",
         "atmosphere",
-        "disaster_management"
+        "disaster-management"
       ],
       "geographic_scope": "global",
       "update_frequency": "daily",
@@ -1243,8 +1243,8 @@
       "country": null,
       "domains": [
         "health",
-        "clinical_research",
-        "medical_trials"
+        "clinical-research",
+        "medical-trials"
       ],
       "geographic_scope": "global",
       "update_frequency": "daily",
@@ -1441,7 +1441,7 @@
       "domains": [
         "health",
         "biomedical",
-        "life_sciences"
+        "life-sciences"
       ],
       "geographic_scope": "global",
       "update_frequency": "daily",
@@ -2462,7 +2462,7 @@
       "geographic_scope": "national",
       "domains": [
         "employment",
-        "social_security",
+        "social-security",
         "economics"
       ],
       "update_frequency": "quarterly",
@@ -2792,7 +2792,7 @@
       "domains": [
         "trade",
         "economics",
-        "international_commerce"
+        "international-commerce"
       ],
       "geographic_scope": "national",
       "update_frequency": "monthly",
@@ -3112,7 +3112,7 @@
       "country": "CN",
       "domains": [
         "education",
-        "higher_education",
+        "higher-education",
         "statistics"
       ],
       "geographic_scope": "national",
@@ -3430,7 +3430,7 @@
       "domains": [
         "finance",
         "economics",
-        "monetary_policy"
+        "monetary-policy"
       ],
       "geographic_scope": "national",
       "update_frequency": "monthly",
@@ -3799,7 +3799,7 @@
       "domains": [
         "finance",
         "securities",
-        "capital_markets"
+        "capital-markets"
       ],
       "geographic_scope": "national",
       "update_frequency": "monthly",
@@ -3860,7 +3860,7 @@
         "finance",
         "securities",
         "derivatives",
-        "capital_markets"
+        "capital-markets"
       ],
       "geographic_scope": "regional",
       "update_frequency": "real-time",
@@ -4715,7 +4715,7 @@
       "domains": [
         "environment",
         "climate",
-        "public_health"
+        "public-health"
       ],
       "update_frequency": "monthly",
       "tags": [
@@ -5035,9 +5035,9 @@
       "authority_level": "government",
       "country": "CN",
       "domains": [
-        "digital_economy",
-        "data_governance",
-        "digital_infrastructure"
+        "digital-economy",
+        "data-governance",
+        "digital-infrastructure"
       ],
       "geographic_scope": "national",
       "update_frequency": "irregular",
@@ -5111,7 +5111,7 @@
       "geographic_scope": "national",
       "domains": [
         "technology",
-        "intellectual_property",
+        "intellectual-property",
         "innovation"
       ],
       "update_frequency": "monthly",
@@ -6172,7 +6172,7 @@
         "finance",
         "economics",
         "banking",
-        "monetary_policy"
+        "monetary-policy"
       ],
       "tags": [
         "monetary authority",
@@ -7038,17 +7038,17 @@
       "api_url": "https://ecos.bok.or.kr",
       "country": "KR",
       "domains": [
-        "monetary_policy",
-        "financial_statistics",
-        "national_accounts",
-        "balance_of_payments",
-        "price_indices",
-        "interest_rates",
-        "exchange_rates",
-        "business_surveys",
-        "consumer_surveys",
-        "flow_of_funds",
-        "banking_statistics"
+        "monetary-policy",
+        "financial-statistics",
+        "national-accounts",
+        "balance-of-payments",
+        "price-indices",
+        "interest-rates",
+        "exchange-rates",
+        "business-surveys",
+        "consumer-surveys",
+        "flow-of-funds",
+        "banking-statistics"
       ],
       "geographic_scope": "national",
       "update_frequency": "daily",
@@ -8417,11 +8417,11 @@
       "authority_level": "government",
       "country": "VN",
       "domains": [
-        "foreign_direct_investment",
-        "investment_policy",
-        "economic_development",
+        "foreign-direct-investment",
+        "investment-policy",
+        "economic-development",
         "trade",
-        "business_registration"
+        "business-registration"
       ],
       "geographic_scope": "national",
       "update_frequency": "monthly",
@@ -8694,7 +8694,7 @@
       "domains": [
         "finance",
         "economics",
-        "monetary_policy"
+        "monetary-policy"
       ],
       "geographic_scope": "national",
       "data_content": {
@@ -10862,13 +10862,13 @@
       "api_url": "https://www.bankofcanada.ca/valet/docs",
       "country": "CA",
       "domains": [
-        "monetary_policy",
-        "exchange_rates",
-        "interest_rates",
+        "monetary-policy",
+        "exchange-rates",
+        "interest-rates",
         "inflation",
         "banking",
-        "financial_markets",
-        "economic_indicators"
+        "financial-markets",
+        "economic-indicators"
       ],
       "geographic_scope": "national",
       "update_frequency": "daily",
@@ -10939,18 +10939,18 @@
       "api_url": "https://www.cihi.ca/en/submit-data-and-view-standards/codes-and-classifications",
       "country": "CA",
       "domains": [
-        "health_care",
-        "hospital_services",
+        "health-care",
+        "hospital-services",
         "pharmaceuticals",
-        "medical_imaging",
-        "emergency_care",
-        "mental_health",
-        "continuing_care",
-        "health_spending",
-        "health_workforce",
-        "population_health",
-        "patient_outcomes",
-        "health_system_performance"
+        "medical-imaging",
+        "emergency-care",
+        "mental-health",
+        "continuing-care",
+        "health-spending",
+        "health-workforce",
+        "population-health",
+        "patient-outcomes",
+        "health-system-performance"
       ],
       "geographic_scope": "national",
       "update_frequency": "quarterly",
@@ -11175,16 +11175,16 @@
       "api_url": "https://www.banxico.org.mx/SieAPIRest/service/v1/",
       "country": "MX",
       "domains": [
-        "monetary_policy",
-        "financial_markets",
+        "monetary-policy",
+        "financial-markets",
         "banking",
-        "payment_systems",
-        "exchange_rates",
+        "payment-systems",
+        "exchange-rates",
         "inflation",
-        "balance_of_payments",
-        "public_finance",
+        "balance-of-payments",
+        "public-finance",
         "production",
-        "labor_market"
+        "labor-market"
       ],
       "geographic_scope": "national",
       "update_frequency": "daily",
@@ -11494,8 +11494,8 @@
       "domains": [
         "climate",
         "meteorology",
-        "environmental_science",
-        "atmospheric_science"
+        "environmental-science",
+        "atmospheric-science"
       ],
       "geographic_scope": "global",
       "update_frequency": "daily",
@@ -14166,10 +14166,10 @@
         "population",
         "demographics",
         "health",
-        "reproductive_health",
-        "gender_equality",
-        "youth_development",
-        "sustainable_development"
+        "reproductive-health",
+        "gender-equality",
+        "youth-development",
+        "sustainable-development"
       ],
       "update_frequency": "irregular",
       "tags": [
@@ -17908,7 +17908,7 @@
         "transport",
         "telecommunications",
         "energy",
-        "water_utilities",
+        "water-utilities",
         "ict"
       ],
       "geographic_scope": "global",
diff --git a/firstdata/indexes/by-authority.json b/firstdata/indexes/by-authority.json
index c23e3d6..78e6cd9 100644
--- a/firstdata/indexes/by-authority.json
+++ b/firstdata/indexes/by-authority.json
@@ -1,6 +1,6 @@
 {
   "metadata": {
-    "generated_at": "2026-03-28T18:59:30.613275+00:00",
+    "generated_at": "2026-03-29T17:17:09.284112+00:00",
     "total_sources": 313,
     "authority_counts": {
       "research": 37,
diff --git a/firstdata/indexes/by-domain.json b/firstdata/indexes/by-domain.json
index 7a15015..0f265ec 100644
--- a/firstdata/indexes/by-domain.json
+++ b/firstdata/indexes/by-domain.json
@@ -1,7 +1,7 @@
 {
   "metadata": {
-    "generated_at": "2026-03-28T18:59:30.613275+00:00",
-    "total_domains": 711,
+    "generated_at": "2026-03-29T17:17:09.284112+00:00",
+    "total_domains": 703,
     "total_sources": 313,
     "version": "2.0"
   },
@@ -1243,7 +1243,7 @@
         "geographic_scope": "global"
       }
     ],
-    "atmospheric_science": [
+    "atmospheric-science": [
       {
         "id": "noaa-cdo",
         "name": {
@@ -1399,9 +1399,7 @@
         "has_api": true,
         "file_path": "countries/asia/india/india-rbi.json",
         "geographic_scope": "national"
-      }
-    ],
-    "balance_of_payments": [
+      },
       {
         "id": "korea-bok",
         "name": {
@@ -1621,7 +1619,7 @@
         "geographic_scope": "regional"
       }
     ],
-    "banking_statistics": [
+    "banking-statistics": [
       {
         "id": "korea-bok",
         "name": {
@@ -2132,7 +2130,7 @@
         "geographic_scope": "global"
       }
     ],
-    "business_registration": [
+    "business-registration": [
       {
         "id": "vietnam-fia",
         "name": {
@@ -2146,7 +2144,7 @@
         "geographic_scope": "national"
       }
     ],
-    "business_surveys": [
+    "business-surveys": [
       {
         "id": "korea-bok",
         "name": {
@@ -2240,20 +2238,6 @@
         "file_path": "china/finance/capital-markets/china-nafmii.json",
         "geographic_scope": "national"
       },
-      {
-        "id": "hk-sfc",
-        "name": {
-          "en": "Securities and Futures Commission of Hong Kong",
-          "zh": "香港证券及期货事务监察委员会"
-        },
-        "authority_level": "government",
-        "data_url": "https://www.sfc.hk/en/Regulatory-functions/Products",
-        "has_api": false,
-        "file_path": "countries/asia/hk-sfc.json",
-        "geographic_scope": "national"
-      }
-    ],
-    "capital_markets": [
       {
         "id": "china-csrc",
         "name": {
@@ -2279,6 +2263,18 @@
         "has_api": true,
         "file_path": "china/finance/securities/hkex.json",
         "geographic_scope": "regional"
+      },
+      {
+        "id": "hk-sfc",
+        "name": {
+          "en": "Securities and Futures Commission of Hong Kong",
+          "zh": "香港证券及期货事务监察委员会"
+        },
+        "authority_level": "government",
+        "data_url": "https://www.sfc.hk/en/Regulatory-functions/Products",
+        "has_api": false,
+        "file_path": "countries/asia/hk-sfc.json",
+        "geographic_scope": "national"
       }
     ],
     "carbon emissions": [
@@ -3001,7 +2997,7 @@
         "geographic_scope": "global"
       }
     ],
-    "clinical_research": [
+    "clinical-research": [
       {
         "id": "clinicaltrials-gov",
         "name": {
@@ -3625,7 +3621,7 @@
         "geographic_scope": "national"
       }
     ],
-    "consumer_surveys": [
+    "consumer-surveys": [
       {
         "id": "korea-bok",
         "name": {
@@ -3654,7 +3650,7 @@
         "geographic_scope": "global"
       }
     ],
-    "continuing_care": [
+    "continuing-care": [
       {
         "id": "canada-cihi",
         "name": {
@@ -4140,7 +4136,7 @@
         "geographic_scope": "global"
       }
     ],
-    "data_governance": [
+    "data-governance": [
       {
         "id": "china-national-data-bureau",
         "name": {
@@ -5570,9 +5566,7 @@
         "has_api": false,
         "file_path": "china/research/china-caict.json",
         "geographic_scope": "national"
-      }
-    ],
-    "digital_economy": [
+      },
       {
         "id": "china-national-data-bureau",
         "name": {
@@ -5586,7 +5580,7 @@
         "geographic_scope": "national"
       }
     ],
-    "digital_infrastructure": [
+    "digital-infrastructure": [
       {
         "id": "china-national-data-bureau",
         "name": {
@@ -5628,7 +5622,7 @@
         "geographic_scope": "global"
       }
     ],
-    "disaster_management": [
+    "disaster-management": [
       {
         "id": "copernicus-open-access-hub",
         "name": {
@@ -6189,7 +6183,7 @@
         "geographic_scope": "national"
       }
     ],
-    "economic_development": [
+    "economic-development": [
       {
         "id": "vietnam-fia",
         "name": {
@@ -6203,7 +6197,7 @@
         "geographic_scope": "national"
       }
     ],
-    "economic_indicators": [
+    "economic-indicators": [
       {
         "id": "canada-boc",
         "name": {
@@ -8518,7 +8512,7 @@
         "geographic_scope": "global"
       }
     ],
-    "emergency_care": [
+    "emergency-care": [
       {
         "id": "canada-cihi",
         "name": {
@@ -10406,7 +10400,7 @@
         "geographic_scope": "global"
       }
     ],
-    "environmental_science": [
+    "environmental-science": [
       {
         "id": "noaa-cdo",
         "name": {
@@ -10681,9 +10675,7 @@
         "has_api": true,
         "file_path": "countries/asia/india/india-rbi.json",
         "geographic_scope": "national"
-      }
-    ],
-    "exchange_rates": [
+      },
       {
         "id": "korea-bok",
         "name": {
@@ -11657,33 +11649,7 @@
         "geographic_scope": "global"
       }
     ],
-    "financial-stability": [
-      {
-        "id": "us-federalreserve",
-        "name": {
-          "en": "Federal Reserve Board",
-          "zh": "美联储理事会"
-        },
-        "authority_level": "government",
-        "data_url": "https://www.federalreserve.gov/data.htm",
-        "has_api": false,
-        "file_path": "countries/north-america/usa/us-federalreserve.json",
-        "geographic_scope": "national"
-      },
-      {
-        "id": "iais",
-        "name": {
-          "en": "IAIS - International Association of Insurance Supervisors",
-          "zh": "国际保险监督官协会"
-        },
-        "authority_level": "international",
-        "data_url": "https://www.iais.org/activities-topics/financial-stability/gimar/",
-        "has_api": false,
-        "file_path": "international/finance/iais.json",
-        "geographic_scope": "global"
-      }
-    ],
-    "financial_markets": [
+    "financial-markets": [
       {
         "id": "canada-boc",
         "name": {
@@ -11711,7 +11677,33 @@
         "geographic_scope": "national"
       }
     ],
-    "financial_statistics": [
+    "financial-stability": [
+      {
+        "id": "us-federalreserve",
+        "name": {
+          "en": "Federal Reserve Board",
+          "zh": "美联储理事会"
+        },
+        "authority_level": "government",
+        "data_url": "https://www.federalreserve.gov/data.htm",
+        "has_api": false,
+        "file_path": "countries/north-america/usa/us-federalreserve.json",
+        "geographic_scope": "national"
+      },
+      {
+        "id": "iais",
+        "name": {
+          "en": "IAIS - International Association of Insurance Supervisors",
+          "zh": "国际保险监督官协会"
+        },
+        "authority_level": "international",
+        "data_url": "https://www.iais.org/activities-topics/financial-stability/gimar/",
+        "has_api": false,
+        "file_path": "international/finance/iais.json",
+        "geographic_scope": "global"
+      }
+    ],
+    "financial-statistics": [
       {
         "id": "korea-bok",
         "name": {
@@ -11845,7 +11837,7 @@
         "geographic_scope": "national"
       }
     ],
-    "flow_of_funds": [
+    "flow-of-funds": [
       {
         "id": "korea-bok",
         "name": {
@@ -12234,7 +12226,7 @@
         "geographic_scope": "national"
       }
     ],
-    "foreign_direct_investment": [
+    "foreign-direct-investment": [
       {
         "id": "vietnam-fia",
         "name": {
@@ -12409,20 +12401,6 @@
       }
     ],
     "gender-equality": [
-      {
-        "id": "unfpa-urbanization",
-        "name": {
-          "zh": "联合国人口基金 - 城镇化数据",
-          "en": "UNFPA - Urbanization Data"
-        },
-        "authority_level": "international",
-        "data_url": "https://www.unfpa.org/urbanization",
-        "has_api": false,
-        "file_path": "international/demographics/unfpa-urbanization.json",
-        "geographic_scope": "global"
-      }
-    ],
-    "gender_equality": [
       {
         "id": "unfpa-china",
         "name": {
@@ -12434,6 +12412,18 @@
         "has_api": false,
         "file_path": "international/demographics/unfpa-china.json",
         "geographic_scope": "national"
+      },
+      {
+        "id": "unfpa-urbanization",
+        "name": {
+          "zh": "联合国人口基金 - 城镇化数据",
+          "en": "UNFPA - Urbanization Data"
+        },
+        "authority_level": "international",
+        "data_url": "https://www.unfpa.org/urbanization",
+        "has_api": false,
+        "file_path": "international/demographics/unfpa-urbanization.json",
+        "geographic_scope": "global"
       }
     ],
     "genetics": [
@@ -13669,7 +13659,7 @@
         "geographic_scope": "global"
       }
     ],
-    "health_care": [
+    "health-care": [
       {
         "id": "canada-cihi",
         "name": {
@@ -13684,7 +13674,7 @@
         "geographic_scope": "national"
       }
     ],
-    "health_spending": [
+    "health-spending": [
       {
         "id": "canada-cihi",
         "name": {
@@ -13699,7 +13689,7 @@
         "geographic_scope": "national"
       }
     ],
-    "health_system_performance": [
+    "health-system-performance": [
       {
         "id": "canada-cihi",
         "name": {
@@ -13714,7 +13704,7 @@
         "geographic_scope": "national"
       }
     ],
-    "health_workforce": [
+    "health-workforce": [
       {
         "id": "canada-cihi",
         "name": {
@@ -13810,6 +13800,18 @@
         "file_path": "china/education/higher_education/china-gaokao-chsi.json",
         "geographic_scope": "national"
       },
+      {
+        "id": "china-moe-higher-education",
+        "name": {
+          "en": "Ministry of Education of China - Higher Education Statistics",
+          "zh": "中华人民共和国教育部高等教育统计"
+        },
+        "authority_level": "government",
+        "data_url": "http://www.moe.gov.cn/jyb_sjzl/sjzl_fztjgb/",
+        "has_api": false,
+        "file_path": "china/education/higher_education/china-moe-higher-education.json",
+        "geographic_scope": "national"
+      },
       {
         "id": "moe-china",
         "name": {
@@ -13835,20 +13837,6 @@
         "geographic_scope": "national"
       }
     ],
-    "higher_education": [
-      {
-        "id": "china-moe-higher-education",
-        "name": {
-          "en": "Ministry of Education of China - Higher Education Statistics",
-          "zh": "中华人民共和国教育部高等教育统计"
-        },
-        "authority_level": "government",
-        "data_url": "http://www.moe.gov.cn/jyb_sjzl/sjzl_fztjgb/",
-        "has_api": false,
-        "file_path": "china/education/higher_education/china-moe-higher-education.json",
-        "geographic_scope": "national"
-      }
-    ],
     "homelessness": [
       {
         "id": "aus-aihw",
@@ -13863,7 +13851,7 @@
         "geographic_scope": "national"
       }
     ],
-    "hospital_services": [
+    "hospital-services": [
       {
         "id": "canada-cihi",
         "name": {
@@ -15430,7 +15418,7 @@
         "geographic_scope": "global"
       }
     ],
-    "intellectual_property": [
+    "intellectual-property": [
       {
         "id": "china-cnipa-patents",
         "name": {
@@ -15509,7 +15497,7 @@
         "geographic_scope": "regional"
       }
     ],
-    "interest_rates": [
+    "interest-rates": [
       {
         "id": "korea-bok",
         "name": {
@@ -15712,32 +15700,32 @@
         "geographic_scope": "global"
       }
     ],
-    "international-exchange": [
+    "international-commerce": [
       {
-        "id": "cscse",
+        "id": "china-customs",
         "name": {
-          "en": "Chinese Service Center for Scholarly Exchange",
-          "zh": "教育部留学服务中心"
+          "en": "General Administration of Customs of China",
+          "zh": "中华人民共和国海关总署",
+          "native": "中华人民共和国海关总署"
         },
         "authority_level": "government",
-        "data_url": "https://zwfw.cscse.edu.cn",
+        "data_url": "http://www.customs.gov.cn",
         "has_api": false,
-        "file_path": "china/education/cscse.json",
+        "file_path": "china/economy/trade/customs.json",
         "geographic_scope": "national"
       }
     ],
-    "international_commerce": [
+    "international-exchange": [
       {
-        "id": "china-customs",
+        "id": "cscse",
         "name": {
-          "en": "General Administration of Customs of China",
-          "zh": "中华人民共和国海关总署",
-          "native": "中华人民共和国海关总署"
+          "en": "Chinese Service Center for Scholarly Exchange",
+          "zh": "教育部留学服务中心"
         },
         "authority_level": "government",
-        "data_url": "http://www.customs.gov.cn",
+        "data_url": "https://zwfw.cscse.edu.cn",
         "has_api": false,
-        "file_path": "china/economy/trade/customs.json",
+        "file_path": "china/education/cscse.json",
         "geographic_scope": "national"
       }
     ],
@@ -15913,7 +15901,7 @@
         "geographic_scope": "national"
       }
     ],
-    "investment_policy": [
+    "investment-policy": [
       {
         "id": "vietnam-fia",
         "name": {
@@ -16189,7 +16177,7 @@
         "geographic_scope": "regional"
       }
     ],
-    "labor_market": [
+    "labor-market": [
       {
         "id": "mx-banxico",
         "name": {
@@ -16387,7 +16375,7 @@
         "geographic_scope": "global"
       }
     ],
-    "life_sciences": [
+    "life-sciences": [
       {
         "id": "pubmed",
         "name": {
@@ -17138,7 +17126,7 @@
         "geographic_scope": "global"
       }
     ],
-    "medical_imaging": [
+    "medical-imaging": [
       {
         "id": "canada-cihi",
         "name": {
@@ -17153,7 +17141,7 @@
         "geographic_scope": "national"
       }
     ],
-    "medical_trials": [
+    "medical-trials": [
       {
         "id": "clinicaltrials-gov",
         "name": {
@@ -17221,7 +17209,7 @@
         "geographic_scope": "national"
       }
     ],
-    "mental_health": [
+    "mental-health": [
       {
         "id": "canada-cihi",
         "name": {
@@ -17606,57 +17594,6 @@
       }
     ],
     "monetary-policy": [
-      {
-        "id": "india-rbi",
-        "name": {
-          "en": "Reserve Bank of India",
-          "zh": "印度储备银行",
-          "native": "भारतीय रिज़र्व बैंक"
-        },
-        "authority_level": "government",
-        "data_url": "https://www.rbi.org.in/Scripts/Statistics.aspx",
-        "has_api": true,
-        "file_path": "countries/asia/india/india-rbi.json",
-        "geographic_scope": "national"
-      },
-      {
-        "id": "romania-bnr",
-        "name": {
-          "en": "National Bank of Romania (BNR)",
-          "zh": "罗马尼亚国家银行"
-        },
-        "authority_level": "government",
-        "data_url": "https://www.bnr.ro/Statistics-702.aspx",
-        "has_api": true,
-        "file_path": "countries/europe/romania/romania-bnr.json",
-        "geographic_scope": "national"
-      },
-      {
-        "id": "us-federalreserve",
-        "name": {
-          "en": "Federal Reserve Board",
-          "zh": "美联储理事会"
-        },
-        "authority_level": "government",
-        "data_url": "https://www.federalreserve.gov/data.htm",
-        "has_api": false,
-        "file_path": "countries/north-america/usa/us-federalreserve.json",
-        "geographic_scope": "national"
-      },
-      {
-        "id": "bis-cbta",
-        "name": {
-          "en": "BIS Central Bank Total Assets",
-          "zh": "国际清算银行中央银行总资产统计"
-        },
-        "authority_level": "international",
-        "data_url": "https://data.bis.org/topics/CBTA",
-        "has_api": true,
-        "file_path": "international/finance/bis-cbta.json",
-        "geographic_scope": "global"
-      }
-    ],
-    "monetary_policy": [
       {
         "id": "china-pbc",
         "name": {
@@ -17682,6 +17619,19 @@
         "file_path": "countries/asia/hkma.json",
         "geographic_scope": "national"
       },
+      {
+        "id": "india-rbi",
+        "name": {
+          "en": "Reserve Bank of India",
+          "zh": "印度储备银行",
+          "native": "भारतीय रिज़र्व बैंक"
+        },
+        "authority_level": "government",
+        "data_url": "https://www.rbi.org.in/Scripts/Statistics.aspx",
+        "has_api": true,
+        "file_path": "countries/asia/india/india-rbi.json",
+        "geographic_scope": "national"
+      },
       {
         "id": "korea-bok",
         "name": {
@@ -17707,6 +17657,18 @@
         "file_path": "countries/europe/bank-of-england-statistics.json",
         "geographic_scope": "national"
       },
+      {
+        "id": "romania-bnr",
+        "name": {
+          "en": "National Bank of Romania (BNR)",
+          "zh": "罗马尼亚国家银行"
+        },
+        "authority_level": "government",
+        "data_url": "https://www.bnr.ro/Statistics-702.aspx",
+        "has_api": true,
+        "file_path": "countries/europe/romania/romania-bnr.json",
+        "geographic_scope": "national"
+      },
       {
         "id": "canada-boc",
         "name": {
@@ -17732,6 +17694,30 @@
         "has_api": true,
         "file_path": "countries/north-america/mexico/banxico.json",
         "geographic_scope": "national"
+      },
+      {
+        "id": "us-federalreserve",
+        "name": {
+          "en": "Federal Reserve Board",
+          "zh": "美联储理事会"
+        },
+        "authority_level": "government",
+        "data_url": "https://www.federalreserve.gov/data.htm",
+        "has_api": false,
+        "file_path": "countries/north-america/usa/us-federalreserve.json",
+        "geographic_scope": "national"
+      },
+      {
+        "id": "bis-cbta",
+        "name": {
+          "en": "BIS Central Bank Total Assets",
+          "zh": "国际清算银行中央银行总资产统计"
+        },
+        "authority_level": "international",
+        "data_url": "https://data.bis.org/topics/CBTA",
+        "has_api": true,
+        "file_path": "international/finance/bis-cbta.json",
+        "geographic_scope": "global"
       }
     ],
     "money supply": [
@@ -17892,7 +17878,7 @@
         "geographic_scope": "regional"
       }
     ],
-    "national_accounts": [
+    "national-accounts": [
       {
         "id": "korea-bok",
         "name": {
@@ -18435,7 +18421,7 @@
         "geographic_scope": "global"
       }
     ],
-    "patient_outcomes": [
+    "patient-outcomes": [
       {
         "id": "canada-cihi",
         "name": {
@@ -18514,7 +18500,7 @@
         "geographic_scope": "national"
       }
     ],
-    "payment_systems": [
+    "payment-systems": [
       {
         "id": "mx-banxico",
         "name": {
@@ -19038,7 +19024,7 @@
         "geographic_scope": "global"
       }
     ],
-    "population_health": [
+    "population-health": [
       {
         "id": "canada-cihi",
         "name": {
@@ -19189,7 +19175,7 @@
         "geographic_scope": "national"
       }
     ],
-    "price_indices": [
+    "price-indices": [
       {
         "id": "korea-bok",
         "name": {
@@ -19788,7 +19774,7 @@
         "geographic_scope": "regional"
       }
     ],
-    "public_finance": [
+    "public-finance": [
       {
         "id": "mx-banxico",
         "name": {
@@ -19803,7 +19789,7 @@
         "geographic_scope": "national"
       }
     ],
-    "public_health": [
+    "public-health": [
       {
         "id": "china-mee",
         "name": {
@@ -20079,20 +20065,6 @@
       }
     ],
     "reproductive-health": [
-      {
-        "id": "unfpa-urbanization",
-        "name": {
-          "zh": "联合国人口基金 - 城镇化数据",
-          "en": "UNFPA - Urbanization Data"
-        },
-        "authority_level": "international",
-        "data_url": "https://www.unfpa.org/urbanization",
-        "has_api": false,
-        "file_path": "international/demographics/unfpa-urbanization.json",
-        "geographic_scope": "global"
-      }
-    ],
-    "reproductive_health": [
       {
         "id": "unfpa-china",
         "name": {
@@ -20104,6 +20076,18 @@
         "has_api": false,
         "file_path": "international/demographics/unfpa-china.json",
         "geographic_scope": "national"
+      },
+      {
+        "id": "unfpa-urbanization",
+        "name": {
+          "zh": "联合国人口基金 - 城镇化数据",
+          "en": "UNFPA - Urbanization Data"
+        },
+        "authority_level": "international",
+        "data_url": "https://www.unfpa.org/urbanization",
+        "has_api": false,
+        "file_path": "international/demographics/unfpa-urbanization.json",
+        "geographic_scope": "global"
       }
     ],
     "research": [
@@ -21390,32 +21374,32 @@
         "geographic_scope": "national"
       }
     ],
-    "social-services": [
+    "social-security": [
       {
-        "id": "mexico-coneval",
+        "id": "china-mohrss",
         "name": {
-          "en": "National Council for the Evaluation of Social Development Policy",
-          "zh": "墨西哥社会发展政策评估委员会",
-          "native": "Consejo Nacional de Evaluación de la Política de Desarrollo Social"
+          "en": "Ministry of Human Resources and Social Security of China - Employment and Social Security Statistics",
+          "zh": "人力资源和社会保障部统计数据"
         },
         "authority_level": "government",
-        "data_url": "https://www.coneval.org.mx",
+        "data_url": "http://www.mohrss.gov.cn/SYrlzyhshbzb/zwgk/szrs/",
         "has_api": false,
-        "file_path": "countries/north-america/mexico/coneval.json",
+        "file_path": "china/economy/labor/china-mohrss.json",
         "geographic_scope": "national"
       }
     ],
-    "social_security": [
+    "social-services": [
       {
-        "id": "china-mohrss",
+        "id": "mexico-coneval",
         "name": {
-          "en": "Ministry of Human Resources and Social Security of China - Employment and Social Security Statistics",
-          "zh": "人力资源和社会保障部统计数据"
+          "en": "National Council for the Evaluation of Social Development Policy",
+          "zh": "墨西哥社会发展政策评估委员会",
+          "native": "Consejo Nacional de Evaluación de la Política de Desarrollo Social"
         },
         "authority_level": "government",
-        "data_url": "http://www.mohrss.gov.cn/SYrlzyhshbzb/zwgk/szrs/",
+        "data_url": "https://www.coneval.org.mx",
         "has_api": false,
-        "file_path": "china/economy/labor/china-mohrss.json",
+        "file_path": "countries/north-america/mexico/coneval.json",
         "geographic_scope": "national"
       }
     ],
@@ -21938,7 +21922,7 @@
         "geographic_scope": "global"
       }
     ],
-    "sustainable_development": [
+    "sustainable-development": [
       {
         "id": "unfpa-china",
         "name": {
@@ -24016,7 +24000,7 @@
         "geographic_scope": "national"
       }
     ],
-    "water_utilities": [
+    "water-utilities": [
       {
         "id": "unctad-infrastructure-statistics",
         "name": {
@@ -24155,7 +24139,7 @@
         "geographic_scope": "regional"
       }
     ],
-    "youth_development": [
+    "youth-development": [
       {
         "id": "unfpa-china",
         "name": {
diff --git a/firstdata/indexes/by-region.json b/firstdata/indexes/by-region.json
index 03c731e..a8d542c 100644
--- a/firstdata/indexes/by-region.json
+++ b/firstdata/indexes/by-region.json
@@ -1,6 +1,6 @@
 {
   "metadata": {
-    "generated_at": "2026-03-28T18:59:30.613275+00:00",
+    "generated_at": "2026-03-29T17:17:09.284112+00:00",
     "total_regions": 56,
     "total_sources": 313,
     "version": "2.0"
diff --git a/firstdata/indexes/statistics.json b/firstdata/indexes/statistics.json
index d7580fd..6919a4c 100644
--- a/firstdata/indexes/statistics.json
+++ b/firstdata/indexes/statistics.json
@@ -1,12 +1,12 @@
 {
   "metadata": {
-    "generated_at": "2026-03-28T18:59:30.613275+00:00",
+    "generated_at": "2026-03-29T17:17:09.284112+00:00",
     "version": "2.0"
   },
   "overview": {
     "total_sources": 313,
     "sources_with_api": 150,
-    "last_updated": "2026-03-28"
+    "last_updated": "2026-03-29"
   },
   "by_authority_level": {
     "research": 37,
@@ -53,6 +53,7 @@
     "labor": 12,
     "banking": 12,
     "transportation": 10,
+    "monetary-policy": 10,
     "population": 9,
     "statistics": 9,
     "securities": 8,
@@ -68,7 +69,6 @@
     "bioinformatics": 6,
     "epidemiology": 6,
     "construction": 6,
-    "monetary_policy": 6,
     "earth-science": 6,
     "telecommunications": 6,
     "business": 6,
@@ -80,6 +80,7 @@
     "foreign exchange": 5,
     "payment systems": 5,
     "governance": 5,
+    "capital-markets": 5,
     "international trade": 5,
     "balance of payments": 5,
     "food security": 5,
@@ -90,10 +91,11 @@
     "productivity": 4,
     "poverty": 4,
     "standards": 4,
+    "higher-education": 4,
     "electronics": 4,
     "economic statistics": 4,
     "national accounts": 4,
-    "monetary-policy": 4,
+    "exchange-rates": 4,
     "government-finance": 4,
     "economic indicators": 4,
     "interest rates": 4,
@@ -111,16 +113,14 @@
     "economic development": 3,
     "culture": 3,
     "commerce": 3,
-    "higher-education": 3,
     "insurance": 3,
     "regulation": 3,
-    "capital-markets": 3,
     "taxation": 3,
     "meteorology": 3,
     "geospatial": 3,
     "social statistics": 3,
+    "balance-of-payments": 3,
     "public finance": 3,
-    "exchange_rates": 3,
     "fiscal policy": 3,
     "geology": 3,
     "society": 3,
@@ -158,11 +158,11 @@
     "aviation": 2,
     "tourism": 2,
     "fiscal-policy": 2,
-    "capital_markets": 2,
     "logistics": 2,
     "urbanization": 2,
     "public safety": 2,
     "services": 2,
+    "digital-economy": 2,
     "ecology": 2,
     "hydrology": 2,
     "resources": 2,
@@ -170,8 +170,7 @@
     "science": 2,
     "research": 2,
     "market-research": 2,
-    "balance_of_payments": 2,
-    "interest_rates": 2,
+    "interest-rates": 2,
     "foreign direct investment": 2,
     "customs": 2,
     "banking statistics": 2,
@@ -180,7 +179,7 @@
     "government": 2,
     "land use": 2,
     "agricultural economics": 2,
-    "financial_markets": 2,
+    "financial-markets": 2,
     "pharmaceuticals": 2,
     "energy trade": 2,
     "welfare": 2,
@@ -191,6 +190,8 @@
     "food safety": 2,
     "forestry": 2,
     "sustainability": 2,
+    "reproductive-health": 2,
+    "gender-equality": 2,
     "regional integration": 2,
     "government finance": 2,
     "energy transition": 2,
@@ -259,15 +260,15 @@
     "economic forecasting": 1,
     "structural-change": 1,
     "land": 1,
-    "disaster_management": 1,
-    "clinical_research": 1,
-    "medical_trials": 1,
+    "disaster-management": 1,
+    "clinical-research": 1,
+    "medical-trials": 1,
     "disease burden": 1,
     "health financing": 1,
     "risk factors": 1,
     "health systems": 1,
     "biomedical": 1,
-    "life_sciences": 1,
+    "life-sciences": 1,
     "cancer genomics": 1,
     "oncology": 1,
     "precision medicine": 1,
@@ -299,14 +300,13 @@
     "social science": 1,
     "urban-planning": 1,
     "building-standards": 1,
-    "social_security": 1,
-    "international_commerce": 1,
+    "social-security": 1,
+    "international-commerce": 1,
     "international-exchange": 1,
     "credential-verification": 1,
     "academic-degrees": 1,
     "graduate-education": 1,
     "postgraduate-admissions": 1,
-    "higher_education": 1,
     "education-statistics": 1,
     "education-policy": 1,
     "basic-education": 1,
@@ -317,18 +317,16 @@
     "debt-financing": 1,
     "government-budget": 1,
     "migration": 1,
-    "digital-economy": 1,
     "cloud-computing": 1,
     "artificial-intelligence": 1,
     "natural-resources": 1,
     "glaciology": 1,
-    "public_health": 1,
+    "public-health": 1,
     "mineral": 1,
     "minerals": 1,
-    "digital_economy": 1,
-    "data_governance": 1,
-    "digital_infrastructure": 1,
-    "intellectual_property": 1,
+    "data-governance": 1,
+    "digital-infrastructure": 1,
+    "intellectual-property": 1,
     "research-infrastructure": 1,
     "software": 1,
     "quality-management": 1,
@@ -350,19 +348,17 @@
     "coastal trade": 1,
     "inter-state trade": 1,
     "excise revenue": 1,
-    "exchange-rates": 1,
-    "balance-of-payments": 1,
     "flow of funds": 1,
     "economic surveys": 1,
     "FDI": 1,
     "geoscience": 1,
-    "financial_statistics": 1,
-    "national_accounts": 1,
-    "price_indices": 1,
-    "business_surveys": 1,
-    "consumer_surveys": 1,
-    "flow_of_funds": 1,
-    "banking_statistics": 1,
+    "financial-statistics": 1,
+    "national-accounts": 1,
+    "price-indices": 1,
+    "business-surveys": 1,
+    "consumer-surveys": 1,
+    "flow-of-funds": 1,
+    "banking-statistics": 1,
     "consumer price index": 1,
     "household": 1,
     "civil-registration": 1,
@@ -385,10 +381,10 @@
     "credit growth": 1,
     "coffee": 1,
     "cocoa": 1,
-    "foreign_direct_investment": 1,
-    "investment_policy": 1,
-    "economic_development": 1,
-    "business_registration": 1,
+    "foreign-direct-investment": 1,
+    "investment-policy": 1,
+    "economic-development": 1,
+    "business-registration": 1,
     "government budget": 1,
     "national accounting": 1,
     "state assets": 1,
@@ -411,18 +407,18 @@
     "environmental monitoring": 1,
     "agricultural research": 1,
     "market information": 1,
-    "economic_indicators": 1,
-    "health_care": 1,
-    "hospital_services": 1,
-    "medical_imaging": 1,
-    "emergency_care": 1,
-    "mental_health": 1,
-    "continuing_care": 1,
-    "health_spending": 1,
-    "health_workforce": 1,
-    "population_health": 1,
-    "patient_outcomes": 1,
-    "health_system_performance": 1,
+    "economic-indicators": 1,
+    "health-care": 1,
+    "hospital-services": 1,
+    "medical-imaging": 1,
+    "emergency-care": 1,
+    "mental-health": 1,
+    "continuing-care": 1,
+    "health-spending": 1,
+    "health-workforce": 1,
+    "population-health": 1,
+    "patient-outcomes": 1,
+    "health-system-performance": 1,
     "energy infrastructure": 1,
     "pipeline regulation": 1,
     "electricity transmission": 1,
@@ -431,10 +427,10 @@
     "energy markets": 1,
     "labour": 1,
     "justice": 1,
-    "payment_systems": 1,
-    "public_finance": 1,
+    "payment-systems": 1,
+    "public-finance": 1,
     "production": 1,
-    "labor_market": 1,
+    "labor-market": 1,
     "social-development": 1,
     "social-policy": 1,
     "food-security": 1,
@@ -446,8 +442,8 @@
     "electricity": 1,
     "nuclear energy": 1,
     "markets": 1,
-    "environmental_science": 1,
-    "atmospheric_science": 1,
+    "environmental-science": 1,
+    "atmospheric-science": 1,
     "gdp": 1,
     "personal income": 1,
     "consumer spending": 1,
@@ -530,14 +526,10 @@
     "energy-efficiency": 1,
     "urban-development": 1,
     "real-estate": 1,
-    "reproductive_health": 1,
-    "gender_equality": 1,
-    "youth_development": 1,
-    "sustainable_development": 1,
+    "youth-development": 1,
+    "sustainable-development": 1,
     "population-development": 1,
     "slums": 1,
-    "reproductive-health": 1,
-    "gender-equality": 1,
     "labor market": 1,
     "poverty and inequality": 1,
     "communications": 1,
@@ -597,7 +589,7 @@
     "respiratory diseases": 1,
     "vaccines": 1,
     "global health": 1,
-    "water_utilities": 1,
+    "water-utilities": 1,
     "ict": 1,
     "trademarks": 1,
     "conservation": 1,
diff --git a/firstdata/sources/academic/environment/copernicus-open-access-hub.json b/firstdata/sources/academic/environment/copernicus-open-access-hub.json
index fd09766..49966ef 100644
--- a/firstdata/sources/academic/environment/copernicus-open-access-hub.json
+++ b/firstdata/sources/academic/environment/copernicus-open-access-hub.json
@@ -18,7 +18,7 @@
     "ocean",
     "land",
     "atmosphere",
-    "disaster_management"
+    "disaster-management"
   ],
   "geographic_scope": "global",
   "update_frequency": "daily",
@@ -52,4 +52,4 @@
     ]
   },
   "authority_level": "international"
-}
\ No newline at end of file
+}
diff --git a/firstdata/sources/academic/health/clinicaltrials-gov.json b/firstdata/sources/academic/health/clinicaltrials-gov.json
index d7b40a4..6f4f6db 100644
--- a/firstdata/sources/academic/health/clinicaltrials-gov.json
+++ b/firstdata/sources/academic/health/clinicaltrials-gov.json
@@ -14,8 +14,8 @@
   "country": null,
   "domains": [
     "health",
-    "clinical_research",
-    "medical_trials"
+    "clinical-research",
+    "medical-trials"
   ],
   "geographic_scope": "global",
   "update_frequency": "daily",
@@ -57,4 +57,4 @@
     ]
   },
   "authority_level": "government"
-}
\ No newline at end of file
+}
diff --git a/firstdata/sources/academic/health/pubmed.json b/firstdata/sources/academic/health/pubmed.json
index be67868..917d835 100644
--- a/firstdata/sources/academic/health/pubmed.json
+++ b/firstdata/sources/academic/health/pubmed.json
@@ -15,7 +15,7 @@
   "domains": [
     "health",
     "biomedical",
-    "life_sciences"
+    "life-sciences"
   ],
   "geographic_scope": "global",
   "update_frequency": "daily",
@@ -57,4 +57,4 @@
     ]
   },
   "authority_level": "government"
-}
\ No newline at end of file
+}
diff --git a/firstdata/sources/china/economy/labor/china-mohrss.json b/firstdata/sources/china/economy/labor/china-mohrss.json
index 38a898e..e2b13e3 100644
--- a/firstdata/sources/china/economy/labor/china-mohrss.json
+++ b/firstdata/sources/china/economy/labor/china-mohrss.json
@@ -16,7 +16,7 @@
   "geographic_scope": "national",
   "domains": [
     "employment",
-    "social_security",
+    "social-security",
     "economics"
   ],
   "update_frequency": "quarterly",
diff --git a/firstdata/sources/china/economy/trade/customs.json b/firstdata/sources/china/economy/trade/customs.json
index b499ad1..79d8eef 100644
--- a/firstdata/sources/china/economy/trade/customs.json
+++ b/firstdata/sources/china/economy/trade/customs.json
@@ -16,7 +16,7 @@
   "domains": [
     "trade",
     "economics",
-    "international_commerce"
+    "international-commerce"
   ],
   "geographic_scope": "national",
   "update_frequency": "monthly",
@@ -55,4 +55,4 @@
     ]
   },
   "authority_level": "government"
-}
\ No newline at end of file
+}
diff --git a/firstdata/sources/china/education/higher_education/china-moe-higher-education.json b/firstdata/sources/china/education/higher_education/china-moe-higher-education.json
index 644c58b..081a58c 100644
--- a/firstdata/sources/china/education/higher_education/china-moe-higher-education.json
+++ b/firstdata/sources/china/education/higher_education/china-moe-higher-education.json
@@ -15,7 +15,7 @@
   "country": "CN",
   "domains": [
     "education",
-    "higher_education",
+    "higher-education",
     "statistics"
   ],
   "geographic_scope": "national",
diff --git a/firstdata/sources/china/finance/banking/pbc.json b/firstdata/sources/china/finance/banking/pbc.json
index b63cf53..e91c56a 100644
--- a/firstdata/sources/china/finance/banking/pbc.json
+++ b/firstdata/sources/china/finance/banking/pbc.json
@@ -16,7 +16,7 @@
   "domains": [
     "finance",
     "economics",
-    "monetary_policy"
+    "monetary-policy"
   ],
   "geographic_scope": "national",
   "update_frequency": "monthly",
@@ -55,4 +55,4 @@
     ]
   },
   "authority_level": "government"
-}
\ No newline at end of file
+}
diff --git a/firstdata/sources/china/finance/securities/csrc.json b/firstdata/sources/china/finance/securities/csrc.json
index 77d4669..1f15767 100644
--- a/firstdata/sources/china/finance/securities/csrc.json
+++ b/firstdata/sources/china/finance/securities/csrc.json
@@ -16,7 +16,7 @@
   "domains": [
     "finance",
     "securities",
-    "capital_markets"
+    "capital-markets"
   ],
   "geographic_scope": "national",
   "update_frequency": "monthly",
@@ -55,4 +55,4 @@
     ]
   },
   "authority_level": "government"
-}
\ No newline at end of file
+}
diff --git a/firstdata/sources/china/finance/securities/hkex.json b/firstdata/sources/china/finance/securities/hkex.json
index dd82d8a..3aab7f2 100644
--- a/firstdata/sources/china/finance/securities/hkex.json
+++ b/firstdata/sources/china/finance/securities/hkex.json
@@ -17,7 +17,7 @@
     "finance",
     "securities",
     "derivatives",
-    "capital_markets"
+    "capital-markets"
   ],
   "geographic_scope": "regional",
   "update_frequency": "real-time",
@@ -62,4 +62,4 @@
     ]
   },
   "authority_level": "commercial"
-}
\ No newline at end of file
+}
diff --git a/firstdata/sources/china/resources/environment/china-mee.json b/firstdata/sources/china/resources/environment/china-mee.json
index 809c6a6..e7454ae 100644
--- a/firstdata/sources/china/resources/environment/china-mee.json
+++ b/firstdata/sources/china/resources/environment/china-mee.json
@@ -17,7 +17,7 @@
   "domains": [
     "environment",
     "climate",
-    "public_health"
+    "public-health"
   ],
   "update_frequency": "monthly",
   "tags": [
diff --git a/firstdata/sources/china/technology/digital_economy/china-national-data-bureau.json b/firstdata/sources/china/technology/digital_economy/china-national-data-bureau.json
index e1b42c5..8b5cc5f 100644
--- a/firstdata/sources/china/technology/digital_economy/china-national-data-bureau.json
+++ b/firstdata/sources/china/technology/digital_economy/china-national-data-bureau.json
@@ -14,9 +14,9 @@
   "authority_level": "government",
   "country": "CN",
   "domains": [
-    "digital_economy",
-    "data_governance",
-    "digital_infrastructure"
+    "digital-economy",
+    "data-governance",
+    "digital-infrastructure"
   ],
   "geographic_scope": "national",
   "update_frequency": "irregular",
diff --git a/firstdata/sources/china/technology/intellectual_property/china-cnipa-patents.json b/firstdata/sources/china/technology/intellectual_property/china-cnipa-patents.json
index 4c65aa4..44dd1d4 100644
--- a/firstdata/sources/china/technology/intellectual_property/china-cnipa-patents.json
+++ b/firstdata/sources/china/technology/intellectual_property/china-cnipa-patents.json
@@ -16,7 +16,7 @@
   "geographic_scope": "national",
   "domains": [
     "technology",
-    "intellectual_property",
+    "intellectual-property",
     "innovation"
   ],
   "update_frequency": "monthly",
diff --git a/firstdata/sources/countries/asia/hkma.json b/firstdata/sources/countries/asia/hkma.json
index 6343693..05d3ada 100644
--- a/firstdata/sources/countries/asia/hkma.json
+++ b/firstdata/sources/countries/asia/hkma.json
@@ -19,7 +19,7 @@
     "finance",
     "economics",
     "banking",
-    "monetary_policy"
+    "monetary-policy"
   ],
   "tags": [
     "monetary authority",
diff --git a/firstdata/sources/countries/asia/korea/korea-bok.json b/firstdata/sources/countries/asia/korea/korea-bok.json
index 20cdd22..ab63932 100644
--- a/firstdata/sources/countries/asia/korea/korea-bok.json
+++ b/firstdata/sources/countries/asia/korea/korea-bok.json
@@ -14,17 +14,17 @@
   "api_url": "https://ecos.bok.or.kr",
   "country": "KR",
   "domains": [
-    "monetary_policy",
-    "financial_statistics",
-    "national_accounts",
-    "balance_of_payments",
-    "price_indices",
-    "interest_rates",
-    "exchange_rates",
-    "business_surveys",
-    "consumer_surveys",
-    "flow_of_funds",
-    "banking_statistics"
+    "monetary-policy",
+    "financial-statistics",
+    "national-accounts",
+    "balance-of-payments",
+    "price-indices",
+    "interest-rates",
+    "exchange-rates",
+    "business-surveys",
+    "consumer-surveys",
+    "flow-of-funds",
+    "banking-statistics"
   ],
   "geographic_scope": "national",
   "update_frequency": "daily",
@@ -82,4 +82,4 @@
     ]
   },
   "authority_level": "government"
-}
\ No newline at end of file
+}
diff --git a/firstdata/sources/countries/asia/vietnam/vietnam-fia.json b/firstdata/sources/countries/asia/vietnam/vietnam-fia.json
index d40b5b6..9a19641 100644
--- a/firstdata/sources/countries/asia/vietnam/vietnam-fia.json
+++ b/firstdata/sources/countries/asia/vietnam/vietnam-fia.json
@@ -13,11 +13,11 @@
   "authority_level": "government",
   "country": "VN",
   "domains": [
-    "foreign_direct_investment",
-    "investment_policy",
-    "economic_development",
+    "foreign-direct-investment",
+    "investment-policy",
+    "economic-development",
     "trade",
-    "business_registration"
+    "business-registration"
   ],
   "geographic_scope": "national",
   "update_frequency": "monthly",
diff --git a/firstdata/sources/countries/europe/bank-of-england-statistics.json b/firstdata/sources/countries/europe/bank-of-england-statistics.json
index eeeddea..25c6717 100644
--- a/firstdata/sources/countries/europe/bank-of-england-statistics.json
+++ b/firstdata/sources/countries/europe/bank-of-england-statistics.json
@@ -16,7 +16,7 @@
   "domains": [
     "finance",
     "economics",
-    "monetary_policy"
+    "monetary-policy"
   ],
   "geographic_scope": "national",
   "data_content": {
diff --git a/firstdata/sources/countries/north-america/canada/canada-boc.json b/firstdata/sources/countries/north-america/canada/canada-boc.json
index 2e40e4f..19240ba 100644
--- a/firstdata/sources/countries/north-america/canada/canada-boc.json
+++ b/firstdata/sources/countries/north-america/canada/canada-boc.json
@@ -14,13 +14,13 @@
   "api_url": "https://www.bankofcanada.ca/valet/docs",
   "country": "CA",
   "domains": [
-    "monetary_policy",
-    "exchange_rates",
-    "interest_rates",
+    "monetary-policy",
+    "exchange-rates",
+    "interest-rates",
     "inflation",
     "banking",
-    "financial_markets",
-    "economic_indicators"
+    "financial-markets",
+    "economic-indicators"
   ],
   "geographic_scope": "national",
   "update_frequency": "daily",
@@ -72,4 +72,4 @@
     ]
   },
   "authority_level": "government"
-}
\ No newline at end of file
+}
diff --git a/firstdata/sources/countries/north-america/canada/canada-cihi.json b/firstdata/sources/countries/north-america/canada/canada-cihi.json
index 7755c69..2ed8fa1 100644
--- a/firstdata/sources/countries/north-america/canada/canada-cihi.json
+++ b/firstdata/sources/countries/north-america/canada/canada-cihi.json
@@ -14,18 +14,18 @@
   "api_url": "https://www.cihi.ca/en/submit-data-and-view-standards/codes-and-classifications",
   "country": "CA",
   "domains": [
-    "health_care",
-    "hospital_services",
+    "health-care",
+    "hospital-services",
     "pharmaceuticals",
-    "medical_imaging",
-    "emergency_care",
-    "mental_health",
-    "continuing_care",
-    "health_spending",
-    "health_workforce",
-    "population_health",
-    "patient_outcomes",
-    "health_system_performance"
+    "medical-imaging",
+    "emergency-care",
+    "mental-health",
+    "continuing-care",
+    "health-spending",
+    "health-workforce",
+    "population-health",
+    "patient-outcomes",
+    "health-system-performance"
   ],
   "geographic_scope": "national",
   "update_frequency": "quarterly",
@@ -84,4 +84,4 @@
     ]
   },
   "authority_level": "government"
-}
\ No newline at end of file
+}
diff --git a/firstdata/sources/countries/north-america/mexico/banxico.json b/firstdata/sources/countries/north-america/mexico/banxico.json
index 7154782..e3dd46f 100644
--- a/firstdata/sources/countries/north-america/mexico/banxico.json
+++ b/firstdata/sources/countries/north-america/mexico/banxico.json
@@ -14,16 +14,16 @@
   "api_url": "https://www.banxico.org.mx/SieAPIRest/service/v1/",
   "country": "MX",
   "domains": [
-    "monetary_policy",
-    "financial_markets",
+    "monetary-policy",
+    "financial-markets",
     "banking",
-    "payment_systems",
-    "exchange_rates",
+    "payment-systems",
+    "exchange-rates",
     "inflation",
-    "balance_of_payments",
-    "public_finance",
+    "balance-of-payments",
+    "public-finance",
     "production",
-    "labor_market"
+    "labor-market"
   ],
   "geographic_scope": "national",
   "update_frequency": "daily",
@@ -79,4 +79,4 @@
     ]
   },
   "authority_level": "government"
-}
\ No newline at end of file
+}
diff --git a/firstdata/sources/countries/north-america/usa/noaa-cdo.json b/firstdata/sources/countries/north-america/usa/noaa-cdo.json
index b507123..2beea10 100644
--- a/firstdata/sources/countries/north-america/usa/noaa-cdo.json
+++ b/firstdata/sources/countries/north-america/usa/noaa-cdo.json
@@ -15,8 +15,8 @@
   "domains": [
     "climate",
     "meteorology",
-    "environmental_science",
-    "atmospheric_science"
+    "environmental-science",
+    "atmospheric-science"
   ],
   "geographic_scope": "global",
   "update_frequency": "daily",
@@ -66,4 +66,4 @@
     ]
   },
   "authority_level": "government"
-}
\ No newline at end of file
+}
diff --git a/firstdata/sources/international/demographics/unfpa-china.json b/firstdata/sources/international/demographics/unfpa-china.json
index 68d16b6..8a83c6a 100644
--- a/firstdata/sources/international/demographics/unfpa-china.json
+++ b/firstdata/sources/international/demographics/unfpa-china.json
@@ -18,10 +18,10 @@
     "population",
     "demographics",
     "health",
-    "reproductive_health",
-    "gender_equality",
-    "youth_development",
-    "sustainable_development"
+    "reproductive-health",
+    "gender-equality",
+    "youth-development",
+    "sustainable-development"
   ],
   "update_frequency": "irregular",
   "tags": [
diff --git a/firstdata/sources/international/infrastructure/unctad-infrastructure-statistics.json b/firstdata/sources/international/infrastructure/unctad-infrastructure-statistics.json
index 27c4451..1152679 100644
--- a/firstdata/sources/international/infrastructure/unctad-infrastructure-statistics.json
+++ b/firstdata/sources/international/infrastructure/unctad-infrastructure-statistics.json
@@ -18,7 +18,7 @@
     "transport",
     "telecommunications",
     "energy",
-    "water_utilities",
+    "water-utilities",
     "ict"
   ],
   "geographic_scope": "global",