diff --git a/src/r2x/defaults/plexos_reports.json b/src/r2x/defaults/plexos_reports.json
index 0871035..24601b4 100644
--- a/src/r2x/defaults/plexos_reports.json
+++ b/src/r2x/defaults/plexos_reports.json
@@ -1,180 +1,192 @@
 [
   {
-    "child_class": "Constraint",
-    "collection": "Constraints",
+    "child_class": "Battery",
+    "collection": "Batteries",
     "object_name": "base_report",
     "parent_class": "System",
     "phase_id": 4,
-    "property": "Activity",
+    "property": "Generation",
     "report_period": false,
     "report_samples": false,
     "report_statistics": false,
     "report_summary": true
   },
   {
-    "child_class": "Generator",
-    "collection": "Generators",
+    "child_class": "Battery",
+    "collection": "Batteries",
     "object_name": "base_report",
     "parent_class": "System",
     "phase_id": 4,
-    "property": "Available Capacity",
-    "report_period": true,
+    "property": "Load",
+    "report_period": false,
     "report_samples": false,
     "report_statistics": false,
     "report_summary": true
   },
   {
-    "child_class": "Generator",
-    "collection": "Generators",
+    "child_class": "Battery",
+    "collection": "Batteries",
+    "object_name": "base_report",
+    "parent_class": "Reserve",
+    "phase_id": 4,
+    "property": "Provision",
+    "report_period": false,
+    "report_samples": false,
+    "report_statistics": false,
+    "report_summary": true
+  },
+  {
+    "child_class": "Battery",
+    "collection": "Batteries",
     "object_name": "base_report",
     "parent_class": "System",
     "phase_id": 4,
-    "property": "Average Heat Rate",
-    "report_period": true,
+    "property": "SoC",
+    "report_period": false,
     "report_samples": false,
     "report_statistics": false,
     "report_summary": true
   },
   {
-    "child_class": "Generator",
-    "collection": "Generators",
+    "child_class": "Constraint",
+    "collection": "Constraints",
     "object_name": "base_report",
     "parent_class": "System",
     "phase_id": 4,
-    "property": "Capacity Curtailed",
-    "report_period": true,
+    "property": "Activity",
+    "report_period": false,
     "report_samples": false,
     "report_statistics": false,
     "report_summary": true
   },
   {
-    "child_class": "Generator",
-    "collection": "Generators",
+    "child_class": "Constraint",
+    "collection": "Constraints",
     "object_name": "base_report",
     "parent_class": "System",
     "phase_id": 4,
-    "property": "Capacity Factor",
-    "report_period": true,
+    "property": "Hours Binding",
+    "report_period": false,
     "report_samples": false,
     "report_statistics": false,
     "report_summary": true
   },
   {
-    "child_class": "Fuel",
-    "collection": "Fuels",
+    "child_class": "Constraint",
+    "collection": "Constraints",
     "object_name": "base_report",
     "parent_class": "System",
     "phase_id": 4,
-    "property": "Cost",
-    "report_period": true,
+    "property": "Penalty Cost",
+    "report_period": false,
     "report_samples": false,
     "report_statistics": false,
     "report_summary": true
   },
   {
-    "child_class": "Region",
-    "collection": "Regions",
+    "child_class": "Constraint",
+    "collection": "Constraints",
     "object_name": "base_report",
     "parent_class": "System",
     "phase_id": 4,
-    "property": "Dump Energy",
+    "property": "Violation",
     "report_period": false,
     "report_samples": false,
     "report_statistics": false,
-    "report_summary": false
+    "report_summary": true
   },
   {
-    "child_class": "Generator",
-    "collection": "Generators",
+    "child_class": "Emission",
+    "collection": "Emissions",
     "object_name": "base_report",
     "parent_class": "System",
     "phase_id": 4,
-    "property": "Emissions Cost",
+    "property": "Max Production Violation",
     "report_period": true,
     "report_samples": false,
     "report_statistics": false,
     "report_summary": true
   },
   {
-    "child_class": "Line",
-    "collection": "Lines",
+    "child_class": "Emission",
+    "collection": "Emissions",
     "object_name": "base_report",
     "parent_class": "System",
     "phase_id": 4,
-    "property": "Export Limit",
-    "report_period": false,
+    "property": "Production",
+    "report_period": true,
     "report_samples": false,
     "report_statistics": false,
     "report_summary": true
   },
   {
-    "child_class": "Line",
-    "collection": "Lines",
+    "child_class": "Emission",
+    "collection": "Emissions",
     "object_name": "base_report",
     "parent_class": "System",
     "phase_id": 4,
-    "property": "Flow",
+    "property": "Shadow Price",
     "report_period": true,
     "report_samples": false,
     "report_statistics": false,
     "report_summary": true
   },
   {
-    "child_class": "Line",
-    "collection": "Lines",
+    "child_class": "Fuel",
+    "collection": "Fuels",
     "object_name": "base_report",
     "parent_class": "System",
     "phase_id": 4,
-    "property": "Wheeling Cost",
+    "property": "Cost",
     "report_period": true,
     "report_samples": false,
     "report_statistics": false,
     "report_summary": true
   },
   {
-    "child_class": "Region",
-    "collection": "Regions",
+    "child_class": "Fuel",
+    "collection": "Fuels",
     "object_name": "base_report",
     "parent_class": "System",
     "phase_id": 4,
-    "property": "Exports",
+    "property": "Offtake",
     "report_period": true,
     "report_samples": false,
     "report_statistics": false,
     "report_summary": true
   },
   {
-    "child_class": "Region",
-    "collection": "Regions",
+    "child_class": "Generator",
+    "collection": "Generators",
     "object_name": "base_report",
     "parent_class": "System",
     "phase_id": 4,
-    "property": "Fixed Load",
+    "property": "Available Capacity",
     "report_period": true,
     "report_samples": false,
     "report_statistics": false,
     "report_summary": true
   },
   {
-    "child_class": "Interface",
-    "collection": "Interfaces",
+    "child_class": "Generator",
+    "collection": "Generators",
     "object_name": "base_report",
     "parent_class": "System",
     "phase_id": 4,
-    "property": "Flow",
-    "report_period": false,
+    "property": "Average Heat Rate",
+    "report_period": true,
     "report_samples": false,
     "report_statistics": false,
     "report_summary": true
   },
   {
-    "child_class": "Interface",
-    "collection": "Interfaces",
+    "child_class": "Generator",
+    "collection": "Generators",
     "object_name": "base_report",
     "parent_class": "System",
     "phase_id": 4,
-    "property": "Flow Back",
-    "report_period": false,
+    "property": "Capacity Curtailed",
+    "report_period": true,
     "report_samples": false,
     "report_statistics": false,
     "report_summary": true
@@ -185,7 +197,7 @@
     "object_name": "base_report",
     "parent_class": "System",
     "phase_id": 4,
-    "property": "Forced Outage",
+    "property": "Capacity Factor",
     "report_period": true,
     "report_samples": false,
     "report_statistics": false,
@@ -197,7 +209,7 @@
     "object_name": "base_report",
     "parent_class": "System",
     "phase_id": 4,
-    "property": "Fuel Cost",
+    "property": "Emissions Cost",
     "report_period": true,
     "report_samples": false,
     "report_statistics": false,
@@ -209,7 +221,7 @@
     "object_name": "base_report",
     "parent_class": "System",
     "phase_id": 4,
-    "property": "Fuel Offtake",
+    "property": "Forced Outage",
     "report_period": true,
     "report_samples": false,
     "report_statistics": false,
@@ -221,91 +233,91 @@
     "object_name": "base_report",
     "parent_class": "System",
     "phase_id": 4,
-    "property": "Generation",
+    "property": "Fuel Cost",
     "report_period": true,
     "report_samples": false,
     "report_statistics": false,
     "report_summary": true
   },
   {
-    "child_class": "Constraint",
-    "collection": "Constraints",
+    "child_class": "Generator",
+    "collection": "Generators",
     "object_name": "base_report",
     "parent_class": "System",
     "phase_id": 4,
-    "property": "Hours Binding",
-    "report_period": false,
+    "property": "Fuel Offtake",
+    "report_period": true,
     "report_samples": false,
     "report_statistics": false,
     "report_summary": true
   },
   {
-    "child_class": "Interface",
-    "collection": "Interfaces",
+    "child_class": "Generator",
+    "collection": "Generators",
     "object_name": "base_report",
     "parent_class": "System",
     "phase_id": 4,
-    "property": "Hours Congested",
-    "report_period": false,
+    "property": "Generation",
+    "report_period": true,
     "report_samples": false,
     "report_statistics": false,
     "report_summary": true
   },
   {
-    "child_class": "Interface",
-    "collection": "Interfaces",
+    "child_class": "Generator",
+    "collection": "Generators",
     "object_name": "base_report",
     "parent_class": "System",
     "phase_id": 4,
-    "property": "Hours Congested Back",
+    "property": "Installed Capacity",
     "report_period": false,
     "report_samples": false,
-    "report_statistics": false,
+    "report_statistics": true,
     "report_summary": true
   },
   {
-    "child_class": "Line",
-    "collection": "Lines",
+    "child_class": "Generator",
+    "collection": "Generators",
     "object_name": "base_report",
     "parent_class": "System",
     "phase_id": 4,
-    "property": "Import Limit",
-    "report_period": false,
+    "property": "Maintenance",
+    "report_period": true,
     "report_samples": false,
     "report_statistics": false,
     "report_summary": true
   },
   {
-    "child_class": "Region",
-    "collection": "Regions",
+    "child_class": "Generator",
+    "collection": "Generators",
     "object_name": "base_report",
     "parent_class": "System",
     "phase_id": 4,
-    "property": "Imports",
+    "property": "Marginal Heat Rate",
     "report_period": true,
     "report_samples": false,
     "report_statistics": false,
     "report_summary": true
   },
   {
-    "child_class": "Storage",
-    "collection": "Storages",
+    "child_class": "Generator",
+    "collection": "Generators",
     "object_name": "base_report",
     "parent_class": "System",
     "phase_id": 4,
-    "property": "Inflow",
+    "property": "Max Energy Violation",
     "report_period": true,
     "report_samples": false,
     "report_statistics": false,
     "report_summary": true
   },
   {
-    "child_class": "Storage",
-    "collection": "Storages",
+    "child_class": "Generator",
+    "collection": "Generators",
     "object_name": "base_report",
     "parent_class": "System",
     "phase_id": 4,
-    "property": "Initial Volume",
+    "property": "Price Received",
     "report_period": true,
     "report_samples": false,
     "report_statistics": false,
@@ -315,45 +327,45 @@
     "child_class": "Generator",
     "collection": "Generators",
     "object_name": "base_report",
-    "parent_class": "System",
+    "parent_class": "Reserve",
     "phase_id": 4,
-    "property": "Installed Capacity",
-    "report_period": false,
+    "property": "Provision",
+    "report_period": true,
     "report_samples": false,
-    "report_statistics": true,
+    "report_statistics": false,
     "report_summary": true
   },
   {
-    "child_class": "Region",
-    "collection": "Regions",
+    "child_class": "Generator",
+    "collection": "Generators",
     "object_name": "base_report",
     "parent_class": "System",
     "phase_id": 4,
-    "property": "Interregional Transmission Losses",
+    "property": "Pump Load",
     "report_period": true,
     "report_samples": false,
     "report_statistics": false,
     "report_summary": true
   },
   {
-    "child_class": "Region",
-    "collection": "Regions",
+    "child_class": "Generator",
+    "collection": "Generators",
     "object_name": "base_report",
     "parent_class": "System",
     "phase_id": 4,
-    "property": "Load",
+    "property": "Ramp Down",
     "report_period": true,
     "report_samples": false,
     "report_statistics": false,
     "report_summary": true
   },
   {
-    "child_class": "Line",
-    "collection": "Lines",
+    "child_class": "Generator",
+    "collection": "Generators",
     "object_name": "base_report",
     "parent_class": "System",
     "phase_id": 4,
-    "property": "Loss",
+    "property": "Ramp Up",
     "report_period": true,
     "report_samples": false,
     "report_statistics": false,
@@ -365,7 +377,7 @@
     "object_name": "base_report",
     "parent_class": "System",
     "phase_id": 4,
-    "property": "Maintenance",
+    "property": "SRMC",
     "report_period": true,
     "report_samples": false,
     "report_statistics": false,
@@ -377,7 +389,7 @@
     "object_name": "base_report",
     "parent_class": "System",
     "phase_id": 4,
-    "property": "Marginal Heat Rate",
+    "property": "Start & Shutdown Cost",
     "report_period": true,
     "report_samples": false,
     "report_statistics": false,
@@ -389,307 +401,319 @@
     "object_name": "base_report",
     "parent_class": "System",
     "phase_id": 4,
-    "property": "Max Energy Violation",
+    "property": "Start Fuel Offtake",
     "report_period": true,
     "report_samples": false,
     "report_statistics": false,
     "report_summary": true
   },
   {
-    "child_class": "Line",
-    "collection": "Lines",
+    "child_class": "Generator",
+    "collection": "Generators",
     "object_name": "base_report",
     "parent_class": "System",
     "phase_id": 4,
-    "property": "Max Flow",
-    "report_period": false,
+    "property": "Units Generating",
+    "report_period": true,
     "report_samples": false,
     "report_statistics": false,
     "report_summary": false
   },
   {
-    "child_class": "Emission",
-    "collection": "Emissions",
+    "child_class": "Generator",
+    "collection": "Generators",
     "object_name": "base_report",
     "parent_class": "System",
     "phase_id": 4,
-    "property": "Max Production Violation",
+    "property": "Units Shutdown",
     "report_period": true,
     "report_samples": false,
     "report_statistics": false,
     "report_summary": true
   },
   {
-    "child_class": "Storage",
-    "collection": "Storages",
+    "child_class": "Generator",
+    "collection": "Generators",
     "object_name": "base_report",
     "parent_class": "System",
     "phase_id": 4,
-    "property": "Max Volume",
+    "property": "Units Started",
     "report_period": true,
     "report_samples": false,
     "report_statistics": false,
     "report_summary": true
   },
   {
-    "child_class": "Line",
-    "collection": "Lines",
+    "child_class": "Generator",
+    "collection": "Generators",
     "object_name": "base_report",
     "parent_class": "System",
     "phase_id": 4,
-    "property": "Min Flow",
-    "report_period": false,
+    "property": "UoS Cost",
+    "report_period": true,
     "report_samples": false,
     "report_statistics": false,
-    "report_summary": false
+    "report_summary": true
   },
   {
-    "child_class": "Region",
-    "collection": "Regions",
+    "child_class": "Generator",
+    "collection": "Generators",
     "object_name": "base_report",
     "parent_class": "System",
     "phase_id": 4,
-    "property": "Native Load",
+    "property": "VO&M Cost",
     "report_period": true,
     "report_samples": false,
     "report_statistics": false,
     "report_summary": true
   },
   {
-    "child_class": "Region",
-    "collection": "Regions",
+    "child_class": "Interface",
+    "collection": "Interfaces",
     "object_name": "base_report",
     "parent_class": "System",
     "phase_id": 4,
-    "property": "Net Interchange",
-    "report_period": true,
+    "property": "Flow",
+    "report_period": false,
     "report_samples": false,
     "report_statistics": false,
     "report_summary": true
   },
   {
-    "child_class": "Fuel",
-    "collection": "Fuels",
+    "child_class": "Interface",
+    "collection": "Interfaces",
     "object_name": "base_report",
     "parent_class": "System",
     "phase_id": 4,
-    "property": "Offtake",
-    "report_period": true,
+    "property": "Flow Back",
+    "report_period": false,
     "report_samples": false,
     "report_statistics": false,
     "report_summary": true
   },
   {
-    "child_class": "Constraint",
-    "collection": "Constraints",
+    "child_class": "Interface",
+    "collection": "Interfaces",
     "object_name": "base_report",
     "parent_class": "System",
     "phase_id": 4,
-    "property": "Penalty Cost",
+    "property": "Hours Congested",
     "report_period": false,
     "report_samples": false,
     "report_statistics": false,
     "report_summary": true
   },
   {
-    "child_class": "Region",
-    "collection": "Regions",
+    "child_class": "Interface",
+    "collection": "Interfaces",
     "object_name": "base_report",
     "parent_class": "System",
     "phase_id": 4,
-    "property": "Price",
-    "report_period": true,
+    "property": "Hours Congested Back",
+    "report_period": false,
     "report_samples": false,
     "report_statistics": false,
     "report_summary": true
   },
   {
-    "child_class": "Generator",
-    "collection": "Generators",
+    "child_class": "Interface",
+    "collection": "Interfaces",
     "object_name": "base_report",
     "parent_class": "System",
     "phase_id": 4,
-    "property": "Price Received",
-    "report_period": true,
+    "property": "Shadow Price Back",
+    "report_period": false,
     "report_samples": false,
     "report_statistics": false,
     "report_summary": true
   },
   {
-    "child_class": "Emission",
-    "collection": "Emissions",
+    "child_class": "Line",
+    "collection": "Lines",
     "object_name": "base_report",
     "parent_class": "System",
     "phase_id": 4,
-    "property": "Production",
-    "report_period": true,
+    "property": "Export Limit",
+    "report_period": false,
     "report_samples": false,
     "report_statistics": false,
     "report_summary": true
   },
   {
-    "child_class": "Generator",
-    "collection": "Generators",
+    "child_class": "Line",
+    "collection": "Lines",
     "object_name": "base_report",
-    "parent_class": "Reserve",
+    "parent_class": "System",
     "phase_id": 4,
-    "property": "Provision",
+    "property": "Flow",
     "report_period": true,
     "report_samples": false,
     "report_statistics": false,
     "report_summary": true
   },
   {
-    "child_class": "Generator",
-    "collection": "Generators",
+    "child_class": "Line",
+    "collection": "Lines",
     "object_name": "base_report",
     "parent_class": "System",
     "phase_id": 4,
-    "property": "Pump Load",
-    "report_period": true,
+    "property": "Import Limit",
+    "report_period": false,
     "report_samples": false,
     "report_statistics": false,
     "report_summary": true
   },
   {
-    "child_class": "Generator",
-    "collection": "Generators",
+    "child_class": "Line",
+    "collection": "Lines",
     "object_name": "base_report",
     "parent_class": "System",
     "phase_id": 4,
-    "property": "Ramp Down",
+    "property": "Loss",
     "report_period": true,
     "report_samples": false,
     "report_statistics": false,
     "report_summary": true
   },
   {
-    "child_class": "Generator",
-    "collection": "Generators",
+    "child_class": "Line",
+    "collection": "Lines",
     "object_name": "base_report",
     "parent_class": "System",
     "phase_id": 4,
-    "property": "Ramp Up",
-    "report_period": true,
+    "property": "Max Flow",
+    "report_period": false,
     "report_samples": false,
     "report_statistics": false,
-    "report_summary": true
+    "report_summary": false
   },
   {
-    "child_class": "Generator",
-    "collection": "Generators",
+    "child_class": "Line",
+    "collection": "Lines",
     "object_name": "base_report",
     "parent_class": "System",
     "phase_id": 4,
-    "property": "SRMC",
-    "report_period": true,
+    "property": "Min Flow",
+    "report_period": false,
     "report_samples": false,
     "report_statistics": false,
-    "report_summary": true
+    "report_summary": false
   },
   {
-    "child_class": "Emission",
-    "collection": "Emissions",
+    "child_class": "Line",
+    "collection": "Lines",
     "object_name": "base_report",
     "parent_class": "System",
     "phase_id": 4,
-    "property": "Shadow Price",
+    "property": "Wheeling Cost",
     "report_period": true,
     "report_samples": false,
     "report_statistics": false,
     "report_summary": true
   },
   {
-    "child_class": "Interface",
-    "collection": "Interfaces",
+    "child_class": "Region",
+    "collection": "Regions",
     "object_name": "base_report",
     "parent_class": "System",
     "phase_id": 4,
-    "property": "Shadow Price Back",
+    "property": "Dump Energy",
     "report_period": false,
     "report_samples": false,
     "report_statistics": false,
+    "report_summary": false
+  },
+  {
+    "child_class": "Region",
+    "collection": "Regions",
+    "object_name": "base_report",
+    "parent_class": "System",
+    "phase_id": 4,
+    "property": "Exports",
+    "report_period": true,
+    "report_samples": false,
+    "report_statistics": false,
     "report_summary": true
   },
   {
-    "child_class": "Reserve",
-    "collection": "Reserves",
+    "child_class": "Region",
+    "collection": "Regions",
     "object_name": "base_report",
     "parent_class": "System",
     "phase_id": 4,
-    "property": "Shortage",
+    "property": "Fixed Load",
     "report_period": true,
     "report_samples": false,
     "report_statistics": false,
     "report_summary": true
   },
   {
-    "child_class": "Storage",
-    "collection": "Storages",
+    "child_class": "Region",
+    "collection": "Regions",
     "object_name": "base_report",
     "parent_class": "System",
     "phase_id": 4,
-    "property": "Spill",
+    "property": "Imports",
     "report_period": true,
     "report_samples": false,
     "report_statistics": false,
     "report_summary": true
   },
   {
-    "child_class": "Generator",
-    "collection": "Generators",
+    "child_class": "Region",
+    "collection": "Regions",
     "object_name": "base_report",
     "parent_class": "System",
     "phase_id": 4,
-    "property": "Start & Shutdown Cost",
+    "property": "Interregional Transmission Losses",
     "report_period": true,
     "report_samples": false,
     "report_statistics": false,
     "report_summary": true
   },
   {
-    "child_class": "Generator",
-    "collection": "Generators",
+    "child_class": "Region",
+    "collection": "Regions",
     "object_name": "base_report",
     "parent_class": "System",
     "phase_id": 4,
-    "property": "Start Fuel Offtake",
+    "property": "Load",
     "report_period": true,
     "report_samples": false,
     "report_statistics": false,
     "report_summary": true
   },
   {
-    "child_class": "Generator",
-    "collection": "Generators",
+    "child_class": "Region",
+    "collection": "Regions",
     "object_name": "base_report",
     "parent_class": "System",
     "phase_id": 4,
-    "property": "Units Generating",
+    "property": "Native Load",
     "report_period": true,
     "report_samples": false,
     "report_statistics": false,
-    "report_summary": false
+    "report_summary": true
   },
   {
-    "child_class": "Generator",
-    "collection": "Generators",
+    "child_class": "Region",
+    "collection": "Regions",
     "object_name": "base_report",
     "parent_class": "System",
     "phase_id": 4,
-    "property": "Units Shutdown",
+    "property": "Net Interchange",
     "report_period": true,
     "report_samples": false,
     "report_statistics": false,
     "report_summary": true
   },
   {
-    "child_class": "Generator",
-    "collection": "Generators",
+    "child_class": "Region",
+    "collection": "Regions",
     "object_name": "base_report",
     "parent_class": "System",
     "phase_id": 4,
-    "property": "Units Started",
+    "property": "Price",
     "report_period": true,
     "report_samples": false,
     "report_statistics": false,
@@ -708,37 +732,61 @@
     "report_summary": true
   },
   {
-    "child_class": "Generator",
-    "collection": "Generators",
+    "child_class": "Reserve",
+    "collection": "Reserves",
     "object_name": "base_report",
     "parent_class": "System",
     "phase_id": 4,
-    "property": "UoS Cost",
+    "property": "Shortage",
     "report_period": true,
     "report_samples": false,
     "report_statistics": false,
     "report_summary": true
   },
   {
-    "child_class": "Generator",
-    "collection": "Generators",
+    "child_class": "Storage",
+    "collection": "Storages",
     "object_name": "base_report",
     "parent_class": "System",
     "phase_id": 4,
-    "property": "VO&M Cost",
+    "property": "Inflow",
     "report_period": true,
     "report_samples": false,
     "report_statistics": false,
     "report_summary": true
   },
   {
-    "child_class": "Constraint",
-    "collection": "Constraints",
+    "child_class": "Storage",
+    "collection": "Storages",
     "object_name": "base_report",
     "parent_class": "System",
     "phase_id": 4,
-    "property": "Violation",
-    "report_period": false,
+    "property": "Initial Volume",
+    "report_period": true,
+    "report_samples": false,
+    "report_statistics": false,
+    "report_summary": true
+  },
+  {
+    "child_class": "Storage",
+    "collection": "Storages",
+    "object_name": "base_report",
+    "parent_class": "System",
+    "phase_id": 4,
+    "property": "Max Volume",
+    "report_period": true,
+    "report_samples": false,
+    "report_statistics": false,
+    "report_summary": true
+  },
+  {
+    "child_class": "Storage",
+    "collection": "Storages",
+    "object_name": "base_report",
+    "parent_class": "System",
+    "phase_id": 4,
+    "property": "Spill",
+    "report_period": true,
     "report_samples": false,
     "report_statistics": false,
     "report_summary": true
diff --git a/src/r2x/defaults/reeds_input.json b/src/r2x/defaults/reeds_input.json
index 7ff8d5a..ed490c3 100644
--- a/src/r2x/defaults/reeds_input.json
+++ b/src/r2x/defaults/reeds_input.json
@@ -90,11 +90,17 @@
     "beccs_mod": "ThermalStandard",
     "biopower": "ThermalStandard",
     "can-imports": "HydroEnergyReservoir",
+    "coal-ccs_mod": "ThermalStandard",
     "coal-igcc": "ThermalStandard",
+    "coal-igcc_coal-ccs_mod": "ThermalStandard",
     "coal-new": "ThermalStandard",
+    "coal-new_coal-ccs_mod": "ThermalStandard",
     "coaloldscr": "ThermalStandard",
+    "coaloldscr_coal-ccs_mod": "ThermalStandard",
     "coalolduns": "ThermalStandard",
+    "coalolduns_coal-ccs_mod": "ThermalStandard",
     "coaluns": "ThermalStandard",
+    "csp": "RenewableNonDispatch",
     "distpv": "RenewableNonDispatch",
     "egs_nearfield": "ThermalStandard",
     "electrolyzer": "InterruptiblePowerLoad",
diff --git a/src/r2x/enums.py b/src/r2x/enums.py
index 2995e85..edbfe39 100644
--- a/src/r2x/enums.py
+++ b/src/r2x/enums.py
@@ -90,3 +90,4 @@ class EmissionType(StrEnum):
     NOX = "NOX"
     SOX = "SOX"
     SO2 = "SO2"
+    N2O = "N2O"