diff --git a/parsers/test/__snapshots__/test_FR.ambr b/parsers/test/__snapshots__/test_FR.ambr
new file mode 100644
index 0000000000..cf19e298fb
--- /dev/null
+++ b/parsers/test/__snapshots__/test_FR.ambr
@@ -0,0 +1,1083 @@
+# serializer version: 1
+# name: test_production
+  list([
+    dict({
+      'correctedModes': list([
+      ]),
+      'datetime': datetime.datetime(2023, 9, 21, 2, 0, tzinfo=zoneinfo.ZoneInfo(key='Europe/Paris')),
+      'production': dict({
+        'biomass': 676.5,
+        'coal': 7.0,
+        'gas': 431.5,
+        'hydro': 3457.0,
+        'nuclear': 35323.0,
+        'oil': 114.0,
+        'solar': 0.0,
+        'wind': 9451.5,
+      }),
+      'source': 'opendata.reseaux-energies.fr',
+      'sourceType': <EventSourceType.measured: 'measured'>,
+      'storage': dict({
+        'battery': 2.0,
+        'hydro': 781.0,
+      }),
+      'zoneKey': 'FR',
+    }),
+    dict({
+      'correctedModes': list([
+      ]),
+      'datetime': datetime.datetime(2023, 9, 21, 2, 30, tzinfo=zoneinfo.ZoneInfo(key='Europe/Paris')),
+      'production': dict({
+        'biomass': 676.5,
+        'coal': 7.0,
+        'gas': 446.5,
+        'hydro': 3490.0,
+        'nuclear': 34656.0,
+        'oil': 114.0,
+        'solar': 0.0,
+        'wind': 9097.5,
+      }),
+      'source': 'opendata.reseaux-energies.fr',
+      'sourceType': <EventSourceType.measured: 'measured'>,
+      'storage': dict({
+        'battery': 1.5,
+        'hydro': 1097.5,
+      }),
+      'zoneKey': 'FR',
+    }),
+    dict({
+      'correctedModes': list([
+      ]),
+      'datetime': datetime.datetime(2023, 9, 21, 3, 0, tzinfo=zoneinfo.ZoneInfo(key='Europe/Paris')),
+      'production': dict({
+        'biomass': 677.0,
+        'coal': 7.0,
+        'gas': 414.0,
+        'hydro': 3407.5,
+        'nuclear': 34372.5,
+        'oil': 114.0,
+        'solar': 0.0,
+        'wind': 9050.0,
+      }),
+      'source': 'opendata.reseaux-energies.fr',
+      'sourceType': <EventSourceType.measured: 'measured'>,
+      'storage': dict({
+        'battery': 4.5,
+        'hydro': 1423.0,
+      }),
+      'zoneKey': 'FR',
+    }),
+    dict({
+      'correctedModes': list([
+      ]),
+      'datetime': datetime.datetime(2023, 9, 21, 3, 30, tzinfo=zoneinfo.ZoneInfo(key='Europe/Paris')),
+      'production': dict({
+        'biomass': 676.5,
+        'coal': 7.0,
+        'gas': 434.0,
+        'hydro': 3184.0,
+        'nuclear': 34508.0,
+        'oil': 114.0,
+        'solar': 0.0,
+        'wind': 8904.5,
+      }),
+      'source': 'opendata.reseaux-energies.fr',
+      'sourceType': <EventSourceType.measured: 'measured'>,
+      'storage': dict({
+        'battery': 8.5,
+        'hydro': 1422.5,
+      }),
+      'zoneKey': 'FR',
+    }),
+    dict({
+      'correctedModes': list([
+      ]),
+      'datetime': datetime.datetime(2023, 9, 21, 4, 0, tzinfo=zoneinfo.ZoneInfo(key='Europe/Paris')),
+      'production': dict({
+        'biomass': 677.0,
+        'coal': 7.0,
+        'gas': 414.0,
+        'hydro': 3207.0,
+        'nuclear': 34517.5,
+        'oil': 114.0,
+        'solar': 0.0,
+        'wind': 8366.0,
+      }),
+      'source': 'opendata.reseaux-energies.fr',
+      'sourceType': <EventSourceType.measured: 'measured'>,
+      'storage': dict({
+        'battery': 5.0,
+        'hydro': 1422.0,
+      }),
+      'zoneKey': 'FR',
+    }),
+    dict({
+      'correctedModes': list([
+      ]),
+      'datetime': datetime.datetime(2023, 9, 21, 4, 30, tzinfo=zoneinfo.ZoneInfo(key='Europe/Paris')),
+      'production': dict({
+        'biomass': 676.0,
+        'coal': 7.0,
+        'gas': 461.0,
+        'hydro': 3227.5,
+        'nuclear': 34874.5,
+        'oil': 114.0,
+        'solar': 0.0,
+        'wind': 7937.5,
+      }),
+      'source': 'opendata.reseaux-energies.fr',
+      'sourceType': <EventSourceType.measured: 'measured'>,
+      'storage': dict({
+        'battery': 3.0,
+        'hydro': 1421.5,
+      }),
+      'zoneKey': 'FR',
+    }),
+    dict({
+      'correctedModes': list([
+      ]),
+      'datetime': datetime.datetime(2023, 9, 21, 5, 0, tzinfo=zoneinfo.ZoneInfo(key='Europe/Paris')),
+      'production': dict({
+        'biomass': 676.5,
+        'coal': 7.0,
+        'gas': 458.5,
+        'hydro': 3386.0,
+        'nuclear': 35173.5,
+        'oil': 114.0,
+        'solar': 0.0,
+        'wind': 7489.5,
+      }),
+      'source': 'opendata.reseaux-energies.fr',
+      'sourceType': <EventSourceType.measured: 'measured'>,
+      'storage': dict({
+        'battery': 3.5,
+        'hydro': 1256.5,
+      }),
+      'zoneKey': 'FR',
+    }),
+    dict({
+      'correctedModes': list([
+      ]),
+      'datetime': datetime.datetime(2023, 9, 21, 5, 30, tzinfo=zoneinfo.ZoneInfo(key='Europe/Paris')),
+      'production': dict({
+        'biomass': 676.5,
+        'coal': 7.0,
+        'gas': 601.5,
+        'hydro': 3732.0,
+        'nuclear': 36085.5,
+        'oil': 114.0,
+        'solar': 0.0,
+        'wind': 6962.5,
+      }),
+      'source': 'opendata.reseaux-energies.fr',
+      'sourceType': <EventSourceType.measured: 'measured'>,
+      'storage': dict({
+        'battery': -0.0,
+        'hydro': 932.5,
+      }),
+      'zoneKey': 'FR',
+    }),
+    dict({
+      'correctedModes': list([
+      ]),
+      'datetime': datetime.datetime(2023, 9, 21, 6, 0, tzinfo=zoneinfo.ZoneInfo(key='Europe/Paris')),
+      'production': dict({
+        'biomass': 674.0,
+        'coal': 7.0,
+        'gas': 808.5,
+        'hydro': 3954.0,
+        'nuclear': 36718.5,
+        'oil': 113.0,
+        'solar': 0.0,
+        'wind': 6596.0,
+      }),
+      'source': 'opendata.reseaux-energies.fr',
+      'sourceType': <EventSourceType.measured: 'measured'>,
+      'storage': dict({
+        'battery': 12.0,
+        'hydro': 586.0,
+      }),
+      'zoneKey': 'FR',
+    }),
+    dict({
+      'correctedModes': list([
+      ]),
+      'datetime': datetime.datetime(2023, 9, 21, 6, 30, tzinfo=zoneinfo.ZoneInfo(key='Europe/Paris')),
+      'production': dict({
+        'biomass': 675.5,
+        'coal': 7.0,
+        'gas': 938.5,
+        'hydro': 4244.0,
+        'nuclear': 37910.5,
+        'oil': 114.0,
+        'solar': 0.0,
+        'wind': 6485.5,
+      }),
+      'source': 'opendata.reseaux-energies.fr',
+      'sourceType': <EventSourceType.measured: 'measured'>,
+      'storage': dict({
+        'battery': -2.5,
+        'hydro': -323.0,
+      }),
+      'zoneKey': 'FR',
+    }),
+    dict({
+      'correctedModes': list([
+      ]),
+      'datetime': datetime.datetime(2023, 9, 21, 7, 0, tzinfo=zoneinfo.ZoneInfo(key='Europe/Paris')),
+      'production': dict({
+        'biomass': 674.5,
+        'coal': 7.0,
+        'gas': 1133.0,
+        'hydro': 4394.0,
+        'nuclear': 38387.5,
+        'oil': 114.0,
+        'solar': 376.0,
+        'wind': 5863.0,
+      }),
+      'source': 'opendata.reseaux-energies.fr',
+      'sourceType': <EventSourceType.measured: 'measured'>,
+      'storage': dict({
+        'battery': 5.0,
+        'hydro': -667.0,
+      }),
+      'zoneKey': 'FR',
+    }),
+    dict({
+      'correctedModes': list([
+      ]),
+      'datetime': datetime.datetime(2023, 9, 21, 7, 30, tzinfo=zoneinfo.ZoneInfo(key='Europe/Paris')),
+      'production': dict({
+        'biomass': 674.5,
+        'coal': 7.0,
+        'gas': 1158.0,
+        'hydro': 4696.0,
+        'nuclear': 38681.0,
+        'oil': 114.0,
+        'solar': 401.5,
+        'wind': 5586.5,
+      }),
+      'source': 'opendata.reseaux-energies.fr',
+      'sourceType': <EventSourceType.measured: 'measured'>,
+      'storage': dict({
+        'battery': 1.0,
+        'hydro': -1045.0,
+      }),
+      'zoneKey': 'FR',
+    }),
+    dict({
+      'correctedModes': list([
+      ]),
+      'datetime': datetime.datetime(2023, 9, 21, 8, 0, tzinfo=zoneinfo.ZoneInfo(key='Europe/Paris')),
+      'production': dict({
+        'biomass': 673.5,
+        'coal': 9.0,
+        'gas': 1379.5,
+        'hydro': 4532.5,
+        'nuclear': 38725.5,
+        'oil': 114.0,
+        'solar': 501.5,
+        'wind': 5789.0,
+      }),
+      'source': 'opendata.reseaux-energies.fr',
+      'sourceType': <EventSourceType.measured: 'measured'>,
+      'storage': dict({
+        'battery': 3.5,
+        'hydro': -956.0,
+      }),
+      'zoneKey': 'FR',
+    }),
+    dict({
+      'correctedModes': list([
+      ]),
+      'datetime': datetime.datetime(2023, 9, 21, 8, 30, tzinfo=zoneinfo.ZoneInfo(key='Europe/Paris')),
+      'production': dict({
+        'biomass': 675.0,
+        'coal': 11.0,
+        'gas': 1595.0,
+        'hydro': 4318.5,
+        'nuclear': 38691.5,
+        'oil': 113.5,
+        'solar': 868.5,
+        'wind': 5908.5,
+      }),
+      'source': 'opendata.reseaux-energies.fr',
+      'sourceType': <EventSourceType.measured: 'measured'>,
+      'storage': dict({
+        'battery': -3.0,
+        'hydro': -882.0,
+      }),
+      'zoneKey': 'FR',
+    }),
+    dict({
+      'correctedModes': list([
+      ]),
+      'datetime': datetime.datetime(2023, 9, 21, 9, 0, tzinfo=zoneinfo.ZoneInfo(key='Europe/Paris')),
+      'production': dict({
+        'biomass': 669.5,
+        'coal': 11.0,
+        'gas': 1601.0,
+        'hydro': 4219.0,
+        'nuclear': 38771.0,
+        'oil': 114.0,
+        'solar': 1387.0,
+        'wind': 5784.0,
+      }),
+      'source': 'opendata.reseaux-energies.fr',
+      'sourceType': <EventSourceType.measured: 'measured'>,
+      'storage': dict({
+        'battery': 1.0,
+        'hydro': -957.0,
+      }),
+      'zoneKey': 'FR',
+    }),
+    dict({
+      'correctedModes': list([
+      ]),
+      'datetime': datetime.datetime(2023, 9, 21, 9, 30, tzinfo=zoneinfo.ZoneInfo(key='Europe/Paris')),
+      'production': dict({
+        'biomass': 668.0,
+        'coal': 11.0,
+        'gas': 1569.0,
+        'hydro': 4074.5,
+        'nuclear': 38720.0,
+        'oil': 113.5,
+        'solar': 2034.0,
+        'wind': 5504.0,
+      }),
+      'source': 'opendata.reseaux-energies.fr',
+      'sourceType': <EventSourceType.measured: 'measured'>,
+      'storage': dict({
+        'battery': 4.5,
+        'hydro': -939.5,
+      }),
+      'zoneKey': 'FR',
+    }),
+    dict({
+      'correctedModes': list([
+      ]),
+      'datetime': datetime.datetime(2023, 9, 21, 10, 0, tzinfo=zoneinfo.ZoneInfo(key='Europe/Paris')),
+      'production': dict({
+        'biomass': 670.5,
+        'coal': 11.0,
+        'gas': 1640.5,
+        'hydro': 4111.0,
+        'nuclear': 38828.5,
+        'oil': 114.0,
+        'solar': 2531.0,
+        'wind': 5099.5,
+      }),
+      'source': 'opendata.reseaux-energies.fr',
+      'sourceType': <EventSourceType.measured: 'measured'>,
+      'storage': dict({
+        'battery': -0.0,
+        'hydro': -902.5,
+      }),
+      'zoneKey': 'FR',
+    }),
+    dict({
+      'correctedModes': list([
+      ]),
+      'datetime': datetime.datetime(2023, 9, 21, 10, 30, tzinfo=zoneinfo.ZoneInfo(key='Europe/Paris')),
+      'production': dict({
+        'biomass': 670.5,
+        'coal': 11.0,
+        'gas': 1668.0,
+        'hydro': 4213.0,
+        'nuclear': 38899.0,
+        'oil': 114.0,
+        'solar': 3213.0,
+        'wind': 4500.0,
+      }),
+      'source': 'opendata.reseaux-energies.fr',
+      'sourceType': <EventSourceType.measured: 'measured'>,
+      'storage': dict({
+        'battery': 0.5,
+        'hydro': -753.0,
+      }),
+      'zoneKey': 'FR',
+    }),
+    dict({
+      'correctedModes': list([
+      ]),
+      'datetime': datetime.datetime(2023, 9, 21, 11, 0, tzinfo=zoneinfo.ZoneInfo(key='Europe/Paris')),
+      'production': dict({
+        'biomass': 670.5,
+        'coal': 11.0,
+        'gas': 1611.0,
+        'hydro': 4379.0,
+        'nuclear': 38879.5,
+        'oil': 132.0,
+        'solar': 3541.5,
+        'wind': 4020.5,
+      }),
+      'source': 'opendata.reseaux-energies.fr',
+      'sourceType': <EventSourceType.measured: 'measured'>,
+      'storage': dict({
+        'battery': 4.5,
+        'hydro': -823.0,
+      }),
+      'zoneKey': 'FR',
+    }),
+    dict({
+      'correctedModes': list([
+      ]),
+      'datetime': datetime.datetime(2023, 9, 21, 11, 30, tzinfo=zoneinfo.ZoneInfo(key='Europe/Paris')),
+      'production': dict({
+        'biomass': 669.5,
+        'coal': 11.0,
+        'gas': 1627.5,
+        'hydro': 4704.0,
+        'nuclear': 38751.5,
+        'oil': 186.5,
+        'solar': 4049.0,
+        'wind': 3706.0,
+      }),
+      'source': 'opendata.reseaux-energies.fr',
+      'sourceType': <EventSourceType.measured: 'measured'>,
+      'storage': dict({
+        'battery': 8.5,
+        'hydro': -879.5,
+      }),
+      'zoneKey': 'FR',
+    }),
+    dict({
+      'correctedModes': list([
+      ]),
+      'datetime': datetime.datetime(2023, 9, 21, 12, 0, tzinfo=zoneinfo.ZoneInfo(key='Europe/Paris')),
+      'production': dict({
+        'biomass': 668.0,
+        'coal': 11.0,
+        'gas': 1595.0,
+        'hydro': 4456.0,
+        'nuclear': 38683.5,
+        'oil': 185.5,
+        'solar': 4069.5,
+        'wind': 3465.5,
+      }),
+      'source': 'opendata.reseaux-energies.fr',
+      'sourceType': <EventSourceType.measured: 'measured'>,
+      'storage': dict({
+        'battery': 5.5,
+        'hydro': -908.5,
+      }),
+      'zoneKey': 'FR',
+    }),
+    dict({
+      'correctedModes': list([
+      ]),
+      'datetime': datetime.datetime(2023, 9, 21, 12, 30, tzinfo=zoneinfo.ZoneInfo(key='Europe/Paris')),
+      'production': dict({
+        'biomass': 668.0,
+        'coal': 11.0,
+        'gas': 1577.5,
+        'hydro': 4431.5,
+        'nuclear': 38599.0,
+        'oil': 185.5,
+        'solar': 4319.0,
+        'wind': 3696.0,
+      }),
+      'source': 'opendata.reseaux-energies.fr',
+      'sourceType': <EventSourceType.measured: 'measured'>,
+      'storage': dict({
+        'battery': 6.5,
+        'hydro': -807.0,
+      }),
+      'zoneKey': 'FR',
+    }),
+    dict({
+      'correctedModes': list([
+      ]),
+      'datetime': datetime.datetime(2023, 9, 21, 13, 0, tzinfo=zoneinfo.ZoneInfo(key='Europe/Paris')),
+      'production': dict({
+        'biomass': 665.5,
+        'coal': 11.0,
+        'gas': 1466.0,
+        'hydro': 4157.0,
+        'nuclear': 38380.0,
+        'oil': 185.5,
+        'solar': 4654.0,
+        'wind': 4014.0,
+      }),
+      'source': 'opendata.reseaux-energies.fr',
+      'sourceType': <EventSourceType.measured: 'measured'>,
+      'storage': dict({
+        'battery': 7.5,
+        'hydro': -480.5,
+      }),
+      'zoneKey': 'FR',
+    }),
+    dict({
+      'correctedModes': list([
+      ]),
+      'datetime': datetime.datetime(2023, 9, 21, 13, 30, tzinfo=zoneinfo.ZoneInfo(key='Europe/Paris')),
+      'production': dict({
+        'biomass': 665.0,
+        'coal': 11.0,
+        'gas': 1575.5,
+        'hydro': 3986.0,
+        'nuclear': 38566.5,
+        'oil': 150.5,
+        'solar': 4571.5,
+        'wind': 4111.5,
+      }),
+      'source': 'opendata.reseaux-energies.fr',
+      'sourceType': <EventSourceType.measured: 'measured'>,
+      'storage': dict({
+        'battery': 3.5,
+        'hydro': -478.5,
+      }),
+      'zoneKey': 'FR',
+    }),
+    dict({
+      'correctedModes': list([
+      ]),
+      'datetime': datetime.datetime(2023, 9, 21, 14, 0, tzinfo=zoneinfo.ZoneInfo(key='Europe/Paris')),
+      'production': dict({
+        'biomass': 670.0,
+        'coal': 11.0,
+        'gas': 1519.5,
+        'hydro': 3917.0,
+        'nuclear': 38364.0,
+        'oil': 114.0,
+        'solar': 4710.5,
+        'wind': 4422.5,
+      }),
+      'source': 'opendata.reseaux-energies.fr',
+      'sourceType': <EventSourceType.measured: 'measured'>,
+      'storage': dict({
+        'battery': 7.0,
+        'hydro': -346.0,
+      }),
+      'zoneKey': 'FR',
+    }),
+    dict({
+      'correctedModes': list([
+      ]),
+      'datetime': datetime.datetime(2023, 9, 21, 14, 30, tzinfo=zoneinfo.ZoneInfo(key='Europe/Paris')),
+      'production': dict({
+        'biomass': 667.0,
+        'coal': 11.0,
+        'gas': 1668.5,
+        'hydro': 3845.0,
+        'nuclear': 38267.5,
+        'oil': 114.0,
+        'solar': 4803.5,
+        'wind': 5231.0,
+      }),
+      'source': 'opendata.reseaux-energies.fr',
+      'sourceType': <EventSourceType.measured: 'measured'>,
+      'storage': dict({
+        'battery': 0.5,
+        'hydro': -96.0,
+      }),
+      'zoneKey': 'FR',
+    }),
+    dict({
+      'correctedModes': list([
+      ]),
+      'datetime': datetime.datetime(2023, 9, 21, 15, 0, tzinfo=zoneinfo.ZoneInfo(key='Europe/Paris')),
+      'production': dict({
+        'biomass': 664.0,
+        'coal': 11.0,
+        'gas': 1671.0,
+        'hydro': 3944.5,
+        'nuclear': 37840.5,
+        'oil': 114.0,
+        'solar': 4974.5,
+        'wind': 5716.5,
+      }),
+      'source': 'opendata.reseaux-energies.fr',
+      'sourceType': <EventSourceType.measured: 'measured'>,
+      'storage': dict({
+        'battery': 3.5,
+        'hydro': 22.5,
+      }),
+      'zoneKey': 'FR',
+    }),
+    dict({
+      'correctedModes': list([
+      ]),
+      'datetime': datetime.datetime(2023, 9, 21, 15, 30, tzinfo=zoneinfo.ZoneInfo(key='Europe/Paris')),
+      'production': dict({
+        'biomass': 655.0,
+        'coal': 11.0,
+        'gas': 1708.0,
+        'hydro': 4127.0,
+        'nuclear': 37704.5,
+        'oil': 114.0,
+        'solar': 4534.5,
+        'wind': 5908.5,
+      }),
+      'source': 'opendata.reseaux-energies.fr',
+      'sourceType': <EventSourceType.measured: 'measured'>,
+      'storage': dict({
+        'battery': -2.5,
+        'hydro': -121.0,
+      }),
+      'zoneKey': 'FR',
+    }),
+    dict({
+      'correctedModes': list([
+      ]),
+      'datetime': datetime.datetime(2023, 9, 21, 16, 0, tzinfo=zoneinfo.ZoneInfo(key='Europe/Paris')),
+      'production': dict({
+        'biomass': 635.5,
+        'coal': 11.0,
+        'gas': 1784.0,
+        'hydro': 4137.5,
+        'nuclear': 37800.5,
+        'oil': 114.0,
+        'solar': 4037.5,
+        'wind': 5689.5,
+      }),
+      'source': 'opendata.reseaux-energies.fr',
+      'sourceType': <EventSourceType.measured: 'measured'>,
+      'storage': dict({
+        'battery': 3.0,
+        'hydro': -480.5,
+      }),
+      'zoneKey': 'FR',
+    }),
+    dict({
+      'correctedModes': list([
+      ]),
+      'datetime': datetime.datetime(2023, 9, 21, 16, 30, tzinfo=zoneinfo.ZoneInfo(key='Europe/Paris')),
+      'production': dict({
+        'biomass': 639.0,
+        'coal': 11.0,
+        'gas': 1899.5,
+        'hydro': 4338.0,
+        'nuclear': 37900.5,
+        'oil': 114.0,
+        'solar': 3663.5,
+        'wind': 5525.5,
+      }),
+      'source': 'opendata.reseaux-energies.fr',
+      'sourceType': <EventSourceType.measured: 'measured'>,
+      'storage': dict({
+        'battery': -0.0,
+        'hydro': -1101.0,
+      }),
+      'zoneKey': 'FR',
+    }),
+    dict({
+      'correctedModes': list([
+      ]),
+      'datetime': datetime.datetime(2023, 9, 21, 17, 0, tzinfo=zoneinfo.ZoneInfo(key='Europe/Paris')),
+      'production': dict({
+        'biomass': 645.5,
+        'coal': 11.0,
+        'gas': 1838.5,
+        'hydro': 4569.5,
+        'nuclear': 37771.0,
+        'oil': 114.0,
+        'solar': 3240.0,
+        'wind': 5645.0,
+      }),
+      'source': 'opendata.reseaux-energies.fr',
+      'sourceType': <EventSourceType.measured: 'measured'>,
+      'storage': dict({
+        'battery': 9.5,
+        'hydro': -959.0,
+      }),
+      'zoneKey': 'FR',
+    }),
+    dict({
+      'correctedModes': list([
+      ]),
+      'datetime': datetime.datetime(2023, 9, 21, 17, 30, tzinfo=zoneinfo.ZoneInfo(key='Europe/Paris')),
+      'production': dict({
+        'biomass': 651.5,
+        'coal': 11.0,
+        'gas': 1835.0,
+        'hydro': 5028.5,
+        'nuclear': 37858.5,
+        'oil': 114.0,
+        'solar': 2509.0,
+        'wind': 5495.0,
+      }),
+      'source': 'opendata.reseaux-energies.fr',
+      'sourceType': <EventSourceType.measured: 'measured'>,
+      'storage': dict({
+        'battery': -6.5,
+        'hydro': -1170.0,
+      }),
+      'zoneKey': 'FR',
+    }),
+    dict({
+      'correctedModes': list([
+      ]),
+      'datetime': datetime.datetime(2023, 9, 21, 18, 0, tzinfo=zoneinfo.ZoneInfo(key='Europe/Paris')),
+      'production': dict({
+        'biomass': 651.0,
+        'coal': 11.0,
+        'gas': 1762.0,
+        'hydro': 5006.0,
+        'nuclear': 37612.0,
+        'oil': 113.5,
+        'solar': 1923.5,
+        'wind': 5446.5,
+      }),
+      'source': 'opendata.reseaux-energies.fr',
+      'sourceType': <EventSourceType.measured: 'measured'>,
+      'storage': dict({
+        'battery': 12.0,
+        'hydro': -936.0,
+      }),
+      'zoneKey': 'FR',
+    }),
+    dict({
+      'correctedModes': list([
+      ]),
+      'datetime': datetime.datetime(2023, 9, 21, 18, 30, tzinfo=zoneinfo.ZoneInfo(key='Europe/Paris')),
+      'production': dict({
+        'biomass': 650.0,
+        'coal': 11.0,
+        'gas': 1936.0,
+        'hydro': 5174.5,
+        'nuclear': 37822.0,
+        'oil': 114.0,
+        'solar': 1162.0,
+        'wind': 5308.0,
+      }),
+      'source': 'opendata.reseaux-energies.fr',
+      'sourceType': <EventSourceType.measured: 'measured'>,
+      'storage': dict({
+        'battery': -2.0,
+        'hydro': -509.0,
+      }),
+      'zoneKey': 'FR',
+    }),
+    dict({
+      'correctedModes': list([
+      ]),
+      'datetime': datetime.datetime(2023, 9, 21, 19, 0, tzinfo=zoneinfo.ZoneInfo(key='Europe/Paris')),
+      'production': dict({
+        'biomass': 653.0,
+        'coal': 11.0,
+        'gas': 2256.5,
+        'hydro': 5745.0,
+        'nuclear': 37774.5,
+        'oil': 114.0,
+        'solar': 643.5,
+        'wind': 5164.0,
+      }),
+      'source': 'opendata.reseaux-energies.fr',
+      'sourceType': <EventSourceType.measured: 'measured'>,
+      'storage': dict({
+        'battery': 5.0,
+        'hydro': -945.5,
+      }),
+      'zoneKey': 'FR',
+    }),
+    dict({
+      'correctedModes': list([
+      ]),
+      'datetime': datetime.datetime(2023, 9, 21, 19, 30, tzinfo=zoneinfo.ZoneInfo(key='Europe/Paris')),
+      'production': dict({
+        'biomass': 657.0,
+        'coal': 11.0,
+        'gas': 2280.5,
+        'hydro': 5791.5,
+        'nuclear': 37791.0,
+        'oil': 114.0,
+        'solar': 369.0,
+        'wind': 5344.0,
+      }),
+      'source': 'opendata.reseaux-energies.fr',
+      'sourceType': <EventSourceType.measured: 'measured'>,
+      'storage': dict({
+        'battery': 8.5,
+        'hydro': -900.5,
+      }),
+      'zoneKey': 'FR',
+    }),
+    dict({
+      'correctedModes': list([
+      ]),
+      'datetime': datetime.datetime(2023, 9, 21, 20, 0, tzinfo=zoneinfo.ZoneInfo(key='Europe/Paris')),
+      'production': dict({
+        'biomass': 657.0,
+        'coal': 11.0,
+        'gas': 2303.5,
+        'hydro': 5777.0,
+        'nuclear': 37752.0,
+        'oil': 114.0,
+        'solar': 228.0,
+        'wind': 5333.5,
+      }),
+      'source': 'opendata.reseaux-energies.fr',
+      'sourceType': <EventSourceType.measured: 'measured'>,
+      'storage': dict({
+        'battery': 7.0,
+        'hydro': -1151.0,
+      }),
+      'zoneKey': 'FR',
+    }),
+    dict({
+      'correctedModes': list([
+      ]),
+      'datetime': datetime.datetime(2023, 9, 21, 20, 30, tzinfo=zoneinfo.ZoneInfo(key='Europe/Paris')),
+      'production': dict({
+        'biomass': 655.5,
+        'coal': 11.0,
+        'gas': 2195.0,
+        'hydro': 5707.5,
+        'nuclear': 37561.5,
+        'oil': 110.0,
+        'solar': 218.5,
+        'wind': 5381.5,
+      }),
+      'source': 'opendata.reseaux-energies.fr',
+      'sourceType': <EventSourceType.measured: 'measured'>,
+      'storage': dict({
+        'battery': 3.0,
+        'hydro': -1228.5,
+      }),
+      'zoneKey': 'FR',
+    }),
+    dict({
+      'correctedModes': list([
+      ]),
+      'datetime': datetime.datetime(2023, 9, 21, 21, 0, tzinfo=zoneinfo.ZoneInfo(key='Europe/Paris')),
+      'production': dict({
+        'biomass': 655.5,
+        'coal': 11.0,
+        'gas': 2252.0,
+        'hydro': 5697.0,
+        'nuclear': 37647.0,
+        'oil': 498.0,
+        'solar': 110.0,
+        'wind': 5378.0,
+      }),
+      'source': 'opendata.reseaux-energies.fr',
+      'sourceType': <EventSourceType.measured: 'measured'>,
+      'storage': dict({
+        'battery': -0.0,
+        'hydro': -1421.5,
+      }),
+      'zoneKey': 'FR',
+    }),
+    dict({
+      'correctedModes': list([
+      ]),
+      'datetime': datetime.datetime(2023, 9, 21, 21, 30, tzinfo=zoneinfo.ZoneInfo(key='Europe/Paris')),
+      'production': dict({
+        'biomass': 653.0,
+        'coal': 11.0,
+        'gas': 2163.0,
+        'hydro': 5285.0,
+        'nuclear': 37785.5,
+        'oil': 543.5,
+        'solar': 0.0,
+        'wind': 5526.5,
+      }),
+      'source': 'opendata.reseaux-energies.fr',
+      'sourceType': <EventSourceType.measured: 'measured'>,
+      'storage': dict({
+        'battery': 10.5,
+        'hydro': -596.5,
+      }),
+      'zoneKey': 'FR',
+    }),
+    dict({
+      'correctedModes': list([
+      ]),
+      'datetime': datetime.datetime(2023, 9, 21, 22, 0, tzinfo=zoneinfo.ZoneInfo(key='Europe/Paris')),
+      'production': dict({
+        'biomass': 658.5,
+        'coal': 11.0,
+        'gas': 2197.5,
+        'hydro': 5168.0,
+        'nuclear': 37852.5,
+        'oil': 114.0,
+        'solar': 0.0,
+        'wind': 5895.5,
+      }),
+      'source': 'opendata.reseaux-energies.fr',
+      'sourceType': <EventSourceType.measured: 'measured'>,
+      'storage': dict({
+        'battery': 5.5,
+        'hydro': -486.5,
+      }),
+      'zoneKey': 'FR',
+    }),
+    dict({
+      'correctedModes': list([
+      ]),
+      'datetime': datetime.datetime(2023, 9, 21, 22, 30, tzinfo=zoneinfo.ZoneInfo(key='Europe/Paris')),
+      'production': dict({
+        'biomass': 655.0,
+        'coal': 11.0,
+        'gas': 2223.5,
+        'hydro': 5214.5,
+        'nuclear': 37831.0,
+        'oil': 114.0,
+        'solar': 0.0,
+        'wind': 6158.0,
+      }),
+      'source': 'opendata.reseaux-energies.fr',
+      'sourceType': <EventSourceType.measured: 'measured'>,
+      'storage': dict({
+        'battery': 3.0,
+        'hydro': -607.5,
+      }),
+      'zoneKey': 'FR',
+    }),
+    dict({
+      'correctedModes': list([
+      ]),
+      'datetime': datetime.datetime(2023, 9, 21, 23, 0, tzinfo=zoneinfo.ZoneInfo(key='Europe/Paris')),
+      'production': dict({
+        'biomass': 652.0,
+        'coal': 11.0,
+        'gas': 2301.5,
+        'hydro': 5142.0,
+        'nuclear': 37838.0,
+        'oil': 114.0,
+        'solar': 0.0,
+        'wind': 6445.0,
+      }),
+      'source': 'opendata.reseaux-energies.fr',
+      'sourceType': <EventSourceType.measured: 'measured'>,
+      'storage': dict({
+        'battery': 2.0,
+        'hydro': -703.0,
+      }),
+      'zoneKey': 'FR',
+    }),
+    dict({
+      'correctedModes': list([
+      ]),
+      'datetime': datetime.datetime(2023, 9, 21, 23, 30, tzinfo=zoneinfo.ZoneInfo(key='Europe/Paris')),
+      'production': dict({
+        'biomass': 653.5,
+        'coal': 9.0,
+        'gas': 2092.0,
+        'hydro': 4799.0,
+        'nuclear': 37548.0,
+        'oil': 113.5,
+        'solar': 0.0,
+        'wind': 6631.0,
+      }),
+      'source': 'opendata.reseaux-energies.fr',
+      'sourceType': <EventSourceType.measured: 'measured'>,
+      'storage': dict({
+        'battery': 7.5,
+        'hydro': -461.5,
+      }),
+      'zoneKey': 'FR',
+    }),
+    dict({
+      'correctedModes': list([
+      ]),
+      'datetime': datetime.datetime(2023, 9, 22, 0, 0, tzinfo=zoneinfo.ZoneInfo(key='Europe/Paris')),
+      'production': dict({
+        'biomass': 655.0,
+        'coal': 7.0,
+        'gas': 2083.0,
+        'hydro': 4451.0,
+        'nuclear': 37718.5,
+        'oil': 113.5,
+        'solar': 0.0,
+        'wind': 6738.5,
+      }),
+      'source': 'opendata.reseaux-energies.fr',
+      'sourceType': <EventSourceType.measured: 'measured'>,
+      'storage': dict({
+        'battery': -0.5,
+        'hydro': -657.5,
+      }),
+      'zoneKey': 'FR',
+    }),
+    dict({
+      'correctedModes': list([
+      ]),
+      'datetime': datetime.datetime(2023, 9, 22, 0, 30, tzinfo=zoneinfo.ZoneInfo(key='Europe/Paris')),
+      'production': dict({
+        'biomass': 654.0,
+        'coal': 7.0,
+        'gas': 1826.5,
+        'hydro': 4180.5,
+        'nuclear': 37300.0,
+        'oil': 113.5,
+        'solar': 0.0,
+        'wind': 6931.5,
+      }),
+      'source': 'opendata.reseaux-energies.fr',
+      'sourceType': <EventSourceType.measured: 'measured'>,
+      'storage': dict({
+        'battery': 6.0,
+        'hydro': -586.5,
+      }),
+      'zoneKey': 'FR',
+    }),
+    dict({
+      'correctedModes': list([
+      ]),
+      'datetime': datetime.datetime(2023, 9, 22, 1, 0, tzinfo=zoneinfo.ZoneInfo(key='Europe/Paris')),
+      'production': dict({
+        'biomass': 654.0,
+        'coal': 7.0,
+        'gas': 906.0,
+        'hydro': 4203.5,
+        'nuclear': 37458.5,
+        'oil': 112.0,
+        'solar': 0.0,
+        'wind': 6831.5,
+      }),
+      'source': 'opendata.reseaux-energies.fr',
+      'sourceType': <EventSourceType.measured: 'measured'>,
+      'storage': dict({
+        'battery': -2.0,
+        'hydro': -556.5,
+      }),
+      'zoneKey': 'FR',
+    }),
+    dict({
+      'correctedModes': list([
+      ]),
+      'datetime': datetime.datetime(2023, 9, 22, 1, 30, tzinfo=zoneinfo.ZoneInfo(key='Europe/Paris')),
+      'production': dict({
+        'biomass': 649.5,
+        'coal': 7.0,
+        'gas': 492.0,
+        'hydro': 4181.0,
+        'nuclear': 37619.5,
+        'oil': 109.5,
+        'solar': 0.0,
+        'wind': 7137.5,
+      }),
+      'source': 'opendata.reseaux-energies.fr',
+      'sourceType': <EventSourceType.measured: 'measured'>,
+      'storage': dict({
+        'battery': 5.0,
+        'hydro': -567.0,
+      }),
+      'zoneKey': 'FR',
+    }),
+    dict({
+      'correctedModes': list([
+      ]),
+      'datetime': datetime.datetime(2023, 9, 22, 2, 0, tzinfo=zoneinfo.ZoneInfo(key='Europe/Paris')),
+      'production': dict({
+        'biomass': 651.0,
+        'coal': 7.0,
+        'gas': 501.0,
+        'hydro': 3965.0,
+        'nuclear': 37536.0,
+        'oil': 110.0,
+        'solar': 0.0,
+        'wind': 7440.0,
+      }),
+      'source': 'opendata.reseaux-energies.fr',
+      'sourceType': <EventSourceType.measured: 'measured'>,
+      'storage': dict({
+        'battery': -0.0,
+        'hydro': -207.0,
+      }),
+      'zoneKey': 'FR',
+    }),
+  ])
+# ---
diff --git a/parsers/test/__snapshots__/test_GT.ambr b/parsers/test/__snapshots__/test_GT.ambr
index ff759b5c08..fef919a54f 100644
--- a/parsers/test/__snapshots__/test_GT.ambr
+++ b/parsers/test/__snapshots__/test_GT.ambr
@@ -267,10 +267,12 @@
       'datetime': datetime.datetime(2023, 7, 16, 0, 0, tzinfo=datetime.timezone.utc),
       'production': dict({
         'biomass': 0.2,
+        'coal': 646.85,
         'gas': 0,
         'geothermal': 32.5,
         'hydro': 755.15,
         'oil': 120.94375,
+        'solar': 0.99,
         'wind': 24.45,
       }),
       'source': 'amm.org.gt',
@@ -285,10 +287,12 @@
       'datetime': datetime.datetime(2023, 7, 16, 1, 0, tzinfo=datetime.timezone.utc),
       'production': dict({
         'biomass': 0,
+        'coal': 646.58,
         'gas': 0,
         'geothermal': 29.79,
         'hydro': 856.56,
         'oil': 141.63375,
+        'solar': 0,
         'wind': 17.5,
       }),
       'source': 'amm.org.gt',
@@ -303,10 +307,12 @@
       'datetime': datetime.datetime(2023, 7, 16, 2, 0, tzinfo=datetime.timezone.utc),
       'production': dict({
         'biomass': 0,
+        'coal': 646.87,
         'gas': 0,
         'geothermal': 32.37,
         'hydro': 844.89,
         'oil': 147.39375,
+        'solar': 0,
         'wind': 37.05,
       }),
       'source': 'amm.org.gt',
@@ -321,10 +327,12 @@
       'datetime': datetime.datetime(2023, 7, 16, 3, 0, tzinfo=datetime.timezone.utc),
       'production': dict({
         'biomass': 0,
+        'coal': 645.67,
         'gas': 0,
         'geothermal': 31.9,
         'hydro': 592.94,
         'oil': 130.15375,
+        'solar': 0,
         'wind': 6.5,
       }),
       'source': 'amm.org.gt',
@@ -339,10 +347,12 @@
       'datetime': datetime.datetime(2023, 7, 16, 4, 0, tzinfo=datetime.timezone.utc),
       'production': dict({
         'biomass': 0,
+        'coal': 645.66,
         'gas': 0,
         'geothermal': 32.72,
         'hydro': 415.83,
         'oil': 147.85375,
+        'solar': 0,
         'wind': 29.06,
       }),
       'source': 'amm.org.gt',
@@ -357,10 +367,12 @@
       'datetime': datetime.datetime(2023, 7, 16, 5, 0, tzinfo=datetime.timezone.utc),
       'production': dict({
         'biomass': 0,
+        'coal': 645.56,
         'gas': 0,
         'geothermal': 32.94,
         'hydro': 357.47,
         'oil': 63.12375,
+        'solar': 0,
         'wind': 81.45,
       }),
       'source': 'amm.org.gt',
@@ -375,10 +387,12 @@
       'datetime': datetime.datetime(2023, 7, 16, 6, 0, tzinfo=datetime.timezone.utc),
       'production': dict({
         'biomass': 0,
+        'coal': 642.73,
         'gas': 0,
         'geothermal': 32.64,
         'hydro': 248.82,
         'oil': 147.41,
+        'solar': 0,
         'wind': 72.8,
       }),
       'source': 'amm.org.gt',
@@ -393,10 +407,12 @@
       'datetime': datetime.datetime(2023, 7, 16, 7, 0, tzinfo=datetime.timezone.utc),
       'production': dict({
         'biomass': 0,
+        'coal': 645.51,
         'gas': 0,
         'geothermal': 32.56,
         'hydro': 247.63,
         'oil': 88.99,
+        'solar': 0,
         'wind': 85.67,
       }),
       'source': 'amm.org.gt',
@@ -411,10 +427,12 @@
       'datetime': datetime.datetime(2023, 7, 16, 8, 0, tzinfo=datetime.timezone.utc),
       'production': dict({
         'biomass': 0,
+        'coal': 625.63,
         'gas': 0,
         'geothermal': 32.45,
         'hydro': 269.04,
         'oil': 37.71,
+        'solar': 0,
         'wind': 84.24,
       }),
       'source': 'amm.org.gt',
@@ -429,10 +447,12 @@
       'datetime': datetime.datetime(2023, 7, 16, 9, 0, tzinfo=datetime.timezone.utc),
       'production': dict({
         'biomass': 0.2,
+        'coal': 501.42,
         'gas': 0,
         'geothermal': 32.57,
         'hydro': 341.65,
         'oil': 61.21,
+        'solar': 0,
         'wind': 91.68,
       }),
       'source': 'amm.org.gt',
@@ -447,10 +467,12 @@
       'datetime': datetime.datetime(2023, 7, 16, 10, 0, tzinfo=datetime.timezone.utc),
       'production': dict({
         'biomass': 0.2,
+        'coal': 401.97,
         'gas': 0,
         'geothermal': 31.48,
         'hydro': 399.81,
         'oil': 58.46,
+        'solar': 0,
         'wind': 94.31,
       }),
       'source': 'amm.org.gt',
@@ -465,10 +487,12 @@
       'datetime': datetime.datetime(2023, 7, 16, 11, 0, tzinfo=datetime.timezone.utc),
       'production': dict({
         'biomass': 0.2,
+        'coal': 390.35,
         'gas': 0,
         'geothermal': 31.62,
         'hydro': 429.84,
         'oil': 27,
+        'solar': 0.84,
         'wind': 97.22,
       }),
       'source': 'amm.org.gt',
@@ -483,10 +507,12 @@
       'datetime': datetime.datetime(2023, 7, 16, 12, 0, tzinfo=datetime.timezone.utc),
       'production': dict({
         'biomass': 0.2,
+        'coal': 392.48,
         'gas': 0,
         'geothermal': 31.36,
         'hydro': 475.3,
         'oil': 44.28,
+        'solar': 10.54,
         'wind': 93.74,
       }),
       'source': 'amm.org.gt',
@@ -501,10 +527,12 @@
       'datetime': datetime.datetime(2023, 7, 16, 13, 0, tzinfo=datetime.timezone.utc),
       'production': dict({
         'biomass': 0.2,
+        'coal': 392.23,
         'gas': 0,
         'geothermal': 30.83,
         'hydro': 558.06,
         'oil': 23.92,
+        'solar': 20.52,
         'wind': 97.33,
       }),
       'source': 'amm.org.gt',
@@ -519,10 +547,12 @@
       'datetime': datetime.datetime(2023, 7, 16, 14, 0, tzinfo=datetime.timezone.utc),
       'production': dict({
         'biomass': 0.2,
+        'coal': 525.43,
         'gas': 0,
         'geothermal': 30.44,
         'hydro': 596.34,
         'oil': 24.64,
+        'solar': 46.13,
         'wind': 97.29,
       }),
       'source': 'amm.org.gt',
@@ -537,10 +567,12 @@
       'datetime': datetime.datetime(2023, 7, 16, 15, 0, tzinfo=datetime.timezone.utc),
       'production': dict({
         'biomass': 0.2,
+        'coal': 507.28,
         'gas': 0,
         'geothermal': 31.48,
         'hydro': 581.02,
         'oil': 25.83,
+        'solar': 67.54,
         'wind': 79.35,
       }),
       'source': 'amm.org.gt',
@@ -555,10 +587,12 @@
       'datetime': datetime.datetime(2023, 7, 16, 16, 0, tzinfo=datetime.timezone.utc),
       'production': dict({
         'biomass': 0.2,
+        'coal': 472.48,
         'gas': 0,
         'geothermal': 30.83,
         'hydro': 676.88,
         'oil': 25.77,
+        'solar': 82.04,
         'wind': 70.76,
       }),
       'source': 'amm.org.gt',
@@ -573,10 +607,12 @@
       'datetime': datetime.datetime(2023, 7, 16, 17, 0, tzinfo=datetime.timezone.utc),
       'production': dict({
         'biomass': 0.2,
+        'coal': 463.86,
         'gas': 0,
         'geothermal': 31.28,
         'hydro': 689.19,
         'oil': 27.72,
+        'solar': 79.66,
         'wind': 70.43,
       }),
       'source': 'amm.org.gt',
@@ -591,10 +627,12 @@
       'datetime': datetime.datetime(2023, 7, 16, 18, 0, tzinfo=datetime.timezone.utc),
       'production': dict({
         'biomass': 0.2,
+        'coal': 459.65,
         'gas': 0,
         'geothermal': 24.62,
         'hydro': 734.48,
         'oil': 25.51,
+        'solar': 42.05,
         'wind': 52.98,
       }),
       'source': 'amm.org.gt',
@@ -609,10 +647,12 @@
       'datetime': datetime.datetime(2023, 7, 16, 19, 0, tzinfo=datetime.timezone.utc),
       'production': dict({
         'biomass': 0.2,
+        'coal': 465.05,
         'gas': 0,
         'geothermal': 30.89,
         'hydro': 711.11,
         'oil': 63.44,
+        'solar': 17.4,
         'wind': 44.74,
       }),
       'source': 'amm.org.gt',
@@ -627,10 +667,12 @@
       'datetime': datetime.datetime(2023, 7, 16, 20, 0, tzinfo=datetime.timezone.utc),
       'production': dict({
         'biomass': 0.2,
+        'coal': 553.4,
         'gas': 0,
         'geothermal': 31.09,
         'hydro': 705.38,
         'oil': 24,
+        'solar': 4.46,
         'wind': 26.51,
       }),
       'source': 'amm.org.gt',
@@ -645,10 +687,12 @@
       'datetime': datetime.datetime(2023, 7, 16, 21, 0, tzinfo=datetime.timezone.utc),
       'production': dict({
         'biomass': 0.2,
+        'coal': 579.5,
         'gas': 0,
         'geothermal': 31.78,
         'hydro': 774.33,
         'oil': 105.65,
+        'solar': 0.75,
         'wind': 27.53,
       }),
       'source': 'amm.org.gt',
@@ -663,10 +707,12 @@
       'datetime': datetime.datetime(2023, 7, 16, 22, 0, tzinfo=datetime.timezone.utc),
       'production': dict({
         'biomass': 0,
+        'coal': 625.5,
         'gas': 0,
         'geothermal': 31.93,
         'hydro': 642.9,
         'oil': 228.3,
+        'solar': 0,
         'wind': 16.07,
       }),
       'source': 'amm.org.gt',
@@ -681,10 +727,12 @@
       'datetime': datetime.datetime(2023, 7, 16, 23, 0, tzinfo=datetime.timezone.utc),
       'production': dict({
         'biomass': 0,
+        'coal': 612.3,
         'gas': 0,
         'geothermal': 32.09,
         'hydro': 673.49,
         'oil': 178.9,
+        'solar': 0,
         'wind': 16.16,
       }),
       'source': 'amm.org.gt',
@@ -703,10 +751,13 @@
       'datetime': FakeDatetime(2024, 4, 10, 0, 0, tzinfo=datetime.timezone.utc),
       'production': dict({
         'biomass': 320.97,
+        'coal': 476.04,
         'gas': 2.45,
         'geothermal': 32,
         'hydro': 671.14,
         'oil': 359.01,
+        'solar': 0,
+        'unknown': 168.73,
         'wind': 25.72,
       }),
       'source': 'amm.org.gt',
@@ -721,10 +772,13 @@
       'datetime': FakeDatetime(2024, 4, 10, 1, 0, tzinfo=datetime.timezone.utc),
       'production': dict({
         'biomass': 323.26,
+        'coal': 476.91,
         'gas': 11.53,
         'geothermal': 31.96,
         'hydro': 628.87,
         'oil': 323.92,
+        'solar': 0,
+        'unknown': 168.83,
         'wind': 27.03,
       }),
       'source': 'amm.org.gt',
@@ -739,10 +793,13 @@
       'datetime': FakeDatetime(2024, 4, 10, 2, 0, tzinfo=datetime.timezone.utc),
       'production': dict({
         'biomass': 316.96,
+        'coal': 476.78,
         'gas': 13,
         'geothermal': 32.28,
         'hydro': 624.92,
         'oil': 324.23,
+        'solar': 0,
+        'unknown': 169.17,
         'wind': 14.99,
       }),
       'source': 'amm.org.gt',
@@ -757,10 +814,13 @@
       'datetime': FakeDatetime(2024, 4, 10, 3, 0, tzinfo=datetime.timezone.utc),
       'production': dict({
         'biomass': 322.07,
+        'coal': 476.24,
         'gas': 14.43,
         'geothermal': 32.22,
         'hydro': 460.45,
         'oil': 322.46,
+        'solar': 0,
+        'unknown': 162.81,
         'wind': 5.04,
       }),
       'source': 'amm.org.gt',
@@ -775,10 +835,13 @@
       'datetime': FakeDatetime(2024, 4, 10, 4, 0, tzinfo=datetime.timezone.utc),
       'production': dict({
         'biomass': 313.16,
+        'coal': 475.63,
         'gas': 14.38,
         'geothermal': 32.53,
         'hydro': 304.46,
         'oil': 348.93,
+        'solar': 0,
+        'unknown': 167.54,
         'wind': 2.46,
       }),
       'source': 'amm.org.gt',
@@ -793,10 +856,13 @@
       'datetime': FakeDatetime(2024, 4, 10, 5, 0, tzinfo=datetime.timezone.utc),
       'production': dict({
         'biomass': 314.84,
+        'coal': 476.17,
         'gas': 14.46,
         'geothermal': 32.79,
         'hydro': 211.5,
         'oil': 274.99,
+        'solar': 0,
+        'unknown': 167.03,
         'wind': 1.86,
       }),
       'source': 'amm.org.gt',
@@ -811,10 +877,13 @@
       'datetime': FakeDatetime(2024, 4, 10, 6, 0, tzinfo=datetime.timezone.utc),
       'production': dict({
         'biomass': 309.27,
+        'coal': 474.33,
         'gas': 14.43,
         'geothermal': 32.77,
         'hydro': 172.63,
         'oil': 199.04,
+        'solar': 0,
+        'unknown': 169.6,
         'wind': 1.32,
       }),
       'source': 'amm.org.gt',
@@ -829,10 +898,13 @@
       'datetime': FakeDatetime(2024, 4, 10, 7, 0, tzinfo=datetime.timezone.utc),
       'production': dict({
         'biomass': 313.72,
+        'coal': 475.38,
         'gas': 2,
         'geothermal': 32.82,
         'hydro': 115.6,
         'oil': 170.97,
+        'solar': 0,
+        'unknown': 166.76,
         'wind': 4.56,
       }),
       'source': 'amm.org.gt',
@@ -847,10 +919,13 @@
       'datetime': FakeDatetime(2024, 4, 10, 8, 0, tzinfo=datetime.timezone.utc),
       'production': dict({
         'biomass': 308.08,
+        'coal': 475.22,
         'gas': 11.9,
         'geothermal': 32.99,
         'hydro': 108.85,
         'oil': 150.89,
+        'solar': 0,
+        'unknown': 170,
         'wind': 3.69,
       }),
       'source': 'amm.org.gt',
@@ -865,10 +940,13 @@
       'datetime': FakeDatetime(2024, 4, 10, 9, 0, tzinfo=datetime.timezone.utc),
       'production': dict({
         'biomass': 308.41,
+        'coal': 475.56,
         'gas': 11.92,
         'geothermal': 33.34,
         'hydro': 92.28,
         'oil': 188.95,
+        'solar': 0,
+        'unknown': 168.15,
         'wind': 0.06,
       }),
       'source': 'amm.org.gt',
@@ -883,10 +961,13 @@
       'datetime': FakeDatetime(2024, 4, 10, 10, 0, tzinfo=datetime.timezone.utc),
       'production': dict({
         'biomass': 307.72,
+        'coal': 476.54,
         'gas': 13.28,
         'geothermal': 32.7,
         'hydro': 193.68,
         'oil': 133.98,
+        'solar': 0,
+        'unknown': 169.06,
         'wind': 0,
       }),
       'source': 'amm.org.gt',
@@ -901,10 +982,13 @@
       'datetime': FakeDatetime(2024, 4, 10, 11, 0, tzinfo=datetime.timezone.utc),
       'production': dict({
         'biomass': 304.24,
+        'coal': 476.7,
         'gas': 15.386,
         'geothermal': 35.449,
         'hydro': 256.285,
         'oil': 209.18,
+        'solar': 0,
+        'unknown': 166.4,
         'wind': 1.52,
       }),
       'source': 'amm.org.gt',
diff --git a/parsers/test/__snapshots__/test_IEMOP.ambr b/parsers/test/__snapshots__/test_IEMOP.ambr
new file mode 100644
index 0000000000..d8ff4185d4
--- /dev/null
+++ b/parsers/test/__snapshots__/test_IEMOP.ambr
@@ -0,0 +1,781 @@
+# serializer version: 1
+# name: test_production[PH-LU]
+  list([
+    dict({
+      'correctedModes': list([
+      ]),
+      'datetime': datetime.datetime(2023, 9, 13, 23, 0, tzinfo=<DstTzInfo 'Asia/Manila' PST+8:00:00 STD>),
+      'production': dict({
+        'biomass': 34.9,
+        'coal': 5637.4225,
+        'gas': 2628.4,
+        'geothermal': 484.0,
+        'hydro': 645.5,
+        'oil': 27.8338,
+        'solar': 0.0,
+        'unknown': 50.0,
+        'wind': 8.4,
+      }),
+      'source': 'iemop.ph',
+      'sourceType': <EventSourceType.measured: 'measured'>,
+      'storage': dict({
+        'battery': -0.0,
+        'hydro': 306.0,
+      }),
+      'zoneKey': 'PH-LU',
+    }),
+    dict({
+      'correctedModes': list([
+      ]),
+      'datetime': datetime.datetime(2023, 9, 13, 23, 5, tzinfo=<DstTzInfo 'Asia/Manila' PST+8:00:00 STD>),
+      'production': dict({
+        'biomass': 34.9,
+        'coal': 5628.8619,
+        'gas': 2628.4,
+        'geothermal': 484.0,
+        'hydro': 645.5,
+        'oil': 0.0,
+        'solar': 0.0,
+        'unknown': 50.0,
+        'wind': 9.5,
+      }),
+      'source': 'iemop.ph',
+      'sourceType': <EventSourceType.measured: 'measured'>,
+      'storage': dict({
+        'battery': -0.0,
+        'hydro': 306.0,
+      }),
+      'zoneKey': 'PH-LU',
+    }),
+    dict({
+      'correctedModes': list([
+      ]),
+      'datetime': datetime.datetime(2023, 9, 13, 23, 10, tzinfo=<DstTzInfo 'Asia/Manila' PST+8:00:00 STD>),
+      'production': dict({
+        'biomass': 34.9,
+        'coal': 5579.0433,
+        'gas': 2628.4,
+        'geothermal': 484.0,
+        'hydro': 645.5,
+        'oil': 0.0,
+        'solar': 0.0,
+        'unknown': 50.0,
+        'wind': 9.5,
+      }),
+      'source': 'iemop.ph',
+      'sourceType': <EventSourceType.measured: 'measured'>,
+      'storage': dict({
+        'battery': -0.0,
+        'hydro': 306.0,
+      }),
+      'zoneKey': 'PH-LU',
+    }),
+    dict({
+      'correctedModes': list([
+      ]),
+      'datetime': datetime.datetime(2023, 9, 13, 23, 15, tzinfo=<DstTzInfo 'Asia/Manila' PST+8:00:00 STD>),
+      'production': dict({
+        'biomass': 34.9,
+        'coal': 5530.5807,
+        'gas': 2628.4,
+        'geothermal': 484.0,
+        'hydro': 645.5,
+        'oil': 0.0,
+        'solar': 0.0,
+        'unknown': 50.0,
+        'wind': 10.5,
+      }),
+      'source': 'iemop.ph',
+      'sourceType': <EventSourceType.measured: 'measured'>,
+      'storage': dict({
+        'battery': -0.0,
+        'hydro': 306.0,
+      }),
+      'zoneKey': 'PH-LU',
+    }),
+    dict({
+      'correctedModes': list([
+      ]),
+      'datetime': datetime.datetime(2023, 9, 13, 23, 20, tzinfo=<DstTzInfo 'Asia/Manila' PST+8:00:00 STD>),
+      'production': dict({
+        'biomass': 34.9,
+        'coal': 5496.31,
+        'gas': 2628.4,
+        'geothermal': 484.0,
+        'hydro': 645.5,
+        'oil': 0.0,
+        'solar': 0.0,
+        'unknown': 50.0,
+        'wind': 10.5,
+      }),
+      'source': 'iemop.ph',
+      'sourceType': <EventSourceType.measured: 'measured'>,
+      'storage': dict({
+        'battery': -0.0,
+        'hydro': 306.0,
+      }),
+      'zoneKey': 'PH-LU',
+    }),
+    dict({
+      'correctedModes': list([
+      ]),
+      'datetime': datetime.datetime(2023, 9, 13, 23, 25, tzinfo=<DstTzInfo 'Asia/Manila' PST+8:00:00 STD>),
+      'production': dict({
+        'biomass': 34.9,
+        'coal': 5469.13,
+        'gas': 2628.4,
+        'geothermal': 484.0,
+        'hydro': 644.8,
+        'oil': 0.0,
+        'solar': 0.0,
+        'unknown': 50.0,
+        'wind': 9.5,
+      }),
+      'source': 'iemop.ph',
+      'sourceType': <EventSourceType.measured: 'measured'>,
+      'storage': dict({
+        'battery': -0.0,
+        'hydro': 306.0,
+      }),
+      'zoneKey': 'PH-LU',
+    }),
+    dict({
+      'correctedModes': list([
+      ]),
+      'datetime': datetime.datetime(2023, 9, 13, 23, 30, tzinfo=<DstTzInfo 'Asia/Manila' PST+8:00:00 STD>),
+      'production': dict({
+        'biomass': 34.9,
+        'coal': 5445.12,
+        'gas': 2628.4,
+        'geothermal': 484.0,
+        'hydro': 644.8,
+        'oil': 0.0,
+        'solar': 0.0,
+        'unknown': 50.0,
+        'wind': 9.5,
+      }),
+      'source': 'iemop.ph',
+      'sourceType': <EventSourceType.measured: 'measured'>,
+      'storage': dict({
+        'battery': -0.0,
+        'hydro': 306.0,
+      }),
+      'zoneKey': 'PH-LU',
+    }),
+    dict({
+      'correctedModes': list([
+      ]),
+      'datetime': datetime.datetime(2023, 9, 13, 23, 35, tzinfo=<DstTzInfo 'Asia/Manila' PST+8:00:00 STD>),
+      'production': dict({
+        'biomass': 34.9,
+        'coal': 5424.35,
+        'gas': 2628.4,
+        'geothermal': 484.0,
+        'hydro': 639.8,
+        'oil': 0.0,
+        'solar': 0.0,
+        'unknown': 50.0,
+        'wind': 8.5,
+      }),
+      'source': 'iemop.ph',
+      'sourceType': <EventSourceType.measured: 'measured'>,
+      'storage': dict({
+        'battery': -0.0,
+        'hydro': 306.0,
+      }),
+      'zoneKey': 'PH-LU',
+    }),
+    dict({
+      'correctedModes': list([
+      ]),
+      'datetime': datetime.datetime(2023, 9, 13, 23, 40, tzinfo=<DstTzInfo 'Asia/Manila' PST+8:00:00 STD>),
+      'production': dict({
+        'biomass': 34.9,
+        'coal': 5403.3,
+        'gas': 2628.4,
+        'geothermal': 484.0,
+        'hydro': 639.8,
+        'oil': 0.0,
+        'solar': 0.0,
+        'unknown': 50.0,
+        'wind': 8.5,
+      }),
+      'source': 'iemop.ph',
+      'sourceType': <EventSourceType.measured: 'measured'>,
+      'storage': dict({
+        'battery': -0.0,
+        'hydro': 306.0,
+      }),
+      'zoneKey': 'PH-LU',
+    }),
+    dict({
+      'correctedModes': list([
+      ]),
+      'datetime': datetime.datetime(2023, 9, 13, 23, 45, tzinfo=<DstTzInfo 'Asia/Manila' PST+8:00:00 STD>),
+      'production': dict({
+        'biomass': 34.9,
+        'coal': 5386.1,
+        'gas': 2628.4,
+        'geothermal': 484.0,
+        'hydro': 639.8,
+        'oil': 0.0,
+        'solar': 0.0,
+        'unknown': 50.0,
+        'wind': 8.5,
+      }),
+      'source': 'iemop.ph',
+      'sourceType': <EventSourceType.measured: 'measured'>,
+      'storage': dict({
+        'battery': -0.0,
+        'hydro': 306.0,
+      }),
+      'zoneKey': 'PH-LU',
+    }),
+    dict({
+      'correctedModes': list([
+      ]),
+      'datetime': datetime.datetime(2023, 9, 13, 23, 50, tzinfo=<DstTzInfo 'Asia/Manila' PST+8:00:00 STD>),
+      'production': dict({
+        'biomass': 34.9,
+        'coal': 5351.7597,
+        'gas': 2628.4,
+        'geothermal': 484.0,
+        'hydro': 639.8,
+        'oil': 0.0,
+        'solar': 0.0,
+        'unknown': 50.0,
+        'wind': 8.5,
+      }),
+      'source': 'iemop.ph',
+      'sourceType': <EventSourceType.measured: 'measured'>,
+      'storage': dict({
+        'battery': -0.0,
+        'hydro': 306.0,
+      }),
+      'zoneKey': 'PH-LU',
+    }),
+    dict({
+      'correctedModes': list([
+      ]),
+      'datetime': datetime.datetime(2023, 9, 13, 23, 55, tzinfo=<DstTzInfo 'Asia/Manila' PST+8:00:00 STD>),
+      'production': dict({
+        'biomass': 34.9,
+        'coal': 5351.6,
+        'gas': 2628.4,
+        'geothermal': 484.0,
+        'hydro': 639.8,
+        'oil': 0.0,
+        'solar': 0.0,
+        'unknown': 50.0,
+        'wind': 9.5,
+      }),
+      'source': 'iemop.ph',
+      'sourceType': <EventSourceType.measured: 'measured'>,
+      'storage': dict({
+        'battery': -0.0,
+        'hydro': 306.0,
+      }),
+      'zoneKey': 'PH-LU',
+    }),
+  ])
+# ---
+# name: test_production[PH-MI]
+  list([
+    dict({
+      'correctedModes': list([
+      ]),
+      'datetime': datetime.datetime(2023, 9, 13, 23, 0, tzinfo=<DstTzInfo 'Asia/Manila' PST+8:00:00 STD>),
+      'production': dict({
+        'biomass': 22.5,
+        'coal': 1039.0631,
+        'geothermal': 83.2,
+        'hydro': 645.4,
+        'oil': 134.0,
+        'solar': 0.0,
+        'unknown': 0.0,
+      }),
+      'source': 'iemop.ph',
+      'sourceType': <EventSourceType.measured: 'measured'>,
+      'storage': dict({
+        'battery': -0.0,
+      }),
+      'zoneKey': 'PH-MI',
+    }),
+    dict({
+      'correctedModes': list([
+      ]),
+      'datetime': datetime.datetime(2023, 9, 13, 23, 5, tzinfo=<DstTzInfo 'Asia/Manila' PST+8:00:00 STD>),
+      'production': dict({
+        'biomass': 22.5,
+        'coal': 1039.8314,
+        'geothermal': 83.2,
+        'hydro': 645.4,
+        'oil': 134.0,
+        'solar': 0.0,
+        'unknown': 0.0,
+      }),
+      'source': 'iemop.ph',
+      'sourceType': <EventSourceType.measured: 'measured'>,
+      'storage': dict({
+        'battery': -0.0,
+      }),
+      'zoneKey': 'PH-MI',
+    }),
+    dict({
+      'correctedModes': list([
+      ]),
+      'datetime': datetime.datetime(2023, 9, 13, 23, 10, tzinfo=<DstTzInfo 'Asia/Manila' PST+8:00:00 STD>),
+      'production': dict({
+        'biomass': 22.5,
+        'coal': 1024.039,
+        'geothermal': 83.2,
+        'hydro': 645.4,
+        'oil': 134.0,
+        'solar': 0.0,
+        'unknown': 0.0,
+      }),
+      'source': 'iemop.ph',
+      'sourceType': <EventSourceType.measured: 'measured'>,
+      'storage': dict({
+        'battery': -0.0,
+      }),
+      'zoneKey': 'PH-MI',
+    }),
+    dict({
+      'correctedModes': list([
+      ]),
+      'datetime': datetime.datetime(2023, 9, 13, 23, 15, tzinfo=<DstTzInfo 'Asia/Manila' PST+8:00:00 STD>),
+      'production': dict({
+        'biomass': 22.5,
+        'coal': 1030.8,
+        'geothermal': 83.2,
+        'hydro': 645.4,
+        'oil': 125.5,
+        'solar': 0.0,
+        'unknown': 0.0,
+      }),
+      'source': 'iemop.ph',
+      'sourceType': <EventSourceType.measured: 'measured'>,
+      'storage': dict({
+        'battery': -0.0,
+      }),
+      'zoneKey': 'PH-MI',
+    }),
+    dict({
+      'correctedModes': list([
+      ]),
+      'datetime': datetime.datetime(2023, 9, 13, 23, 20, tzinfo=<DstTzInfo 'Asia/Manila' PST+8:00:00 STD>),
+      'production': dict({
+        'biomass': 22.5,
+        'coal': 1008.601,
+        'geothermal': 83.2,
+        'hydro': 645.4,
+        'oil': 125.0,
+        'solar': 0.0,
+        'unknown': 0.0,
+      }),
+      'source': 'iemop.ph',
+      'sourceType': <EventSourceType.measured: 'measured'>,
+      'storage': dict({
+        'battery': -0.0,
+      }),
+      'zoneKey': 'PH-MI',
+    }),
+    dict({
+      'correctedModes': list([
+      ]),
+      'datetime': datetime.datetime(2023, 9, 13, 23, 25, tzinfo=<DstTzInfo 'Asia/Manila' PST+8:00:00 STD>),
+      'production': dict({
+        'biomass': 22.5,
+        'coal': 1002.6,
+        'geothermal': 83.2,
+        'hydro': 645.4,
+        'oil': 125.0,
+        'solar': 0.0,
+        'unknown': 0.0,
+      }),
+      'source': 'iemop.ph',
+      'sourceType': <EventSourceType.measured: 'measured'>,
+      'storage': dict({
+        'battery': -0.0,
+      }),
+      'zoneKey': 'PH-MI',
+    }),
+    dict({
+      'correctedModes': list([
+      ]),
+      'datetime': datetime.datetime(2023, 9, 13, 23, 30, tzinfo=<DstTzInfo 'Asia/Manila' PST+8:00:00 STD>),
+      'production': dict({
+        'biomass': 22.5,
+        'coal': 1001.6925,
+        'geothermal': 83.2,
+        'hydro': 645.4,
+        'oil': 125.0,
+        'solar': 0.0,
+        'unknown': 0.0,
+      }),
+      'source': 'iemop.ph',
+      'sourceType': <EventSourceType.measured: 'measured'>,
+      'storage': dict({
+        'battery': -0.0,
+      }),
+      'zoneKey': 'PH-MI',
+    }),
+    dict({
+      'correctedModes': list([
+      ]),
+      'datetime': datetime.datetime(2023, 9, 13, 23, 35, tzinfo=<DstTzInfo 'Asia/Manila' PST+8:00:00 STD>),
+      'production': dict({
+        'biomass': 22.5,
+        'coal': 986.69,
+        'geothermal': 83.2,
+        'hydro': 645.4,
+        'oil': 116.5,
+        'solar': 0.0,
+        'unknown': 0.0,
+      }),
+      'source': 'iemop.ph',
+      'sourceType': <EventSourceType.measured: 'measured'>,
+      'storage': dict({
+        'battery': -0.0,
+      }),
+      'zoneKey': 'PH-MI',
+    }),
+    dict({
+      'correctedModes': list([
+      ]),
+      'datetime': datetime.datetime(2023, 9, 13, 23, 40, tzinfo=<DstTzInfo 'Asia/Manila' PST+8:00:00 STD>),
+      'production': dict({
+        'biomass': 22.5,
+        'coal': 976.8124,
+        'geothermal': 83.2,
+        'hydro': 644.4,
+        'oil': 115.0,
+        'solar': 0.0,
+        'unknown': 0.0,
+      }),
+      'source': 'iemop.ph',
+      'sourceType': <EventSourceType.measured: 'measured'>,
+      'storage': dict({
+        'battery': -0.0,
+      }),
+      'zoneKey': 'PH-MI',
+    }),
+    dict({
+      'correctedModes': list([
+      ]),
+      'datetime': datetime.datetime(2023, 9, 13, 23, 45, tzinfo=<DstTzInfo 'Asia/Manila' PST+8:00:00 STD>),
+      'production': dict({
+        'biomass': 22.5,
+        'coal': 961.936,
+        'geothermal': 83.2,
+        'hydro': 644.4,
+        'oil': 115.0,
+        'solar': 0.0,
+        'unknown': 0.0,
+      }),
+      'source': 'iemop.ph',
+      'sourceType': <EventSourceType.measured: 'measured'>,
+      'storage': dict({
+        'battery': -0.0,
+      }),
+      'zoneKey': 'PH-MI',
+    }),
+    dict({
+      'correctedModes': list([
+      ]),
+      'datetime': datetime.datetime(2023, 9, 13, 23, 50, tzinfo=<DstTzInfo 'Asia/Manila' PST+8:00:00 STD>),
+      'production': dict({
+        'biomass': 22.5,
+        'coal': 942.28,
+        'geothermal': 83.2,
+        'hydro': 644.4,
+        'oil': 115.0,
+        'solar': 0.0,
+        'unknown': 0.0,
+      }),
+      'source': 'iemop.ph',
+      'sourceType': <EventSourceType.measured: 'measured'>,
+      'storage': dict({
+        'battery': -0.0,
+      }),
+      'zoneKey': 'PH-MI',
+    }),
+    dict({
+      'correctedModes': list([
+      ]),
+      'datetime': datetime.datetime(2023, 9, 13, 23, 55, tzinfo=<DstTzInfo 'Asia/Manila' PST+8:00:00 STD>),
+      'production': dict({
+        'biomass': 22.5,
+        'coal': 927.1405,
+        'geothermal': 83.2,
+        'hydro': 644.4,
+        'oil': 115.0,
+        'solar': 0.0,
+        'unknown': 0.0,
+      }),
+      'source': 'iemop.ph',
+      'sourceType': <EventSourceType.measured: 'measured'>,
+      'storage': dict({
+        'battery': -0.0,
+      }),
+      'zoneKey': 'PH-MI',
+    }),
+  ])
+# ---
+# name: test_production[PH-VI]
+  list([
+    dict({
+      'correctedModes': list([
+      ]),
+      'datetime': datetime.datetime(2023, 9, 13, 23, 0, tzinfo=<DstTzInfo 'Asia/Manila' PST+8:00:00 STD>),
+      'production': dict({
+        'biomass': 31.0,
+        'coal': 984.4905,
+        'geothermal': 309.4,
+        'hydro': 15.3,
+        'oil': 15.8,
+        'solar': 0.0,
+        'unknown': 320.0,
+        'wind': 6.3,
+      }),
+      'source': 'iemop.ph',
+      'sourceType': <EventSourceType.measured: 'measured'>,
+      'storage': dict({
+        'battery': -10.0,
+      }),
+      'zoneKey': 'PH-VI',
+    }),
+    dict({
+      'correctedModes': list([
+      ]),
+      'datetime': datetime.datetime(2023, 9, 13, 23, 5, tzinfo=<DstTzInfo 'Asia/Manila' PST+8:00:00 STD>),
+      'production': dict({
+        'biomass': 31.0,
+        'coal': 1008.2105,
+        'geothermal': 309.4,
+        'hydro': 15.3,
+        'oil': 14.8,
+        'solar': 0.0,
+        'unknown': 320.0,
+        'wind': 6.3,
+      }),
+      'source': 'iemop.ph',
+      'sourceType': <EventSourceType.measured: 'measured'>,
+      'storage': dict({
+        'battery': -10.0,
+      }),
+      'zoneKey': 'PH-VI',
+    }),
+    dict({
+      'correctedModes': list([
+      ]),
+      'datetime': datetime.datetime(2023, 9, 13, 23, 10, tzinfo=<DstTzInfo 'Asia/Manila' PST+8:00:00 STD>),
+      'production': dict({
+        'biomass': 31.0,
+        'coal': 1018.81,
+        'geothermal': 309.4,
+        'hydro': 15.3,
+        'oil': 14.8,
+        'solar': 0.0,
+        'unknown': 320.0,
+        'wind': 6.3,
+      }),
+      'source': 'iemop.ph',
+      'sourceType': <EventSourceType.measured: 'measured'>,
+      'storage': dict({
+        'battery': -10.0,
+      }),
+      'zoneKey': 'PH-VI',
+    }),
+    dict({
+      'correctedModes': list([
+      ]),
+      'datetime': datetime.datetime(2023, 9, 13, 23, 15, tzinfo=<DstTzInfo 'Asia/Manila' PST+8:00:00 STD>),
+      'production': dict({
+        'biomass': 31.0,
+        'coal': 1003.81,
+        'geothermal': 309.4,
+        'hydro': 15.3,
+        'oil': 14.8,
+        'solar': 0.0,
+        'unknown': 320.0,
+        'wind': 7.5,
+      }),
+      'source': 'iemop.ph',
+      'sourceType': <EventSourceType.measured: 'measured'>,
+      'storage': dict({
+        'battery': -10.0,
+      }),
+      'zoneKey': 'PH-VI',
+    }),
+    dict({
+      'correctedModes': list([
+      ]),
+      'datetime': datetime.datetime(2023, 9, 13, 23, 20, tzinfo=<DstTzInfo 'Asia/Manila' PST+8:00:00 STD>),
+      'production': dict({
+        'biomass': 31.0,
+        'coal': 979.31,
+        'geothermal': 309.4,
+        'hydro': 15.3,
+        'oil': 14.8,
+        'solar': 0.0,
+        'unknown': 320.0,
+        'wind': 7.4,
+      }),
+      'source': 'iemop.ph',
+      'sourceType': <EventSourceType.measured: 'measured'>,
+      'storage': dict({
+        'battery': -10.0,
+      }),
+      'zoneKey': 'PH-VI',
+    }),
+    dict({
+      'correctedModes': list([
+      ]),
+      'datetime': datetime.datetime(2023, 9, 13, 23, 25, tzinfo=<DstTzInfo 'Asia/Manila' PST+8:00:00 STD>),
+      'production': dict({
+        'biomass': 31.0,
+        'coal': 975.2524,
+        'geothermal': 309.4,
+        'hydro': 15.3,
+        'oil': 15.08,
+        'solar': 0.0,
+        'unknown': 320.0,
+        'wind': 7.5,
+      }),
+      'source': 'iemop.ph',
+      'sourceType': <EventSourceType.measured: 'measured'>,
+      'storage': dict({
+        'battery': -10.0,
+      }),
+      'zoneKey': 'PH-VI',
+    }),
+    dict({
+      'correctedModes': list([
+      ]),
+      'datetime': datetime.datetime(2023, 9, 13, 23, 30, tzinfo=<DstTzInfo 'Asia/Manila' PST+8:00:00 STD>),
+      'production': dict({
+        'biomass': 31.0,
+        'coal': 968.0,
+        'geothermal': 309.4,
+        'hydro': 15.3,
+        'oil': 15.77,
+        'solar': 0.0,
+        'unknown': 320.0,
+        'wind': 7.3,
+      }),
+      'source': 'iemop.ph',
+      'sourceType': <EventSourceType.measured: 'measured'>,
+      'storage': dict({
+        'battery': -10.0,
+      }),
+      'zoneKey': 'PH-VI',
+    }),
+    dict({
+      'correctedModes': list([
+      ]),
+      'datetime': datetime.datetime(2023, 9, 13, 23, 35, tzinfo=<DstTzInfo 'Asia/Manila' PST+8:00:00 STD>),
+      'production': dict({
+        'biomass': 31.0,
+        'coal': 949.7086,
+        'geothermal': 309.4,
+        'hydro': 15.3,
+        'oil': 16.73,
+        'solar': 0.0,
+        'unknown': 320.0,
+        'wind': 7.3,
+      }),
+      'source': 'iemop.ph',
+      'sourceType': <EventSourceType.measured: 'measured'>,
+      'storage': dict({
+        'battery': -10.0,
+      }),
+      'zoneKey': 'PH-VI',
+    }),
+    dict({
+      'correctedModes': list([
+      ]),
+      'datetime': datetime.datetime(2023, 9, 13, 23, 40, tzinfo=<DstTzInfo 'Asia/Manila' PST+8:00:00 STD>),
+      'production': dict({
+        'biomass': 31.0,
+        'coal': 943.0,
+        'geothermal': 309.4,
+        'hydro': 15.3,
+        'oil': 16.7,
+        'solar': 0.0,
+        'unknown': 320.0,
+        'wind': 7.3,
+      }),
+      'source': 'iemop.ph',
+      'sourceType': <EventSourceType.measured: 'measured'>,
+      'storage': dict({
+        'battery': -10.0,
+      }),
+      'zoneKey': 'PH-VI',
+    }),
+    dict({
+      'correctedModes': list([
+      ]),
+      'datetime': datetime.datetime(2023, 9, 13, 23, 45, tzinfo=<DstTzInfo 'Asia/Manila' PST+8:00:00 STD>),
+      'production': dict({
+        'biomass': 31.0,
+        'coal': 930.4156,
+        'geothermal': 309.4,
+        'hydro': 15.3,
+        'oil': 16.49,
+        'solar': 0.0,
+        'unknown': 320.0,
+        'wind': 7.3,
+      }),
+      'source': 'iemop.ph',
+      'sourceType': <EventSourceType.measured: 'measured'>,
+      'storage': dict({
+        'battery': -10.0,
+      }),
+      'zoneKey': 'PH-VI',
+    }),
+    dict({
+      'correctedModes': list([
+      ]),
+      'datetime': datetime.datetime(2023, 9, 13, 23, 50, tzinfo=<DstTzInfo 'Asia/Manila' PST+8:00:00 STD>),
+      'production': dict({
+        'biomass': 31.0,
+        'coal': 915.65,
+        'geothermal': 309.4,
+        'hydro': 15.3,
+        'oil': 16.85,
+        'solar': 0.0,
+        'unknown': 320.0,
+        'wind': 7.3,
+      }),
+      'source': 'iemop.ph',
+      'sourceType': <EventSourceType.measured: 'measured'>,
+      'storage': dict({
+        'battery': -10.0,
+      }),
+      'zoneKey': 'PH-VI',
+    }),
+    dict({
+      'correctedModes': list([
+      ]),
+      'datetime': datetime.datetime(2023, 9, 13, 23, 55, tzinfo=<DstTzInfo 'Asia/Manila' PST+8:00:00 STD>),
+      'production': dict({
+        'biomass': 31.0,
+        'coal': 899.99,
+        'geothermal': 309.4,
+        'hydro': 15.3,
+        'oil': 16.37,
+        'solar': 0.0,
+        'unknown': 320.0,
+        'wind': 7.3,
+      }),
+      'source': 'iemop.ph',
+      'sourceType': <EventSourceType.measured: 'measured'>,
+      'storage': dict({
+        'battery': -10.0,
+      }),
+      'zoneKey': 'PH-VI',
+    }),
+  ])
+# ---
diff --git a/parsers/test/__snapshots__/test_TAIPOWER.ambr b/parsers/test/__snapshots__/test_TAIPOWER.ambr
new file mode 100644
index 0000000000..a1c913c717
--- /dev/null
+++ b/parsers/test/__snapshots__/test_TAIPOWER.ambr
@@ -0,0 +1,40 @@
+# serializer version: 1
+# name: test_production
+  list([
+    dict({
+      'capacity': dict({
+        'biomass': 38.2,
+        'coal': 14197.2,
+        'gas': 18060.6,
+        'geothermal': 7.2,
+        'hydro': 2101.9999999999995,
+        'nuclear': 1902.0,
+        'oil': 1592.5,
+        'solar': 11304.099999999999,
+        'unknown': 626.9,
+        'wind': 1032.4,
+      }),
+      'correctedModes': list([
+      ]),
+      'datetime': datetime.datetime(2023, 12, 29, 19, 10, tzinfo=zoneinfo.ZoneInfo(key='Asia/Taipei')),
+      'production': dict({
+        'biomass': 25.8,
+        'coal': 6367.6,
+        'gas': 14010.6,
+        'geothermal': 2.6,
+        'hydro': 458.7,
+        'nuclear': 1894.4,
+        'oil': 314.5,
+        'solar': 0.0,
+        'unknown': 1494.6,
+        'wind': 1712.7,
+      }),
+      'source': 'taipower.com.tw',
+      'sourceType': <EventSourceType.measured: 'measured'>,
+      'storage': dict({
+        'hydro': -935.7,
+      }),
+      'zoneKey': 'TW',
+    }),
+  ])
+# ---