diff --git a/gsy_framework/schemas.py b/gsy_framework/schemas.py
index 5e67a1a2..977318bf 100644
--- a/gsy_framework/schemas.py
+++ b/gsy_framework/schemas.py
@@ -29,7 +29,7 @@ class ScenarioSchemas:
                 "properties": {
                     "type": {"enum": ["Area", "null"]},
                     "name": {"type": "string"},
-                    "const_fee_rate": {"type": "number"},
+                    "const_fee_rate": {"type": ["number", "null"]},
                     "address": {"type": ["string", "null"]},
                     "allow_external_connection": {"type": ["null", "boolean"]},
                     "feed_in_tariff": {"type": ["number", "null"]},
@@ -40,6 +40,8 @@ class ScenarioSchemas:
                     "assistance_monthly_fee": {"type": ["number", "null"]},
                     "market_maker_rate": {"type": ["number", "null"]},
                     "target_market_kpi": {"type": ["number", "null"]},
+                    "forecast_stream_id": {"anyOf": [{"type": "string"}, {"type": "null"}]},
+                    "forecast_stream_enabled": {"type": ["boolean", "null"]},
                     "grid_fee_constant": {"anyOf": [{"type": "number"}, {"type": "null"}]},
                     "grid_import_fee_const": {"anyOf": [{"type": "number"}, {"type": "null"}]},
                     "grid_export_fee_const": {"anyOf": [{"type": "number"}, {"type": "null"}]},
@@ -104,7 +106,8 @@ class ScenarioSchemas:
                     },
                     "capacity_kW": {"type": "number"},
                     "cloud_coverage": {"anyOf": [{"type": "number"}, {"type": "null"}]},
-                    "forecast_stream_id": {"anyOf": [{"type": "number"}, {"type": "null"}]},
+                    "forecast_stream_id": {"anyOf": [{"type": "string"}, {"type": "null"}]},
+                    "forecast_stream_enabled": {"type": ["boolean", "null"]},
                     "power_profile": {
                         "anyOf": [
                             {"type": "object"},
@@ -197,7 +200,8 @@ class ScenarioSchemas:
                     "energy_rate_increase_per_update": {
                         "anyOf": [{"type": "number"}, {"type": "null"}]
                     },
-                    "forecast_stream_id": {"anyOf": [{"type": "number"}, {"type": "null"}]},
+                    "forecast_stream_id": {"anyOf": [{"type": "string"}, {"type": "null"}]},
+                    "forecast_stream_enabled": {"type": ["boolean", "null"]},
                     "daily_load_profile_uuid": {"anyOf": [{"type": "string"}, {"type": "null"}]},
                     "use_market_maker_rate": {"type": ["boolean", "null"]},
                     "daily_load_profile": {
@@ -244,6 +248,7 @@ class ScenarioSchemas:
                     "libraryUUID": {"anyOf": [{"type": "string"}, {"type": "null"}]},
                     "address": {"type": ["string", "null"]},
                     "allow_external_connection": {"type": ["null", "boolean"]},
+                    "forecast_stream_enabled": {"type": ["null", "boolean"]},
                     "geo_tag_location": {},
                     "energy_rate": {"anyOf": [{"type": "number"}, {"type": "null"}]},
                     "energy_buy_rate": {"anyOf": [{"type": "number"}, {"type": "null"}]},
@@ -340,7 +345,8 @@ class ScenarioSchemas:
                         "anyOf": [{"type": "number"}, {"type": "null"}]
                     },
                     "use_market_maker_rate": {"type": "boolean"},
-                    "forecast_stream_id": {"anyOf": [{"type": "number"}, {"type": "null"}]},
+                    "forecast_stream_id": {"anyOf": [{"type": "string"}, {"type": "null"}]},
+                    "forecast_stream_enabled": {"type": ["boolean", "null"]},
                     "prosumption_kWh_profile_uuid": {
                         "anyOf": [{"type": "string"}, {"type": "null"}]
                     },