diff --git a/global-test/profile_data/weather_bait/dataset.json5 b/global-test/profile_data/weather_bait/dataset.json5
index 958f637..a75582e 100644
--- a/global-test/profile_data/weather_bait/dataset.json5
+++ b/global-test/profile_data/weather_bait/dataset.json5
@@ -23,7 +23,7 @@
             type: "geography",
             "class": "Geography",
             name: "country",
-            file: "../../dimensions/countries.csv",
+            file: "dimensions/countries.csv",
         },
         {
             type: "metric",
@@ -94,8 +94,8 @@
                 day_column: "day",
             },
             time_zone_format: {
-              format_type: "aligned_in_clock_time",
-              time_zones: ["Europe/Brussels", "Asia/Bangkok"],
+              format_type: "aligned_in_std_clock_time",
+              time_zones: ["Etc/GMT-1", "Etc/GMT-7"],
             },
         },
     ],
diff --git a/global-test/profile_data/weather_bait/dimensions/countries.csv b/global-test/profile_data/weather_bait/dimensions/countries.csv
new file mode 100644
index 0000000..4a4c5e0
--- /dev/null
+++ b/global-test/profile_data/weather_bait/dimensions/countries.csv
@@ -0,0 +1,3 @@
+id,name,time_zone
+country_1,Country 1,Etc/GMT-1
+country_2,Country 2,Etc/GMT-7
\ No newline at end of file
diff --git a/global/dimensions/countries.csv b/global/dimensions/countries.csv
index b8e6366..ec5c778 100644
--- a/global/dimensions/countries.csv
+++ b/global/dimensions/countries.csv
@@ -121,7 +121,7 @@ Slovenia,Slovenia,Europe/Belgrade
 South Africa,South Africa,Africa/Johannesburg
 South Korea,South Korea,Asia/Seoul
 Spain,Spain,Europe/Madrid
-Sri Lanka,Sri Lanka,Asia/Colombo
+Sri Lanka,Sri Lanka,Asia/Kolkata
 Sudan,Sudan,Africa/Khartoum
 Suriname,Suriname,America/Paramaribo
 Sweden,Sweden,Europe/Berlin
diff --git a/global/profile_data/weather_bait/dataset.json5 b/global/profile_data/weather_bait/dataset.json5
index fbfb885..417ac4f 100644
--- a/global/profile_data/weather_bait/dataset.json5
+++ b/global/profile_data/weather_bait/dataset.json5
@@ -25,7 +25,7 @@
             module: "dsgrid.dimension.standard",
             name: "country",
             description: "All countries available for analysis in STRIDE",
-            file: "../../dimensions/countries.csv",
+            file: "dimensions/countries.csv",
         },
         {
             type: "metric",
@@ -81,113 +81,29 @@
             module: "dsgrid.dimension.standard",
             "class": "Time",
             time_zone_format: {
-                format_type: "aligned_in_clock_time",
+                format_type: "aligned_in_std_clock_time",
                 time_zones: [
-                    "Africa/Abidjan",
-                    "Africa/Algiers",
-                    "Africa/Cairo",
-                    "Africa/Casablanca",
-                    "Africa/Johannesburg",
-                    "Africa/Khartoum",
-                    "Africa/Lagos",
-                    "Africa/Maputo",
-                    "Africa/Nairobi",
-                    "Africa/Ndjamena",
-                    "Africa/Tripoli",
-                    "Africa/Tunis",
-                    "Africa/Windhoek",
-                    "America/Argentina/Buenos_Aires",
-                    "America/Asuncion",
-                    "America/Bogota",
-                    "America/Caracas",
-                    "America/Chicago",
-                    "America/Costa_Rica",
-                    "America/El_Salvador",
-                    "America/Fortaleza",
-                    "America/Guatemala",
-                    "America/Guayaquil",
-                    "America/Guyana",
-                    "America/Havana",
-                    "America/Jamaica",
-                    "America/La_Paz",
-                    "America/Lima",
-                    "America/Managua",
-                    "America/Mexico_City",
-                    "America/Montevideo",
-                    "America/Panama",
-                    "America/Paramaribo",
-                    "America/Port-au-Prince",
-                    "America/Puerto_Rico",
-                    "America/Rankin_Inlet",
-                    "America/Santiago",
-                    "America/Santo_Domingo",
-                    "America/Tegucigalpa",
-                    "Asia/Almaty",
-                    "Asia/Amman",
-                    "Asia/Ashgabat",
-                    "Asia/Baghdad",
-                    "Asia/Baku",
-                    "Asia/Bangkok",
-                    "Asia/Beirut",
-                    "Asia/Bishkek",
-                    "Asia/Colombo",
-                    "Asia/Damascus",
-                    "Asia/Dhaka",
-                    "Asia/Dubai",
-                    "Asia/Dushanbe",
-                    "Asia/Famagusta",
-                    "Asia/Gaza",
-                    "Asia/Hong_Kong",
-                    "Asia/Jerusalem",
-                    "Asia/Karachi",
+                    // "Asia/Colombo", // Sri Lanka's time zone had offset changes in 1996 and 2006, so we use Asia/Kolkata instead
                     "Asia/Kathmandu",
                     "Asia/Kolkata",
-                    "Asia/Kuching",
-                    "Asia/Makassar",
-                    "Asia/Manila",
-                    "Asia/Qatar",
-                    "Asia/Riyadh",
-                    "Asia/Samarkand",
-                    "Asia/Seoul",
-                    "Asia/Shanghai",
-                    "Asia/Singapore",
-                    "Asia/Tbilisi",
-                    "Asia/Tehran",
-                    "Asia/Tokyo",
-                    "Asia/Ulaanbaatar",
+                    // "Asia/Tehran", // Iran's time zone has offset +3:30 and +4:30, so we use Etc/GMT-4 instead
                     "Asia/Yangon",
-                    "Asia/Yerevan",
-                    "Australia/Brisbane",
-                    "Europe/Athens",
-                    "Europe/Belgrade",
-                    "Europe/Berlin",
-                    "Europe/Brussels",
-                    "Europe/Bucharest",
-                    "Europe/Budapest",
-                    "Europe/Chisinau",
-                    "Europe/Dublin",
-                    "Europe/Helsinki",
-                    "Europe/Istanbul",
-                    "Europe/Kyiv",
-                    "Europe/Lisbon",
-                    "Europe/London",
-                    "Europe/Madrid",
-                    "Europe/Malta",
-                    "Europe/Minsk",
-                    "Europe/Moscow",
-                    "Europe/Paris",
-                    "Europe/Prague",
-                    "Europe/Riga",
-                    "Europe/Rome",
-                    "Europe/Sofia",
-                    "Europe/Tallinn",
-                    "Europe/Tirane",
-                    "Europe/Vienna",
-                    "Europe/Vilnius",
-                    "Europe/Warsaw",
-                    "Europe/Zurich",
-                    "Indian/Mauritius",
-                    "Pacific/Auckland",
+                    "Etc/GMT+6",
+                    "Etc/GMT+5",
+                    "Etc/GMT+4",
+                    "Etc/GMT+3",
+                    "Etc/GMT",
+                    "Etc/GMT-1",
+                    "Etc/GMT-2",
+                    "Etc/GMT-3",
+                    "Etc/GMT-4",
+                    "Etc/GMT-5",
+                    "Etc/GMT-6",
+                    "Etc/GMT-7",
+                    "Etc/GMT-8",
+                    "Etc/GMT-9",
+                    "Etc/GMT-10",
+                    "Etc/GMT-13",
                 ],
             },
             measurement_type: "total",
diff --git a/global/profile_data/weather_bait/dimensions/countries.csv b/global/profile_data/weather_bait/dimensions/countries.csv
new file mode 100644
index 0000000..528106d
--- /dev/null
+++ b/global/profile_data/weather_bait/dimensions/countries.csv
@@ -0,0 +1,149 @@
+id,name,time_zone
+Albania,Albania,Etc/GMT-1
+Algeria,Algeria,Etc/GMT-1
+Angola,Angola,Etc/GMT-1
+Argentina,Argentina,Etc/GMT+3
+Armenia,Armenia,Etc/GMT-4
+Australia,Australia,Etc/GMT-10
+Austria,Austria,Etc/GMT-1
+Azerbaijan,Azerbaijan,Etc/GMT-4
+Bahrain,Bahrain,Etc/GMT-3
+Bangladesh,Bangladesh,Etc/GMT-6
+Belarus,Belarus,Etc/GMT-3
+Belgium,Belgium,Etc/GMT-1
+Benin,Benin,Etc/GMT-1
+Bolivia,Bolivia,Etc/GMT+4
+Bosnia and Herzegovina,Bosnia And Herzegovina,Etc/GMT-1
+Botswana,Botswana,Etc/GMT-2
+Brazil,Brazil,Etc/GMT+3
+Brunei,Brunei,Etc/GMT-8
+Bulgaria,Bulgaria,Etc/GMT-2
+Burkina Faso,Burkina Faso,Etc/GMT
+Cambodia,Cambodia,Etc/GMT-7
+Cameroon,Cameroon,Etc/GMT-1
+Canada,Canada,Etc/GMT+6
+Chad,Chad,Etc/GMT-1
+Chile,Chile,Etc/GMT+3
+China,China,Etc/GMT-8
+Colombia,Colombia,Etc/GMT+5
+Congo,Congo,Etc/GMT-1
+Costa Rica,Costa Rica,Etc/GMT+6
+Croatia,Croatia,Etc/GMT-1
+Cuba,Cuba,Etc/GMT+5
+Cyprus,Cyprus,Etc/GMT-2
+Czech Republic,Czech Republic,Etc/GMT-1
+Denmark,Denmark,Etc/GMT-1
+Dominican Republic,Dominican Republic,Etc/GMT+4
+Ecuador,Ecuador,Etc/GMT+5
+Egypt,Egypt,Etc/GMT-2
+El Salvador,El Salvador,Etc/GMT+6
+Equatorial Guinea,Equatorial Guinea,Etc/GMT-1
+Eritrea,Eritrea,Etc/GMT-3
+Estonia,Estonia,Etc/GMT-2
+Eswatini,Eswatini,Etc/GMT-2
+Ethiopia,Ethiopia,Etc/GMT-3
+Finland,Finland,Etc/GMT-2
+France,France,Etc/GMT-1
+Gabon,Gabon,Etc/GMT-1
+Georgia,Georgia,Etc/GMT-4
+Germany,Germany,Etc/GMT-1
+Ghana,Ghana,Etc/GMT
+Greece,Greece,Etc/GMT-2
+Guatemala,Guatemala,Etc/GMT+6
+Guyana,Guyana,Etc/GMT+4
+Haiti,Haiti,Etc/GMT+5
+Honduras,Honduras,Etc/GMT+6
+Hong Kong,Hong Kong,Etc/GMT-8
+Hungary,Hungary,Etc/GMT-1
+Iceland,Iceland,Etc/GMT
+India,India,Asia/Kolkata
+Indonesia,Indonesia,Etc/GMT-8
+Iran,Iran,Etc/GMT-4
+Iraq,Iraq,Etc/GMT-3
+Ireland,Ireland,Etc/GMT
+Israel,Israel,Etc/GMT-2
+Italy,Italy,Etc/GMT-1
+Ivory Coast,Ivory Coast,Etc/GMT
+Jamaica,Jamaica,Etc/GMT+5
+Japan,Japan,Etc/GMT-9
+Jordan,Jordan,Etc/GMT-3
+Kazakhstan,Kazakhstan,Etc/GMT-5
+Kenya,Kenya,Etc/GMT-3
+Kuwait,Kuwait,Etc/GMT-3
+Kyrgyzstan,Kyrgyzstan,Etc/GMT-6
+Laos,Laos,Etc/GMT-7
+Latvia,Latvia,Etc/GMT-2
+Lebanon,Lebanon,Etc/GMT-2
+Libya,Libya,Etc/GMT-2
+Lithuania,Lithuania,Etc/GMT-2
+Luxembourg,Luxembourg,Etc/GMT-1
+Madagascar,Madagascar,Etc/GMT-3
+Malaysia,Malaysia,Etc/GMT-8
+Mali,Mali,Etc/GMT
+Malta,Malta,Etc/GMT-1
+Mauritania,Mauritania,Etc/GMT
+Mauritius,Mauritius,Etc/GMT-4
+Mexico,Mexico,Etc/GMT+6
+Moldova,Moldova,Etc/GMT-2
+Mongolia,Mongolia,Etc/GMT-8
+Montenegro,Montenegro,Etc/GMT-1
+Morocco,Morocco,Etc/GMT-1
+Mozambique,Mozambique,Etc/GMT-2
+Myanmar,Myanmar,Asia/Yangon
+Namibia,Namibia,Etc/GMT-2
+Nepal,Nepal,Asia/Kathmandu
+Netherlands,Netherlands,Etc/GMT-1
+New Zealand,New Zealand,Etc/GMT-13
+Nicaragua,Nicaragua,Etc/GMT+6
+Niger,Niger,Etc/GMT-1
+Nigeria,Nigeria,Etc/GMT-1
+North Macedonia,North Macedonia,Etc/GMT-1
+Norway,Norway,Etc/GMT-1
+Oman,Oman,Etc/GMT-4
+Pakistan,Pakistan,Etc/GMT-5
+Palestine,Palestine,Etc/GMT-2
+Panama,Panama,Etc/GMT+5
+Paraguay,Paraguay,Etc/GMT+3
+Peru,Peru,Etc/GMT+5
+Philippines,Philippines,Etc/GMT-8
+Poland,Poland,Etc/GMT-1
+Portugal,Portugal,Etc/GMT
+Qatar,Qatar,Etc/GMT-3
+Romania,Romania,Etc/GMT-2
+Russia,Russia,Etc/GMT-3
+Rwanda,Rwanda,Etc/GMT-2
+Saudi Arabia,Saudi Arabia,Etc/GMT-3
+Senegal,Senegal,Etc/GMT
+Serbia,Serbia,Etc/GMT-1
+Singapore,Singapore,Etc/GMT-8
+Slovakia,Slovakia,Etc/GMT-1
+Slovenia,Slovenia,Etc/GMT-1
+South Africa,South Africa,Etc/GMT-2
+South Korea,South Korea,Etc/GMT-9
+Spain,Spain,Etc/GMT-1
+Sri Lanka,Sri Lanka,Asia/Kolkata
+Sudan,Sudan,Etc/GMT-2
+Suriname,Suriname,Etc/GMT+3
+Sweden,Sweden,Etc/GMT-1
+Switzerland,Switzerland,Etc/GMT-1
+Syria,Syria,Etc/GMT-3
+Tajikistan,Tajikistan,Etc/GMT-5
+Tanzania,Tanzania,Etc/GMT-3
+Thailand,Thailand,Etc/GMT-7
+Togo,Togo,Etc/GMT
+Trinidad and Tobago,Trinidad And Tobago,Etc/GMT+4
+Tunisia,Tunisia,Etc/GMT-1
+Turkey,Turkey,Etc/GMT-3
+Turkmenistan,Turkmenistan,Etc/GMT-5
+Uganda,Uganda,Etc/GMT-3
+Ukraine,Ukraine,Etc/GMT-2
+United Arab Emirates,United Arab Emirates,Etc/GMT-4
+United Kingdom,United Kingdom,Etc/GMT
+United States,United States,Etc/GMT+6
+Uruguay,Uruguay,Etc/GMT+3
+Uzbekistan,Uzbekistan,Etc/GMT-5
+Venezuela,Venezuela,Etc/GMT+4
+Vietnam,Vietnam,Etc/GMT-7
+Yemen,Yemen,Etc/GMT-3
+Zambia,Zambia,Etc/GMT-2
+Zimbabwe,Zimbabwe,Etc/GMT-2