diff --git a/weather_datasources.yaml b/weather_datasources.yaml
index f159d51d987b9579a99238cf20264b25cfd3d54f..4cd2014681a8cba7ebf5436ffcecbfb3682299aa 100644
--- a/weather_datasources.yaml
+++ b/weather_datasources.yaml
@@ -107,46 +107,12 @@ datasources:
       forecast: 0
       intervals:
         - 3600
-    access_type: station
+    access_type: stations
     spatial:
       countries: 
         - MWI
       geoJSON: |- 
-        {
-          "type": "FeatureCollection", 
-          "features": [
-            {"type": "Feature", "geometry": {"type": "Point", "coordinates": ["35.21617", "-15.903429"]}, "properties": {"name": "MUST", "id": "TA00321"}}, 
-            {"type": "Feature", "geometry": {"type": "Point", "coordinates": ["34.85131", "-15.447727"]}, "properties": {"name": "Lisungwi EPA", "id": "TA00322"}}, 
-            {"type": "Feature", "geometry": {"type": "Point", "coordinates": ["34.87006", "-15.670962"]}, "properties": {"name": "Kunthembwe EPA", "id": "TA00323"}}, 
-            {"type": "Feature", "geometry": {"type": "Point", "coordinates": ["35.28069", "-15.758669"]}, "properties": {"name": "Mombezi Agriculture", "id": "TA00324"}}, 
-            {"type": "Feature", "geometry": {"type": "Point", "coordinates": ["34.97091", "-15.488575"]}, "properties": {"name": "Namikasi", "id": "TA00325"}}, 
-            {"type": "Feature", "geometry": {"type": "Point", "coordinates": ["35.1033", "-16.583949"]}, "properties": {"name": "Bagnula", "id": "TA00327"}}, 
-            {"type": "Feature", "geometry": {"type": "Point", "coordinates": ["35.35609", "-15.916054"]}, "properties": {"name": "Thuchila Agriculture", "id": "TA00329"}}, 
-            {"type": "Feature", "geometry": {"type": "Point", "coordinates": ["35.24139", "-15.75662"]}, "properties": {"name": "Thumbwe Agriculture", "id": "TA00330"}}, 
-            {"type": "Feature", "geometry": {"type": "Point", "coordinates": ["35.043804", "-15.763918"]}, "properties": {"name": "Ndirande Secondary School", "id": "TA00331"}}, 
-            {"type": "Feature", "geometry": {"type": "Point", "coordinates": ["35.320676", "-15.689893"]}, "properties": {"name": "Milepa Agriculture", "id": "TA00332"}}, 
-            {"type": "Feature", "geometry": {"type": "Point", "coordinates": ["34.9765", "-14.71191"]}, "properties": {"name": "Chilip\u00e5 Agriculture", "id": "TA00351"}}, 
-            {"type": "Feature", "geometry": {"type": "Point", "coordinates": ["34.115317", "-14.166357"]}, "properties": {"name": "Linthipe Agriculture", "id": "TA00353"}}, 
-            {"type": "Feature", "geometry": {"type": "Point", "coordinates": ["33.579343", "-10.948273"]}, "properties": {"name": "Mwazisi", "id": "TA00361"}}, 
-            {"type": "Feature", "geometry": {"type": "Point", "coordinates": ["33.996286", "-12.244702"]}, "properties": {"name": "Dwambazi Agriculture", "id": "TA00362"}}, 
-            {"type": "Feature", "geometry": {"type": "Point", "coordinates": ["33.773147", "-9.593626"]}, "properties": {"name": "Songwe Water Board", "id": "TA00363"}}, 
-            {"type": "Feature", "geometry": {"type": "Point", "coordinates": ["33.604265", "-11.286344"]}, "properties": {"name": "Mpherembe Agriculture", "id": "TA00367"}}, 
-            {"type": "Feature", "geometry": {"type": "Point", "coordinates": ["34.046081", "-11.425561"]}, "properties": {"name": "Lunyangwa Research Station", "id": "TA00368"}}, 
-            {"type": "Feature", "geometry": {"type": "Point", "coordinates": ["33.4266215", "-11.4542682"]}, "properties": {"name": "Euthini Agriculture", "id": "TA00369"}}, 
-            {"type": "Feature", "geometry": {"type": "Point", "coordinates": ["33.685373", "-13.032491"]}, "properties": {"name": "Kamuzu Academy", "id": "TA00375"}}, 
-            {"type": "Feature", "geometry": {"type": "Point", "coordinates": ["33.598781", "-12.33256"]}, "properties": {"name": "Champhira Agriculture", "id": "TA00376"}}, 
-            {"type": "Feature", "geometry": {"type": "Point", "coordinates": ["34.585986", "-13.673076"]}, "properties": {"name": "Lifuwu Research", "id": "TA00390"}}, 
-            {"type": "Feature", "geometry": {"type": "Point", "coordinates": ["33.907593", "-14.080148"]}, "properties": {"name": "Nathenje", "id": "TA00601"}}, 
-            {"type": "Feature", "geometry": {"type": "Point", "coordinates": ["34.614791", "-14.594091"]}, "properties": {"name": "Kandeu", "id": "TA00602"}}, 
-            {"type": "Feature", "geometry": {"type": "Point", "coordinates": ["32.883259", "-13.799338"]}, "properties": {"name": "Mchinji EPA", "id": "TA00636"}}, 
-            {"type": "Feature", "geometry": {"type": "Point", "coordinates": ["33.591361", "-14.206029"]}, "properties": {"name": "Katete Forest", "id": "TA00637"}}, 
-            {"type": "Feature", "geometry": {"type": "Point", "coordinates": ["33.509056", "-13.170715"]}, "properties": {"name": "Lisasadzi", "id": "TA00638"}}, 
-            {"type": "Feature", "geometry": {"type": "Point", "coordinates": ["34.492238", "-13.98426896"]}, "properties": {"name": "Chipoka Seconday School", "id": "TA00639"}}, 
-            {"type": "Feature", "geometry": {"type": "Point", "coordinates": ["35.353814", "-14.045407"]}, "properties": {"name": "Ngapani", "id": "TA00640"}}, 
-            {"type": "Feature", "geometry": {"type": "Point", "coordinates": ["33.388663", "-14.021556"]}, "properties": {"name": "Chileka", "id": "TA00641"}}, 
-            {"type": "Feature", "geometry": {"type": "Point", "coordinates": ["34.886808", "-15.215661"]}, "properties": {"name": "Phalula", "id": "TA00642"}}
-          ]
-        }
+        {"type": "FeatureCollection", "features": [{"type": "Feature", "id": "TA00321", "geometry": {"type": "Point", "coordinates": ["35.21617", "-15.903429"]}, "properties": {"name": "MUST", "id": "TA00321"}}, {"type": "Feature", "id": "TA00322", "geometry": {"type": "Point", "coordinates": ["34.85131", "-15.447727"]}, "properties": {"name": "Lisungwi EPA", "id": "TA00322"}}, {"type": "Feature", "id": "TA00323", "geometry": {"type": "Point", "coordinates": ["34.87006", "-15.670962"]}, "properties": {"name": "Kunthembwe EPA", "id": "TA00323"}}, {"type": "Feature", "id": "TA00324", "geometry": {"type": "Point", "coordinates": ["35.28069", "-15.758669"]}, "properties": {"name": "Mombezi Agriculture", "id": "TA00324"}}, {"type": "Feature", "id": "TA00325", "geometry": {"type": "Point", "coordinates": ["34.97091", "-15.488575"]}, "properties": {"name": "Namikasi", "id": "TA00325"}}, {"type": "Feature", "id": "TA00327", "geometry": {"type": "Point", "coordinates": ["35.1033", "-16.583949"]}, "properties": {"name": "Bagnula", "id": "TA00327"}}, {"type": "Feature", "id": "TA00329", "geometry": {"type": "Point", "coordinates": ["35.35609", "-15.916054"]}, "properties": {"name": "Thuchila Agriculture", "id": "TA00329"}}, {"type": "Feature", "id": "TA00330", "geometry": {"type": "Point", "coordinates": ["35.24139", "-15.75662"]}, "properties": {"name": "Thumbwe Agriculture", "id": "TA00330"}}, {"type": "Feature", "id": "TA00331", "geometry": {"type": "Point", "coordinates": ["35.043804", "-15.763918"]}, "properties": {"name": "Ndirande Secondary School", "id": "TA00331"}}, {"type": "Feature", "id": "TA00332", "geometry": {"type": "Point", "coordinates": ["35.320676", "-15.689893"]}, "properties": {"name": "Milepa Agriculture", "id": "TA00332"}}, {"type": "Feature", "id": "TA00351", "geometry": {"type": "Point", "coordinates": ["34.9765", "-14.71191"]}, "properties": {"name": "Chilip\u00e5 Agriculture", "id": "TA00351"}}, {"type": "Feature", "id": "TA00353", "geometry": {"type": "Point", "coordinates": ["34.115317", "-14.166357"]}, "properties": {"name": "Linthipe Agriculture", "id": "TA00353"}}, {"type": "Feature", "id": "TA00361", "geometry": {"type": "Point", "coordinates": ["33.579343", "-10.948273"]}, "properties": {"name": "Mwazisi", "id": "TA00361"}}, {"type": "Feature", "id": "TA00362", "geometry": {"type": "Point", "coordinates": ["33.996286", "-12.244702"]}, "properties": {"name": "Dwambazi Agriculture", "id": "TA00362"}}, {"type": "Feature", "id": "TA00363", "geometry": {"type": "Point", "coordinates": ["33.773147", "-9.593626"]}, "properties": {"name": "Songwe Water Board", "id": "TA00363"}}, {"type": "Feature", "id": "TA00367", "geometry": {"type": "Point", "coordinates": ["33.604265", "-11.286344"]}, "properties": {"name": "Mpherembe Agriculture", "id": "TA00367"}}, {"type": "Feature", "id": "TA00368", "geometry": {"type": "Point", "coordinates": ["34.046081", "-11.425561"]}, "properties": {"name": "Lunyangwa Research Station", "id": "TA00368"}}, {"type": "Feature", "id": "TA00369", "geometry": {"type": "Point", "coordinates": ["33.4266215", "-11.4542682"]}, "properties": {"name": "Euthini Agriculture", "id": "TA00369"}}, {"type": "Feature", "id": "TA00375", "geometry": {"type": "Point", "coordinates": ["33.685373", "-13.032491"]}, "properties": {"name": "Kamuzu Academy", "id": "TA00375"}}, {"type": "Feature", "id": "TA00376", "geometry": {"type": "Point", "coordinates": ["33.598781", "-12.33256"]}, "properties": {"name": "Champhira Agriculture", "id": "TA00376"}}, {"type": "Feature", "id": "TA00390", "geometry": {"type": "Point", "coordinates": ["34.585986", "-13.673076"]}, "properties": {"name": "Lifuwu Research", "id": "TA00390"}}, {"type": "Feature", "id": "TA00601", "geometry": {"type": "Point", "coordinates": ["33.907593", "-14.080148"]}, "properties": {"name": "Nathenje", "id": "TA00601"}}, {"type": "Feature", "id": "TA00602", "geometry": {"type": "Point", "coordinates": ["34.614791", "-14.594091"]}, "properties": {"name": "Kandeu", "id": "TA00602"}}, {"type": "Feature", "id": "TA00636", "geometry": {"type": "Point", "coordinates": ["32.883259", "-13.799338"]}, "properties": {"name": "Mchinji EPA", "id": "TA00636"}}, {"type": "Feature", "id": "TA00637", "geometry": {"type": "Point", "coordinates": ["33.591361", "-14.206029"]}, "properties": {"name": "Katete Forest", "id": "TA00637"}}, {"type": "Feature", "id": "TA00638", "geometry": {"type": "Point", "coordinates": ["33.509056", "-13.170715"]}, "properties": {"name": "Lisasadzi", "id": "TA00638"}}, {"type": "Feature", "id": "TA00639", "geometry": {"type": "Point", "coordinates": ["34.492238", "-13.98426896"]}, "properties": {"name": "Chipoka Seconday School", "id": "TA00639"}}, {"type": "Feature", "id": "TA00640", "geometry": {"type": "Point", "coordinates": ["35.353814", "-14.045407"]}, "properties": {"name": "Ngapani", "id": "TA00640"}}, {"type": "Feature", "id": "TA00641", "geometry": {"type": "Point", "coordinates": ["33.388663", "-14.021556"]}, "properties": {"name": "Chileka", "id": "TA00641"}}, {"type": "Feature", "id": "TA00642", "geometry": {"type": "Point", "coordinates": ["34.886808", "-15.215661"]}, "properties": {"name": "Phalula", "id": "TA00642"}}]}
     parameters:
       common:
        - 1002 # Average temperature at 2m (Celcius)