Suggested modification for heating hot water supply temperature
To modify the heating hot water supply temperature setpoint, the user needs to modify the value in [this template ](https://github.com/urbanopt/geojson-modelica-translator/blob/develop/geojson_modelica_translator/model_connectors/couplings/templates/Network2Pipe_HeatingPlant/ComponentDefinitions.mopt#L10) as well as the building-level setpoint value in the coupling template for the load model type ([this](https://github.com/urbanopt/geojson-modelica-translator/blob/01c893c0d899c39a213d209c09ab76970802b0a0/geojson_modelica_translator/model_connectors/couplings/templates/Teaser_HeatingIndirect/ComponentDefinitions.mopt#L13) as an example for TEASER). It would be nice if these water-side setpoint values for both heating and cooling could be populated based on the system design parameters schema. 

diff --git a/docs/developer_resources.rst b/docs/developer_resources.rst
index 919ef24..c477808 100644
--- a/docs/developer_resources.rst
+++ b/docs/developer_resources.rst
@@ -141,23 +141,27 @@ Model Definition
 
 Each model generates one or more Modelica files to define its model. The templating context is implementation dependent, so refer to its :code:`to_modelica()` method.
 
-Component Definitions
+Coupling Component Definitions
 ^^^^^^^^^^^^^^^^^^^^^
 
-This is the template which defines new components/variables necessary for a coupling. It has access to:
+This is the template which defines new components/variables necessary for a coupling. More specifically, these are the partial template files at model_connectors/couplings/templates/<coupling name>/ComponentDefinitions.mopt. These templates have access to:
 
 - :code:`globals`: global variables (those defined in the district.py, such as medium_w = MediumW)
 - :code:`coupling`: contains the coupling id, as well as references to the coupled models under their respective types (e.g. coupling.load.id or coupling.network.id). You should append :code:`coupling.id` to any variable identifiers to prevent name collisions. For example, instead of just writing :code:`parameter Modelica.SIunits.MassFlowRate mDis_flow_nominal` you should do :code:`parameter Modelica.SIunits.MassFlowRate mDis_flow_nominal_{{ coupling.id }}` as well as any place where you would reference that variable.
 - :code:`graph`: an instance of the CouplingGraph class, where all couplings are located. It can provide useful methods for accessing couplings throughout the entire system. Refer to the python class to see what it can do.
+- :code:`sys_params`: an object containing data from the system parameters file
+  - :code:`district_system`: contains the data from the district_system portion of the system parameters file
+  - :code:`building`:if the coupling includes a load, this object will be included as well -- if there's no as part of the coupling this object will NOT be present. It contains the building-specific system parameters pulled from the system parameters JSON file.
 
-Connect Statements
+Coupling Connect Statements
 ^^^^^^^^^^^^^^^^^^
 
-This is the template which defines connect statements to be inserted into the equation section.
+This is the template which defines connect statements to be inserted into the equation section. More specifically, these are the partial template files at model_connectors/couplings/templates/<coupling name>/ConnectStatements.mopt. These templates have access to:
 
-- :code:`globals`
-- :code:`coupling`: just like with the component definitions template, you should use the coupling.id to avoid variable name collisions.
-- :code:`graph`
+- :code:`globals`: same as Coupling Component Definitions context
+- :code:`coupling`: same as Coupling Component Definitions context. Just like with the component definitions template, you should use the coupling.id to avoid variable name collisions.
+- :code:`graph`: same as Coupling Component Definitions context
+- :code:`sys_params`: same as Coupling Component Definitions context
 
 Model Instance
 ^^^^^^^^^^^^^^
@@ -168,9 +172,10 @@ This template is used to declare a model instance.
 - :code:`graph`
 - :code:`couplings`: contains each coupling the model is associated with. For example, if our ETS was coupled to a load and network, couplings would look like :code:`{ load_couplings: [<load coupling>], network_couplings: [<network coupling>] }`. This can be used to access coupling and model ids.
 - :code:`model`: contains info about the model instance, including :code:`modelica_type` and :code:`id`. These should be used to define the model, for example :code:`{{ model.modelica_type }} {{ model.id }}(...)`
+- :code:`sys_params`: same as Coupling Component Definitions context
 
 Simulation Mapper Class / Translator
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+************************************
 
 The Simulation Mapper Class can operate at multiple levels:
 
diff --git a/geojson_modelica_translator/model_connectors/couplings/coupling.py b/geojson_modelica_translator/model_connectors/couplings/coupling.py
index 88dcb6c..868b4e8 100644
--- a/geojson_modelica_translator/model_connectors/couplings/coupling.py
+++ b/geojson_modelica_translator/model_connectors/couplings/coupling.py
@@ -188,6 +188,22 @@ class Coupling(object):
             'connect_statements_template_path': connect_template_path,
         }
 
+    def get_load(self):
+        """If there's a load model in the coupling, it returns the load model. Else
+        it returns None.
+
+        This is used by the district model to find the building's sys params so
+        it can be passed into the coupling templates
+
+        :return: LoadBase | None
+        """
+        if self._get_model_superclass(self.model_a) is LoadBase:
+            return self.model_a
+        elif self._get_model_superclass(self.model_b) is LoadBase:
+            return self.model_b
+
+        return None
+
     @property
     def component_definitions_template_path(self):
         return self._template_env.get_template(self._template_component_definitions).filename
diff --git a/geojson_modelica_translator/model_connectors/couplings/templates/Network2Pipe_HeatingPlant/ComponentDefinitions.mopt b/geojson_modelica_translator/model_connectors/couplings/templates/Network2Pipe_HeatingPlant/ComponentDefinitions.mopt
index 309813e..44c6429 100644
--- a/geojson_modelica_translator/model_connectors/couplings/templates/Network2Pipe_HeatingPlant/ComponentDefinitions.mopt
+++ b/geojson_modelica_translator/model_connectors/couplings/templates/Network2Pipe_HeatingPlant/ComponentDefinitions.mopt
@@ -7,6 +7,6 @@
   // TODO: This should not be here, it is entirely plant specific and should be moved elsewhere
   // but since it requires a connect statement we must put it here for now...
   Modelica.Blocks.Sources.RealExpression TDisSetHeaWat_{{ coupling.id }}(
-    each y=55+273.15)
+    each y=273.15+{{ sys_params.district_system.default.central_heating_plant_parameters.temp_setpoint_hhw }})
     "District side heating water supply temperature set point."
     annotation (Placement({{ diagram.transformation.t_dis_set_hea_wat.real_expression }}));
diff --git a/geojson_modelica_translator/model_connectors/couplings/templates/Spawn_HeatingIndirect/ComponentDefinitions.mopt b/geojson_modelica_translator/model_connectors/couplings/templates/Spawn_HeatingIndirect/ComponentDefinitions.mopt
index cfb98da..b9b850a 100644
--- a/geojson_modelica_translator/model_connectors/couplings/templates/Spawn_HeatingIndirect/ComponentDefinitions.mopt
+++ b/geojson_modelica_translator/model_connectors/couplings/templates/Spawn_HeatingIndirect/ComponentDefinitions.mopt
@@ -11,7 +11,8 @@
     annotation (Placement({{ diagram.transformation.pressure_source.fixed_boundary }}));
   // TODO: move THeaWatSet (and its connection) into a HeatingIndirect specific template file (this component does not depend on the coupling)
   Modelica.Blocks.Sources.RealExpression THeaWatSet_{{ coupling.id }}(
-    y=40+273.15)
+    // y=40+273.15)
+    y=273.15+{{ sys_params.building.load_model_parameters.spawn.temp_hw_supply }} )
     "Secondary loop (Building side) heating water setpoint temperature."
     //Dehardcode
     annotation (Placement({{ diagram.transformation.t_hea_wat_set.real_expression }}));
diff --git a/geojson_modelica_translator/model_connectors/couplings/templates/Teaser_HeatingIndirect/ComponentDefinitions.mopt b/geojson_modelica_translator/model_connectors/couplings/templates/Teaser_HeatingIndirect/ComponentDefinitions.mopt
index e005c62..d2ce5d4 100644
--- a/geojson_modelica_translator/model_connectors/couplings/templates/Teaser_HeatingIndirect/ComponentDefinitions.mopt
+++ b/geojson_modelica_translator/model_connectors/couplings/templates/Teaser_HeatingIndirect/ComponentDefinitions.mopt
@@ -11,7 +11,8 @@
     annotation (Placement({{ diagram.transformation.pressure_source.fixed_boundary }}));
   // TODO: move THeaWatSet (and its connection) into a HeatingIndirect specific template file (this component does not depend on the coupling)
   Modelica.Blocks.Sources.RealExpression THeaWatSet_{{ coupling.id }}(
-    y=40+273.15)
+    // y=40+273.15)
+    y=273.15+{{ sys_params.building.load_model_parameters.rc.temp_hw_supply }})
     "Secondary loop (Building side) heating water setpoint temperature."
     //Dehardcode
     annotation (Placement({{ diagram.transformation.t_hea_wat_set.real_expression }}));
diff --git a/geojson_modelica_translator/model_connectors/couplings/templates/TimeSeries_HeatingIndirect/ComponentDefinitions.mopt b/geojson_modelica_translator/model_connectors/couplings/templates/TimeSeries_HeatingIndirect/ComponentDefinitions.mopt
index c9e997e..41e6457 100644
--- a/geojson_modelica_translator/model_connectors/couplings/templates/TimeSeries_HeatingIndirect/ComponentDefinitions.mopt
+++ b/geojson_modelica_translator/model_connectors/couplings/templates/TimeSeries_HeatingIndirect/ComponentDefinitions.mopt
@@ -13,7 +13,8 @@
     annotation (Placement({{ diagram.transformation.pressure_source.fixed_boundary }}));
   // TODO: move THeaWatSet (and its connection) into a HeatingIndirect specific template file (this component does not depend on the coupling)
   Modelica.Blocks.Sources.RealExpression THeaWatSet_{{ coupling.id }}(
-    y=40+273.15)
+    // y=40+273.15)
+    y=273.15+{{ sys_params.building.load_model_parameters.time_series.temp_hw_supply }} )
     "Secondary loop (Building side) heating water setpoint temperature."
     //Dehardcode
     annotation (Placement({{ diagram.transformation.t_hea_wat_set.real_expression }}));
diff --git a/geojson_modelica_translator/model_connectors/districts/district.py b/geojson_modelica_translator/model_connectors/districts/district.py
index 0ad7887..b751a75 100644
--- a/geojson_modelica_translator/model_connectors/districts/district.py
+++ b/geojson_modelica_translator/model_connectors/districts/district.py
@@ -41,6 +41,9 @@ from geojson_modelica_translator.jinja_filters import ALL_CUSTOM_FILTERS
 from geojson_modelica_translator.model_connectors.couplings.diagram import (
     Diagram
 )
+from geojson_modelica_translator.model_connectors.load_connectors.load_base import (
+    LoadBase
+)
 from geojson_modelica_translator.modelica.input_parser import PackageParser
 from geojson_modelica_translator.scaffold import Scaffold
 from jinja2 import Environment, FileSystemLoader, StrictUndefined
@@ -97,7 +100,6 @@ class District:
             model.to_modelica(self._scaffold)
 
         # construct graph of visual components
-        # TODO: use the diagram graph to determine icon and line placements before passing to templates
         diagram = Diagram(self._coupling_graph)
 
         district_template_params = {
@@ -114,7 +116,10 @@ class District:
                 'delHeaWatTemBui': 'delHeaWatTemBui',
                 'delHeaWatTemDis': 'delHeaWatTemDis',
             },
-            'graph': self._coupling_graph
+            'graph': self._coupling_graph,
+            'sys_params': {
+                'district_system': self.system_parameters.get_param('$.district_system')
+            }
         }
         # render each coupling
         for coupling in self._coupling_graph.couplings:
@@ -122,6 +127,12 @@ class District:
                 'diagram': diagram.to_dict(coupling.id, is_coupling=True),
             }
             template_context.update(**common_template_params)
+
+            coupling_load = coupling.get_load()
+            if coupling_load is not None:
+                building_sys_params = self.system_parameters.get_param_by_building_id(coupling_load.building_id, '$')
+                template_context['sys_params']['building'] = building_sys_params
+
             templated_result = coupling.render_templates(template_context)
             district_template_params['couplings'].append({
                 'id': coupling.id,
@@ -139,6 +150,11 @@ class District:
                 'diagram': diagram.to_dict(model.id, is_coupling=False),
             }
             template_params.update(**common_template_params)
+
+            if issubclass(type(model), LoadBase):
+                building_sys_params = self.system_parameters.get_param_by_building_id(model.building_id, '$')
+                template_params['sys_params']['building'] = building_sys_params
+
             templated_instance, instance_template_path = model.render_instance(template_params)
             district_template_params['models'].append({
                 'id': model.id,
diff --git a/geojson_modelica_translator/model_connectors/energy_transfer_systems/cooling_indirect.py b/geojson_modelica_translator/model_connectors/energy_transfer_systems/cooling_indirect.py
index 4e744b4..4e57e4c 100644
--- a/geojson_modelica_translator/model_connectors/energy_transfer_systems/cooling_indirect.py
+++ b/geojson_modelica_translator/model_connectors/energy_transfer_systems/cooling_indirect.py
@@ -70,12 +70,14 @@ class CoolingIndirect(EnergyTransferBase):
             'ets_model_parameters.indirect'
         )
 
+        combined_template_data = {**ets_data, **self.district_template_data}
+
         self.run_template(
             template=cooling_indirect_template,
             save_file_name=os.path.join(scaffold.project_path, 'Substations', f'{self._model_filename}.mo'),
             project_name=scaffold.project_name,
             model_filename=self._model_filename,
-            ets_data=ets_data,
+            ets_data=combined_template_data,
         )
 
         # now create the Package level package. This really needs to happen at the GeoJSON to modelica stage, but
diff --git a/geojson_modelica_translator/model_connectors/energy_transfer_systems/heating_indirect.py b/geojson_modelica_translator/model_connectors/energy_transfer_systems/heating_indirect.py
index 649627b..883af2f 100644
--- a/geojson_modelica_translator/model_connectors/energy_transfer_systems/heating_indirect.py
+++ b/geojson_modelica_translator/model_connectors/energy_transfer_systems/heating_indirect.py
@@ -70,12 +70,14 @@ class HeatingIndirect(EnergyTransferBase):
             "ets_model_parameters.indirect"
         )
 
+        combined_template_data = {**ets_data, **self.district_template_data}
+
         self.run_template(
             template=heating_indirect_template,
             save_file_name=os.path.join(scaffold.project_path, 'Substations', f'{self._model_filename}.mo'),
             project_name=scaffold.project_name,
             model_filename=self._model_filename,
-            ets_data=ets_data,
+            ets_data=combined_template_data,
         )
 
         # now create the Package level package. This really needs to happen at the GeoJSON to modelica stage, but
diff --git a/geojson_modelica_translator/model_connectors/energy_transfer_systems/templates/CoolingIndirect.mot b/geojson_modelica_translator/model_connectors/energy_transfer_systems/templates/CoolingIndirect.mot
index 6b09874..502e4f7 100644
--- a/geojson_modelica_translator/model_connectors/energy_transfer_systems/templates/CoolingIndirect.mot
+++ b/geojson_modelica_translator/model_connectors/energy_transfer_systems/templates/CoolingIndirect.mot
@@ -47,7 +47,7 @@ model {{ model_filename }}
   parameter Modelica.SIunits.Temperature T_a1_nominal(
     min=0+273,
     max=100+273.15,
-    {% endraw %}start={{ets_data["cooling_supply_water_temperature_district"]}}+273.15,
+    {% endraw %}start={{ets_data["temp_setpoint_chw"]}}+273.15,
     {% raw %}final displayUnit="K")
     "Nominal temperature at port a1"
     annotation (Dialog(group="Heat exchanger"));
diff --git a/geojson_modelica_translator/model_connectors/energy_transfer_systems/templates/HeatingIndirect.mot b/geojson_modelica_translator/model_connectors/energy_transfer_systems/templates/HeatingIndirect.mot
index 2107636..1482fb3 100644
--- a/geojson_modelica_translator/model_connectors/energy_transfer_systems/templates/HeatingIndirect.mot
+++ b/geojson_modelica_translator/model_connectors/energy_transfer_systems/templates/HeatingIndirect.mot
@@ -47,7 +47,7 @@ model {{ model_filename }}
   parameter Modelica.SIunits.Temperature T_a1_nominal(
     min=0+273,
     max=100+273.15,
-    {% endraw %}start={{ets_data["heating_supply_water_temperature_district"]}}+273.15,
+    {% endraw %}start={{ets_data["temp_setpoint_hhw"]}}+273.15,
     {% raw %}final displayUnit="K")
     "Nominal temperature at port a1"
     annotation (Dialog(group="Heat exchanger"));
diff --git a/geojson_modelica_translator/model_connectors/load_connectors/load_base.py b/geojson_modelica_translator/model_connectors/load_connectors/load_base.py
index 9225c99..fab078c 100644
--- a/geojson_modelica_translator/model_connectors/load_connectors/load_base.py
+++ b/geojson_modelica_translator/model_connectors/load_connectors/load_base.py
@@ -98,15 +98,9 @@ class LoadBase(ModelBase):
                     "heat_exchanger_primary_pressure_drop": self.system_parameters.get_param_by_building_id(
                         self.building_id, "ets_model_parameters.indirect.heat_exchanger_primary_pressure_drop"
                     ),
-                    "cooling_supply_water_temperature_district": self.system_parameters.get_param_by_building_id(
-                        self.building_id, "ets_model_parameters.indirect.cooling_supply_water_temperature_district"
-                    ) + 273.15,
                     "cooling_supply_water_temperature_building": self.system_parameters.get_param_by_building_id(
                         self.building_id, "ets_model_parameters.indirect.cooling_supply_water_temperature_building"
                     ) + 273.15,
-                    "heating_supply_water_temperature_district": self.system_parameters.get_param_by_building_id(
-                        self.building_id, "ets_model_parameters.indirect.heating_supply_water_temperature_district"
-                    ) + 273.15,
                     "heating_supply_water_temperature_building": self.system_parameters.get_param_by_building_id(
                         self.building_id, "ets_model_parameters.indirect.heating_supply_water_temperature_building"
                     ) + 273.15,
diff --git a/geojson_modelica_translator/model_connectors/load_connectors/teaser.py b/geojson_modelica_translator/model_connectors/load_connectors/teaser.py
index 7ea2aa8..771df20 100644
--- a/geojson_modelica_translator/model_connectors/load_connectors/teaser.py
+++ b/geojson_modelica_translator/model_connectors/load_connectors/teaser.py
@@ -524,7 +524,7 @@ class Teaser(LoadBase):
         for i, dic in enumerate(zone_list):
             if dic["instance_name"] == "ict":
                 print("setting coo flow")
-                nom_cool_flow[i-1] = -50000  # Need to offset for different indexing
+                nom_cool_flow[i - 1] = -50000  # Need to offset for different indexing
         nom_heat_flow = np.array([10000] * len(zone_list))
         building_template_data = {
             "thermal_zones": zone_list,
diff --git a/geojson_modelica_translator/model_connectors/model_base.py b/geojson_modelica_translator/model_connectors/model_base.py
index ae87610..55b848b 100644
--- a/geojson_modelica_translator/model_connectors/model_base.py
+++ b/geojson_modelica_translator/model_connectors/model_base.py
@@ -78,6 +78,17 @@ class ModelBase(object):
         self.required_mo_files = []
         # extract data out of the urbanopt_building object and store into the base object
 
+        # Read district-level system params. Used when templating ets mofiles, for instance in heating_indirect.py
+        if system_parameters is not None:
+            self.district_template_data = {
+                "temp_setpoint_hhw": self.system_parameters.get_param(
+                    "$.district_system.default.central_heating_plant_parameters.temp_setpoint_hhw"
+                ),
+                "temp_setpoint_chw": self.system_parameters.get_param(
+                    "$.district_system.default.central_cooling_plant_parameters.temp_setpoint_chw"
+                ),
+            }
+
     def ft2_to_m2(self, area_in_ft2: float) -> float:
         """
         Converts square feet to square meters
diff --git a/geojson_modelica_translator/system_parameters/schema.json b/geojson_modelica_translator/system_parameters/schema.json
index 888695d..09953aa 100755
--- a/geojson_modelica_translator/system_parameters/schema.json
+++ b/geojson_modelica_translator/system_parameters/schema.json
@@ -300,21 +300,11 @@
           "type": "number",
           "default": 6000
         },
-        "cooling_supply_water_temperature_district": {
-          "description": "Chilled water supply temperature district side. (C)",
-          "type": "number",
-          "default": 5
-        },
         "cooling_supply_water_temperature_building": {
           "description": "Chilled water supply temperature building side. (C)",
           "type": "number",
           "default": 7
         },
-        "heating_supply_water_temperature_district": {
-          "description": "Heating water supply temperature district side. (C)",
-          "type": "number",
-          "default": 55
-        },
         "heating_supply_water_temperature_building": {
           "description": "Heating water supply temperature building side. (C)",
           "type": "number",
@@ -369,9 +359,7 @@
         "nominal_mass_flow_building",
         "nominal_mass_flow_district",
         "valve_pressure_drop",
-        "cooling_supply_water_temperature_district",
         "cooling_supply_water_temperature_building",
-        "heating_supply_water_temperature_district",
         "heating_supply_water_temperature_building",
         "delta_temp_hw_district",
         "delta_temp_hw_building",
@@ -720,9 +708,9 @@
           "default": 55000
         },
         "temp_setpoint_hhw": {
-          "description": "[unused] District circuit heating water temperature setpoint. (C)",
+          "description": "District circuit heating water temperature setpoint. (C)",
           "type": "number",
-          "default": 68
+          "default": 55
         },
         "pressure_drop_hhw_valve_nominal": {
           "description": "Boiler isolation valve pressure drop. (Pa)",
diff --git a/geojson_modelica_translator/system_parameters/time_series_template.json b/geojson_modelica_translator/system_parameters/time_series_template.json
index 73a2fed..5986ea2 100644
--- a/geojson_modelica_translator/system_parameters/time_series_template.json
+++ b/geojson_modelica_translator/system_parameters/time_series_template.json
@@ -30,9 +30,7 @@
             "valve_pressure_drop": 6000,
             "heat_exchanger_secondary_pressure_drop": 500,
             "heat_exchanger_primary_pressure_drop": 500,
-            "cooling_supply_water_temperature_district": 5,
             "cooling_supply_water_temperature_building": 7,
-            "heating_supply_water_temperature_district": 55,
             "heating_supply_water_temperature_building": 50,
             "delta_temp_hw_district": 20,
             "delta_temp_hw_building": 15,
@@ -69,6 +67,16 @@
         "cooling_tower_water_temperature_difference_nominal": 6.56,
         "delta_temp_approach": 3.25,
         "ratio_water_air_nominal": 0.6
+      },
+      "central_heating_plant_parameters": {
+        "heat_flow_nominal": 8001,
+        "mass_hhw_flow_nominal": 11,
+        "boiler_water_flow_minimum": 11,
+        "pressure_drop_hhw_nominal": 55001,
+        "pressure_drop_setpoint": 50000,
+        "temp_setpoint_hhw": 54,
+        "pressure_drop_hhw_valve_nominal": 6001,
+        "chp_installed": false
       }
     }
   }
diff --git a/tests/data_shared/mixed_loads_district/system_params.json b/tests/data_shared/mixed_loads_district/system_params.json
index 12acbab..471e3ca 100644
--- a/tests/data_shared/mixed_loads_district/system_params.json
+++ b/tests/data_shared/mixed_loads_district/system_params.json
@@ -12,9 +12,7 @@
           "valve_pressure_drop": 6000,
           "heat_exchanger_secondary_pressure_drop": 500,
           "heat_exchanger_primary_pressure_drop": 500,
-          "cooling_supply_water_temperature_district": 5,
           "cooling_supply_water_temperature_building": 7,
-          "heating_supply_water_temperature_district": 55,
           "heating_supply_water_temperature_building": 50,
           "booster_heater": false,
           "ets_generation": "Fourth Generation",
@@ -55,9 +53,7 @@
             "valve_pressure_drop": 6000,
             "heat_exchanger_secondary_pressure_drop": 500,
             "heat_exchanger_primary_pressure_drop": 500,
-            "cooling_supply_water_temperature_district": 5,
             "cooling_supply_water_temperature_building": 7,
-            "heating_supply_water_temperature_district": 55,
             "heating_supply_water_temperature_building": 50,
             "booster_heater": false,
             "ets_generation": "Fourth Generation",
@@ -104,9 +100,7 @@
             "nominal_mass_flow_building": 0.5,
             "nominal_mass_flow_district": 0.5,
             "valve_pressure_drop": 6000,
-            "cooling_supply_water_temperature_district": 5,
             "cooling_supply_water_temperature_building": 7,
-            "heating_supply_water_temperature_district": 55,
             "heating_supply_water_temperature_building": 50,
             "delta_temp_hw_district": 19,
             "delta_temp_hw_building": 14,
@@ -145,9 +139,7 @@
             "valve_pressure_drop": 6000,
             "heat_exchanger_secondary_pressure_drop": 500,
             "heat_exchanger_primary_pressure_drop": 500,
-            "cooling_supply_water_temperature_district": 5,
             "cooling_supply_water_temperature_building": 7,
-            "heating_supply_water_temperature_district": 55,
             "heating_supply_water_temperature_building": 50,
             "delta_temp_chw_building": 5,
             "delta_temp_chw_district": 8,
@@ -184,6 +176,16 @@
         "cooling_tower_water_temperature_difference_nominal": 6.56,
         "delta_temp_approach": 3.25,
         "ratio_water_air_nominal": 0.6
+      },
+      "central_heating_plant_parameters": {
+        "heat_flow_nominal": 8001,
+        "mass_hhw_flow_nominal": 11,
+        "boiler_water_flow_minimum": 11,
+        "pressure_drop_hhw_nominal": 55001,
+        "pressure_drop_setpoint": 50000,
+        "temp_setpoint_hhw": 54,
+        "pressure_drop_hhw_valve_nominal": 6001,
+        "chp_installed": false
       }
     }
   }
diff --git a/tests/geojson_modelica_translator/data/system_parameters_mix_models.json b/tests/geojson_modelica_translator/data/system_parameters_mix_models.json
index 251c948..dd4936e 100644
--- a/tests/geojson_modelica_translator/data/system_parameters_mix_models.json
+++ b/tests/geojson_modelica_translator/data/system_parameters_mix_models.json
@@ -24,9 +24,7 @@
           "nominal_mass_flow_district": 0.5,
           "nominal_mass_flow_building": 0.5,
           "valve_pressure_drop": 6000,
-          "cooling_supply_water_temperature_district": 5,
           "cooling_supply_water_temperature_building": 7,
-          "heating_supply_water_temperature_district": 55,
           "heating_supply_water_temperature_building": 50,
           "delta_temp_chw_building": 5,
           "delta_temp_chw_district": 8,
@@ -73,9 +71,7 @@
             "nominal_mass_flow_district": 0.5,
             "nominal_mass_flow_building": 0.5,
             "valve_pressure_drop": 6000,
-            "cooling_supply_water_temperature_district": 5,
             "cooling_supply_water_temperature_building": 7,
-            "heating_supply_water_temperature_district": 55,
             "heating_supply_water_temperature_building": 50,
             "delta_temp_chw_building": 5,
             "delta_temp_chw_district": 8,
@@ -114,9 +110,7 @@
             "nominal_mass_flow_district": 0.5,
             "nominal_mass_flow_building": 0.5,
             "valve_pressure_drop": 6000,
-            "cooling_supply_water_temperature_district": 5,
             "cooling_supply_water_temperature_building": 7,
-            "heating_supply_water_temperature_district": 55,
             "heating_supply_water_temperature_building": 50,
             "delta_temp_chw_building": 5,
             "delta_temp_chw_district": 8,
@@ -154,9 +148,7 @@
             "nominal_mass_flow_district": 0.5,
             "nominal_mass_flow_building": 0.5,
             "valve_pressure_drop": 6000,
-            "cooling_supply_water_temperature_district": 5,
             "cooling_supply_water_temperature_building": 7,
-            "heating_supply_water_temperature_district": 55,
             "heating_supply_water_temperature_building": 50,
             "delta_temp_chw_building": 5,
             "delta_temp_chw_district": 8,
@@ -170,5 +162,40 @@
         }
       }
     ]
+  },
+  "district_system": {
+    "default": {
+      "central_cooling_plant_parameters": {
+        "mos_wet_bulb_filename": "../../data_shared/USA_CA_San.Francisco.Intl.AP.724940_TMY3.mos",
+        "heat_flow_nominal": 7999,
+        "cooling_tower_fan_power_nominal": 4999,
+        "mass_chw_flow_nominal": 9.9,
+        "chiller_water_flow_minimum": 9.9,
+        "mass_cw_flow_nominal": 9.9,
+        "chw_pump_head": 300000,
+        "cw_pump_head": 200000,
+        "pressure_drop_chw_nominal": 5999,
+        "pressure_drop_cw_nominal": 5999,
+        "pressure_drop_setpoint": 49999,
+        "temp_setpoint_chw": 6,
+        "pressure_drop_chw_valve_nominal": 5999,
+        "pressure_drop_cw_pum_nominal": 5999,
+        "temp_air_wb_nominal": 24.9,
+        "temp_cw_in_nominal": 34.9,
+        "cooling_tower_water_temperature_difference_nominal": 6.56,
+        "delta_temp_approach": 3.25,
+        "ratio_water_air_nominal": 0.6
+      },
+      "central_heating_plant_parameters": {
+        "heat_flow_nominal": 8001,
+        "mass_hhw_flow_nominal": 11,
+        "boiler_water_flow_minimum": 11,
+        "pressure_drop_hhw_nominal": 55001,
+        "pressure_drop_setpoint": 50000,
+        "temp_setpoint_hhw": 54,
+        "pressure_drop_hhw_valve_nominal": 6001,
+        "chp_installed": false
+      }
+    }
   }
 }
diff --git a/tests/model_connectors/data/spawn_district_system_params_ex1.json b/tests/model_connectors/data/spawn_district_system_params_ex1.json
index 7a1d797..1de6bc5 100644
--- a/tests/model_connectors/data/spawn_district_system_params_ex1.json
+++ b/tests/model_connectors/data/spawn_district_system_params_ex1.json
@@ -12,9 +12,7 @@
           "nominal_mass_flow_building": 0.5,
           "nominal_mass_flow_district": 0.5,
           "valve_pressure_drop": 6000,
-          "cooling_supply_water_temperature_district": 5,
           "cooling_supply_water_temperature_building": 7,
-          "heating_supply_water_temperature_district": 55,
           "heating_supply_water_temperature_building": 50,
           "delta_temp_hw_district": 19,
           "delta_temp_hw_building": 14,
@@ -60,9 +58,7 @@
             "nominal_mass_flow_building": 0.5,
             "nominal_mass_flow_district": 0.5,
             "valve_pressure_drop": 6000,
-            "cooling_supply_water_temperature_district": 5,
             "cooling_supply_water_temperature_building": 7,
-            "heating_supply_water_temperature_district": 55,
             "heating_supply_water_temperature_building": 50,
             "delta_temp_hw_district": 19,
             "delta_temp_hw_building": 14,
@@ -106,7 +102,7 @@
         "boiler_water_flow_minimum": 11,
         "pressure_drop_hhw_nominal": 55001,
         "pressure_drop_setpoint": 50000,
-        "temp_setpoint_hhw": 339.15,
+        "temp_setpoint_hhw": 55,
         "pressure_drop_hhw_valve_nominal": 6001,
         "chp_installed": false
       }
diff --git a/tests/model_connectors/data/spawn_system_params_ex1.json b/tests/model_connectors/data/spawn_system_params_ex1.json
index 35319c6..4a33364 100644
--- a/tests/model_connectors/data/spawn_system_params_ex1.json
+++ b/tests/model_connectors/data/spawn_system_params_ex1.json
@@ -12,9 +12,7 @@
           "nominal_mass_flow_building": 0.5,
           "nominal_mass_flow_district": 0.5,
           "valve_pressure_drop": 6000,
-          "cooling_supply_water_temperature_district": 5,
           "cooling_supply_water_temperature_building": 7,
-          "heating_supply_water_temperature_district": 55,
           "heating_supply_water_temperature_building": 50,
           "delta_temp_hw_district": 19,
           "delta_temp_hw_building": 14,
@@ -60,9 +58,7 @@
             "nominal_mass_flow_building": 0.5,
             "nominal_mass_flow_district": 0.5,
             "valve_pressure_drop": 6000,
-            "cooling_supply_water_temperature_district": 5,
             "cooling_supply_water_temperature_building": 7,
-            "heating_supply_water_temperature_district": 55,
             "heating_supply_water_temperature_building": 50,
             "delta_temp_hw_district": 19,
             "delta_temp_hw_building": 14,
@@ -76,5 +72,40 @@
         }
       }
     ]
+  },
+  "district_system": {
+    "default": {
+      "central_cooling_plant_parameters": {
+        "mos_wet_bulb_filename": "../../data_shared/USA_CA_San.Francisco.Intl.AP.724940_TMY3.mos",
+        "heat_flow_nominal": 7999,
+        "cooling_tower_fan_power_nominal": 4999,
+        "mass_chw_flow_nominal": 9.9,
+        "chiller_water_flow_minimum": 9.9,
+        "mass_cw_flow_nominal": 9.9,
+        "chw_pump_head": 300000,
+        "cw_pump_head": 200000,
+        "pressure_drop_chw_nominal": 5999,
+        "pressure_drop_cw_nominal": 5999,
+        "pressure_drop_setpoint": 49999,
+        "temp_setpoint_chw": 6,
+        "pressure_drop_chw_valve_nominal": 5999,
+        "pressure_drop_cw_pum_nominal": 5999,
+        "temp_air_wb_nominal": 24.9,
+        "temp_cw_in_nominal": 34.9,
+        "cooling_tower_water_temperature_difference_nominal": 6.56,
+        "delta_temp_approach": 3.25,
+        "ratio_water_air_nominal": 0.6
+      },
+      "central_heating_plant_parameters": {
+        "heat_flow_nominal": 8001,
+        "mass_hhw_flow_nominal": 11,
+        "boiler_water_flow_minimum": 11,
+        "pressure_drop_hhw_nominal": 55001,
+        "pressure_drop_setpoint": 50000,
+        "temp_setpoint_hhw": 54,
+        "pressure_drop_hhw_valve_nominal": 6001,
+        "chp_installed": false
+      }
+    }
   }
 }
diff --git a/tests/model_connectors/data/spawn_system_params_ex2.json b/tests/model_connectors/data/spawn_system_params_ex2.json
index eb6e8e7..d6874cb 100644
--- a/tests/model_connectors/data/spawn_system_params_ex2.json
+++ b/tests/model_connectors/data/spawn_system_params_ex2.json
@@ -53,5 +53,40 @@
         }
       }
     ]
+  },
+  "district_system": {
+    "default": {
+      "central_cooling_plant_parameters": {
+        "mos_wet_bulb_filename": "../../data_shared/USA_CA_San.Francisco.Intl.AP.724940_TMY3.mos",
+        "heat_flow_nominal": 7999,
+        "cooling_tower_fan_power_nominal": 4999,
+        "mass_chw_flow_nominal": 9.9,
+        "chiller_water_flow_minimum": 9.9,
+        "mass_cw_flow_nominal": 9.9,
+        "chw_pump_head": 300000,
+        "cw_pump_head": 200000,
+        "pressure_drop_chw_nominal": 5999,
+        "pressure_drop_cw_nominal": 5999,
+        "pressure_drop_setpoint": 49999,
+        "temp_setpoint_chw": 6,
+        "pressure_drop_chw_valve_nominal": 5999,
+        "pressure_drop_cw_pum_nominal": 5999,
+        "temp_air_wb_nominal": 24.9,
+        "temp_cw_in_nominal": 34.9,
+        "cooling_tower_water_temperature_difference_nominal": 6.56,
+        "delta_temp_approach": 3.25,
+        "ratio_water_air_nominal": 0.6
+      },
+      "central_heating_plant_parameters": {
+        "heat_flow_nominal": 8001,
+        "mass_hhw_flow_nominal": 11,
+        "boiler_water_flow_minimum": 11,
+        "pressure_drop_hhw_nominal": 55001,
+        "pressure_drop_setpoint": 50000,
+        "temp_setpoint_hhw": 54,
+        "pressure_drop_hhw_valve_nominal": 6001,
+        "chp_installed": false
+      }
+    }
   }
 }
diff --git a/tests/model_connectors/data/teaser_system_params_ex1.json b/tests/model_connectors/data/teaser_system_params_ex1.json
index 9c1a83a..fe789de 100644
--- a/tests/model_connectors/data/teaser_system_params_ex1.json
+++ b/tests/model_connectors/data/teaser_system_params_ex1.json
@@ -25,9 +25,7 @@
           "valve_pressure_drop": 6000,
           "heat_exchanger_secondary_pressure_drop": 500,
           "heat_exchanger_primary_pressure_drop": 500,
-          "cooling_supply_water_temperature_district": 5,
           "cooling_supply_water_temperature_building": 7,
-          "heating_supply_water_temperature_district": 55,
           "heating_supply_water_temperature_building": 50,
           "delta_temp_chw_building": 5,
           "delta_temp_chw_district": 8,
@@ -67,9 +65,7 @@
             "valve_pressure_drop": 6000,
             "heat_exchanger_secondary_pressure_drop": 500,
             "heat_exchanger_primary_pressure_drop": 500,
-            "cooling_supply_water_temperature_district": 5,
             "cooling_supply_water_temperature_building": 7,
-            "heating_supply_water_temperature_district": 55,
             "heating_supply_water_temperature_building": 50,
             "delta_temp_chw_building": 5,
             "delta_temp_chw_district": 8,
@@ -83,5 +79,40 @@
         }
       }
     ]
+  },
+  "district_system": {
+    "default": {
+      "central_cooling_plant_parameters": {
+        "mos_wet_bulb_filename": "../../data_shared/USA_CA_San.Francisco.Intl.AP.724940_TMY3.mos",
+        "heat_flow_nominal": 7999,
+        "cooling_tower_fan_power_nominal": 4999,
+        "mass_chw_flow_nominal": 9.9,
+        "chiller_water_flow_minimum": 9.9,
+        "mass_cw_flow_nominal": 9.9,
+        "chw_pump_head": 300000,
+        "cw_pump_head": 200000,
+        "pressure_drop_chw_nominal": 5999,
+        "pressure_drop_cw_nominal": 5999,
+        "pressure_drop_setpoint": 49999,
+        "temp_setpoint_chw": 6,
+        "pressure_drop_chw_valve_nominal": 5999,
+        "pressure_drop_cw_pum_nominal": 5999,
+        "temp_air_wb_nominal": 24.9,
+        "temp_cw_in_nominal": 34.9,
+        "cooling_tower_water_temperature_difference_nominal": 6.56,
+        "delta_temp_approach": 3.25,
+        "ratio_water_air_nominal": 0.6
+      },
+      "central_heating_plant_parameters": {
+        "heat_flow_nominal": 8001,
+        "mass_hhw_flow_nominal": 11,
+        "boiler_water_flow_minimum": 11,
+        "pressure_drop_hhw_nominal": 55001,
+        "pressure_drop_setpoint": 50000,
+        "temp_setpoint_hhw": 54,
+        "pressure_drop_hhw_valve_nominal": 6001,
+        "chp_installed": false
+      }
+    }
   }
 }
diff --git a/tests/model_connectors/data/teaser_system_params_ex2.json b/tests/model_connectors/data/teaser_system_params_ex2.json
index 1c0d21f..ace1384 100644
--- a/tests/model_connectors/data/teaser_system_params_ex2.json
+++ b/tests/model_connectors/data/teaser_system_params_ex2.json
@@ -23,9 +23,7 @@
           "valve_pressure_drop": 6000,
           "heat_exchanger_secondary_pressure_drop": 500,
           "heat_exchanger_primary_pressure_drop": 500,
-          "cooling_supply_water_temperature_district": 5,
           "cooling_supply_water_temperature_building": 7,
-          "heating_supply_water_temperature_district": 55,
           "heating_supply_water_temperature_building": 50,
           "delta_temp_chw_building": 5,
           "delta_temp_chw_district": 8,
@@ -38,5 +36,40 @@
         }
       }
     }
+  },
+  "district_system": {
+    "default": {
+      "central_cooling_plant_parameters": {
+        "mos_wet_bulb_filename": "../../data_shared/USA_CA_San.Francisco.Intl.AP.724940_TMY3.mos",
+        "heat_flow_nominal": 7999,
+        "cooling_tower_fan_power_nominal": 4999,
+        "mass_chw_flow_nominal": 9.9,
+        "chiller_water_flow_minimum": 9.9,
+        "mass_cw_flow_nominal": 9.9,
+        "chw_pump_head": 300000,
+        "cw_pump_head": 200000,
+        "pressure_drop_chw_nominal": 5999,
+        "pressure_drop_cw_nominal": 5999,
+        "pressure_drop_setpoint": 49999,
+        "temp_setpoint_chw": 6,
+        "pressure_drop_chw_valve_nominal": 5999,
+        "pressure_drop_cw_pum_nominal": 5999,
+        "temp_air_wb_nominal": 24.9,
+        "temp_cw_in_nominal": 34.9,
+        "cooling_tower_water_temperature_difference_nominal": 6.56,
+        "delta_temp_approach": 3.25,
+        "ratio_water_air_nominal": 0.6
+      },
+      "central_heating_plant_parameters": {
+        "heat_flow_nominal": 8001,
+        "mass_hhw_flow_nominal": 11,
+        "boiler_water_flow_minimum": 11,
+        "pressure_drop_hhw_nominal": 55001,
+        "pressure_drop_setpoint": 50000,
+        "temp_setpoint_hhw": 54,
+        "pressure_drop_hhw_valve_nominal": 6001,
+        "chp_installed": false
+      }
+    }
   }
 }
diff --git a/tests/model_connectors/data/teaser_system_params_two_loads.json b/tests/model_connectors/data/teaser_system_params_two_loads.json
index c2f05fc..c91e477 100644
--- a/tests/model_connectors/data/teaser_system_params_two_loads.json
+++ b/tests/model_connectors/data/teaser_system_params_two_loads.json
@@ -25,9 +25,7 @@
           "valve_pressure_drop": 6000,
           "heat_exchanger_secondary_pressure_drop": 500,
           "heat_exchanger_primary_pressure_drop": 500,
-          "cooling_supply_water_temperature_district": 5,
           "cooling_supply_water_temperature_building": 7,
-          "heating_supply_water_temperature_district": 55,
           "heating_supply_water_temperature_building": 50,
           "delta_temp_chw_building": 5,
           "delta_temp_chw_district": 8,
@@ -67,9 +65,7 @@
             "valve_pressure_drop": 6000,
             "heat_exchanger_secondary_pressure_drop": 500,
             "heat_exchanger_primary_pressure_drop": 500,
-            "cooling_supply_water_temperature_district": 5,
             "cooling_supply_water_temperature_building": 7,
-            "heating_supply_water_temperature_district": 55,
             "heating_supply_water_temperature_building": 50,
             "delta_temp_chw_building": 5,
             "delta_temp_chw_district": 8,
@@ -108,9 +104,7 @@
             "valve_pressure_drop": 6000,
             "heat_exchanger_secondary_pressure_drop": 500,
             "heat_exchanger_primary_pressure_drop": 500,
-            "cooling_supply_water_temperature_district": 5,
             "cooling_supply_water_temperature_building": 7,
-            "heating_supply_water_temperature_district": 55,
             "heating_supply_water_temperature_building": 50,
             "delta_temp_chw_building": 5,
             "delta_temp_chw_district": 8,
@@ -154,7 +148,7 @@
         "boiler_water_flow_minimum": 11,
         "pressure_drop_hhw_nominal": 55001,
         "pressure_drop_setpoint": 50000,
-        "temp_setpoint_hhw": 339.15,
+        "temp_setpoint_hhw": 54,
         "pressure_drop_hhw_valve_nominal": 6001,
         "chp_installed": false
       }
diff --git a/tests/model_connectors/data/time_series_system_params_chp.json b/tests/model_connectors/data/time_series_system_params_chp.json
index 5f2d033..3eccfc7 100644
--- a/tests/model_connectors/data/time_series_system_params_chp.json
+++ b/tests/model_connectors/data/time_series_system_params_chp.json
@@ -12,9 +12,7 @@
           "valve_pressure_drop": 6000,
           "heat_exchanger_secondary_pressure_drop": 500,
           "heat_exchanger_primary_pressure_drop": 500,
-          "cooling_supply_water_temperature_district": 5,
           "cooling_supply_water_temperature_building": 7,
-          "heating_supply_water_temperature_district": 55,
           "heating_supply_water_temperature_building": 50,
           "booster_heater": false,
           "ets_generation": "Fourth Generation",
@@ -55,9 +53,7 @@
             "valve_pressure_drop": 6000,
             "heat_exchanger_secondary_pressure_drop": 500,
             "heat_exchanger_primary_pressure_drop": 500,
-            "cooling_supply_water_temperature_district": 5,
             "cooling_supply_water_temperature_building": 7,
-            "heating_supply_water_temperature_district": 55,
             "heating_supply_water_temperature_building": 50,
             "booster_heater": false,
             "ets_generation": "Fourth Generation",
@@ -97,9 +93,7 @@
             "valve_pressure_drop": 6000,
             "heat_exchanger_secondary_pressure_drop": 500,
             "heat_exchanger_primary_pressure_drop": 500,
-            "cooling_supply_water_temperature_district": 5,
             "cooling_supply_water_temperature_building": 7,
-            "heating_supply_water_temperature_district": 55,
             "heating_supply_water_temperature_building": 50,
             "booster_heater": false,
             "ets_generation": "Fourth Generation",
diff --git a/tests/model_connectors/data/time_series_system_params_ets.json b/tests/model_connectors/data/time_series_system_params_ets.json
index 80fbc5c..4afa0e2 100644
--- a/tests/model_connectors/data/time_series_system_params_ets.json
+++ b/tests/model_connectors/data/time_series_system_params_ets.json
@@ -12,9 +12,7 @@
           "valve_pressure_drop": 6000,
           "heat_exchanger_secondary_pressure_drop": 500,
           "heat_exchanger_primary_pressure_drop": 500,
-          "cooling_supply_water_temperature_district": 5,
           "cooling_supply_water_temperature_building": 7,
-          "heating_supply_water_temperature_district": 55,
           "heating_supply_water_temperature_building": 50,
           "booster_heater": false,
           "ets_generation": "Fourth Generation",
@@ -55,9 +53,7 @@
             "valve_pressure_drop": 6000,
             "heat_exchanger_secondary_pressure_drop": 500,
             "heat_exchanger_primary_pressure_drop": 500,
-            "cooling_supply_water_temperature_district": 5,
             "cooling_supply_water_temperature_building": 7,
-            "heating_supply_water_temperature_district": 55,
             "heating_supply_water_temperature_building": 50,
             "booster_heater": false,
             "ets_generation": "Fourth Generation",
@@ -97,9 +93,7 @@
             "valve_pressure_drop": 6000,
             "heat_exchanger_secondary_pressure_drop": 500,
             "heat_exchanger_primary_pressure_drop": 500,
-            "cooling_supply_water_temperature_district": 5,
             "cooling_supply_water_temperature_building": 7,
-            "heating_supply_water_temperature_district": 55,
             "heating_supply_water_temperature_building": 50,
             "booster_heater": false,
             "ets_generation": "Fourth Generation",
diff --git a/tests/model_connectors/data/time_series_system_params_ex1.json b/tests/model_connectors/data/time_series_system_params_ex1.json
index 2856ba5..bec01d2 100644
--- a/tests/model_connectors/data/time_series_system_params_ex1.json
+++ b/tests/model_connectors/data/time_series_system_params_ex1.json
@@ -12,9 +12,7 @@
           "valve_pressure_drop": 1000,
           "heat_exchanger_secondary_pressure_drop": 500,
           "heat_exchanger_primary_pressure_drop": 500,
-          "cooling_supply_water_temperature_district": 5,
           "cooling_supply_water_temperature_building": 7,
-          "heating_supply_water_temperature_district": 55,
           "heating_supply_water_temperature_building": 50,
           "booster_heater": false,
           "ets_generation": "Fourth Generation",
@@ -55,9 +53,7 @@
             "valve_pressure_drop": 1000,
             "heat_exchanger_secondary_pressure_drop": 500,
             "heat_exchanger_primary_pressure_drop": 500,
-            "cooling_supply_water_temperature_district": 5,
             "cooling_supply_water_temperature_building": 7,
-            "heating_supply_water_temperature_district": 55,
             "heating_supply_water_temperature_building": 50,
             "booster_heater": false,
             "ets_generation": "Fourth Generation",
@@ -97,9 +93,7 @@
             "valve_pressure_drop": 1000,
             "heat_exchanger_secondary_pressure_drop": 500,
             "heat_exchanger_primary_pressure_drop": 500,
-            "cooling_supply_water_temperature_district": 5,
             "cooling_supply_water_temperature_building": 7,
-            "heating_supply_water_temperature_district": 55,
             "heating_supply_water_temperature_building": 50,
             "booster_heater": false,
             "ets_generation": "Fourth Generation",
@@ -115,5 +109,40 @@
         }
       }
     ]
+  },
+  "district_system": {
+    "default": {
+      "central_cooling_plant_parameters": {
+        "mos_wet_bulb_filename": "../../data_shared/USA_CA_San.Francisco.Intl.AP.724940_TMY3.mos",
+        "heat_flow_nominal": 7999,
+        "cooling_tower_fan_power_nominal": 4999,
+        "mass_chw_flow_nominal": 9.9,
+        "chiller_water_flow_minimum": 9.9,
+        "mass_cw_flow_nominal": 9.9,
+        "chw_pump_head": 300000,
+        "cw_pump_head": 200000,
+        "pressure_drop_chw_nominal": 5999,
+        "pressure_drop_cw_nominal": 5999,
+        "pressure_drop_setpoint": 49999,
+        "temp_setpoint_chw": 6,
+        "pressure_drop_chw_valve_nominal": 5999,
+        "pressure_drop_cw_pum_nominal": 5999,
+        "temp_air_wb_nominal": 24.9,
+        "temp_cw_in_nominal": 34.9,
+        "cooling_tower_water_temperature_difference_nominal": 6.56,
+        "delta_temp_approach": 3.25,
+        "ratio_water_air_nominal": 0.6
+      },
+      "central_heating_plant_parameters": {
+        "heat_flow_nominal": 8001,
+        "mass_hhw_flow_nominal": 11,
+        "boiler_water_flow_minimum": 11,
+        "pressure_drop_hhw_nominal": 55001,
+        "pressure_drop_setpoint": 50000,
+        "temp_setpoint_hhw": 54,
+        "pressure_drop_hhw_valve_nominal": 6001,
+        "chp_installed": false
+      }
+    }
   }
 }
diff --git a/tests/model_connectors/data/time_series_system_params_massflow_ex1.json b/tests/model_connectors/data/time_series_system_params_massflow_ex1.json
index 0a3a06e..76e6dda 100644
--- a/tests/model_connectors/data/time_series_system_params_massflow_ex1.json
+++ b/tests/model_connectors/data/time_series_system_params_massflow_ex1.json
@@ -55,9 +55,7 @@
             "valve_pressure_drop": 6000,
             "heat_exchanger_secondary_pressure_drop": 500,
             "heat_exchanger_primary_pressure_drop": 500,
-            "cooling_supply_water_temperature_district": 5,
             "cooling_supply_water_temperature_building": 7,
-            "heating_supply_water_temperature_district": 55,
             "heating_supply_water_temperature_building": 50,
             "booster_heater": false,
             "ets_generation": "Fourth Generation",
@@ -73,5 +71,40 @@
         }
       }
     ]
+  },
+  "district_system": {
+    "default": {
+      "central_cooling_plant_parameters": {
+        "mos_wet_bulb_filename": "../../data_shared/USA_CA_San.Francisco.Intl.AP.724940_TMY3.mos",
+        "heat_flow_nominal": 7999,
+        "cooling_tower_fan_power_nominal": 4999,
+        "mass_chw_flow_nominal": 9.9,
+        "chiller_water_flow_minimum": 9.9,
+        "mass_cw_flow_nominal": 9.9,
+        "chw_pump_head": 300000,
+        "cw_pump_head": 200000,
+        "pressure_drop_chw_nominal": 5999,
+        "pressure_drop_cw_nominal": 5999,
+        "pressure_drop_setpoint": 49999,
+        "temp_setpoint_chw": 6,
+        "pressure_drop_chw_valve_nominal": 5999,
+        "pressure_drop_cw_pum_nominal": 5999,
+        "temp_air_wb_nominal": 24.9,
+        "temp_cw_in_nominal": 34.9,
+        "cooling_tower_water_temperature_difference_nominal": 6.56,
+        "delta_temp_approach": 3.25,
+        "ratio_water_air_nominal": 0.6
+      },
+      "central_heating_plant_parameters": {
+        "heat_flow_nominal": 8001,
+        "mass_hhw_flow_nominal": 11,
+        "boiler_water_flow_minimum": 11,
+        "pressure_drop_hhw_nominal": 55001,
+        "pressure_drop_setpoint": 50000,
+        "temp_setpoint_hhw": 54,
+        "pressure_drop_hhw_valve_nominal": 6001,
+        "chp_installed": false
+      }
+    }
   }
 }
diff --git a/tests/model_connectors/data/time_series_system_params_no_ets.json b/tests/model_connectors/data/time_series_system_params_no_ets.json
index 5011f71..2152d68 100644
--- a/tests/model_connectors/data/time_series_system_params_no_ets.json
+++ b/tests/model_connectors/data/time_series_system_params_no_ets.json
@@ -23,5 +23,40 @@
         }
       }
     ]
+  },
+  "district_system": {
+    "default": {
+      "central_cooling_plant_parameters": {
+        "mos_wet_bulb_filename": "../../data_shared/USA_CA_San.Francisco.Intl.AP.724940_TMY3.mos",
+        "heat_flow_nominal": 7999,
+        "cooling_tower_fan_power_nominal": 4999,
+        "mass_chw_flow_nominal": 9.9,
+        "chiller_water_flow_minimum": 9.9,
+        "mass_cw_flow_nominal": 9.9,
+        "chw_pump_head": 300000,
+        "cw_pump_head": 200000,
+        "pressure_drop_chw_nominal": 5999,
+        "pressure_drop_cw_nominal": 5999,
+        "pressure_drop_setpoint": 49999,
+        "temp_setpoint_chw": 6,
+        "pressure_drop_chw_valve_nominal": 5999,
+        "pressure_drop_cw_pum_nominal": 5999,
+        "temp_air_wb_nominal": 24.9,
+        "temp_cw_in_nominal": 34.9,
+        "cooling_tower_water_temperature_difference_nominal": 6.56,
+        "delta_temp_approach": 3.25,
+        "ratio_water_air_nominal": 0.6
+      },
+      "central_heating_plant_parameters": {
+        "heat_flow_nominal": 8001,
+        "mass_hhw_flow_nominal": 11,
+        "boiler_water_flow_minimum": 11,
+        "pressure_drop_hhw_nominal": 55001,
+        "pressure_drop_setpoint": 50000,
+        "temp_setpoint_hhw": 54,
+        "pressure_drop_hhw_valve_nominal": 6001,
+        "chp_installed": false
+      }
+    }
   }
 }
diff --git a/tests/system_parameters/data/system_params_1.json b/tests/system_parameters/data/system_params_1.json
index e2e15a8..499ad13 100644
--- a/tests/system_parameters/data/system_params_1.json
+++ b/tests/system_parameters/data/system_params_1.json
@@ -22,9 +22,7 @@
           "valve_pressure_drop": 6000,
           "heat_exchanger_secondary_pressure_drop": 500,
           "heat_exchanger_primary_pressure_drop": 500,
-          "cooling_supply_water_temperature_district": 5,
           "cooling_supply_water_temperature_building": 7,
-          "heating_supply_water_temperature_district": 55,
           "heating_supply_water_temperature_building": 50,
           "delta_temp_chw_building": 5,
           "delta_temp_chw_district": 8,
@@ -55,9 +53,7 @@
             "valve_pressure_drop": 6000,
             "heat_exchanger_secondary_pressure_drop": 500,
             "heat_exchanger_primary_pressure_drop": 500,
-            "cooling_supply_water_temperature_district": 5,
             "cooling_supply_water_temperature_building": 7,
-            "heating_supply_water_temperature_district": 55,
             "heating_supply_water_temperature_building": 50,
             "delta_temp_chw_building": 5,
             "delta_temp_chw_district": 8,
@@ -83,9 +79,7 @@
             "valve_pressure_drop": 6000,
             "heat_exchanger_secondary_pressure_drop": 500,
             "heat_exchanger_primary_pressure_drop": 500,
-            "cooling_supply_water_temperature_district": 5,
             "cooling_supply_water_temperature_building": 7,
-            "heating_supply_water_temperature_district": 55,
             "heating_supply_water_temperature_building": 50,
             "delta_temp_chw_building": 5,
             "delta_temp_chw_district": 8,
@@ -126,9 +120,7 @@
             "valve_pressure_drop": 6000,
             "heat_exchanger_secondary_pressure_drop": 500,
             "heat_exchanger_primary_pressure_drop": 500,
-            "cooling_supply_water_temperature_district": 5,
             "cooling_supply_water_temperature_building": 7,
-            "heating_supply_water_temperature_district": 55,
             "heating_supply_water_temperature_building": 50,
             "delta_temp_chw_building": 5,
             "delta_temp_chw_district": 8,
@@ -169,9 +161,7 @@
             "valve_pressure_drop": 6000,
             "heat_exchanger_secondary_pressure_drop": 500,
             "heat_exchanger_primary_pressure_drop": 500,
-            "cooling_supply_water_temperature_district": 5,
             "cooling_supply_water_temperature_building": 7,
-            "heating_supply_water_temperature_district": 55,
             "heating_supply_water_temperature_building": 50,
             "delta_temp_chw_building": 5,
             "delta_temp_chw_district": 8,
diff --git a/tests/system_parameters/data/system_params_2.json b/tests/system_parameters/data/system_params_2.json
index 5a12647..32b6f03 100644
--- a/tests/system_parameters/data/system_params_2.json
+++ b/tests/system_parameters/data/system_params_2.json
@@ -22,9 +22,7 @@
           "valve_pressure_drop": 6000,
           "heat_exchanger_secondary_pressure_drop": 500,
           "heat_exchanger_primary_pressure_drop": 500,
-          "cooling_supply_water_temperature_district": 5,
           "cooling_supply_water_temperature_building": 7,
-          "heating_supply_water_temperature_district": 80,
           "heating_supply_water_temperature_building": 75,
           "booster_heater": false,
           "ets_connection_type": "Indirect",
@@ -53,9 +51,7 @@
             "valve_pressure_drop": 6000,
             "heat_exchanger_secondary_pressure_drop": 500,
             "heat_exchanger_primary_pressure_drop": 500,
-            "cooling_supply_water_temperature_district": 5,
             "cooling_supply_water_temperature_building": 7,
-            "heating_supply_water_temperature_district": 80,
             "heating_supply_water_temperature_building": 75,
             "booster_heater": false,
             "ets_connection_type": "Indirect",
@@ -101,9 +97,7 @@
             "valve_pressure_drop": 6000,
             "heat_exchanger_secondary_pressure_drop": 500,
             "heat_exchanger_primary_pressure_drop": 500,
-            "cooling_supply_water_temperature_district": 5,
             "cooling_supply_water_temperature_building": 7,
-            "heating_supply_water_temperature_district": 80,
             "heating_supply_water_temperature_building": 75,
             "booster_heater": false,
             "ets_connection_type": "Indirect",
@@ -122,6 +116,41 @@
       }
     ]
   },
+  "district_system": {
+    "default": {
+      "central_cooling_plant_parameters": {
+        "mos_wet_bulb_filename": "../../data_shared/USA_CA_San.Francisco.Intl.AP.724940_TMY3.mos",
+        "heat_flow_nominal": 7999,
+        "cooling_tower_fan_power_nominal": 4999,
+        "mass_chw_flow_nominal": 9.9,
+        "chiller_water_flow_minimum": 9.9,
+        "mass_cw_flow_nominal": 9.9,
+        "chw_pump_head": 300000,
+        "cw_pump_head": 200000,
+        "pressure_drop_chw_nominal": 5999,
+        "pressure_drop_cw_nominal": 5999,
+        "pressure_drop_setpoint": 49999,
+        "temp_setpoint_chw": 6,
+        "pressure_drop_chw_valve_nominal": 5999,
+        "pressure_drop_cw_pum_nominal": 5999,
+        "temp_air_wb_nominal": 24.9,
+        "temp_cw_in_nominal": 34.9,
+        "cooling_tower_water_temperature_difference_nominal": 6.56,
+        "delta_temp_approach": 3.25,
+        "ratio_water_air_nominal": 0.6
+      },
+      "central_heating_plant_parameters": {
+        "heat_flow_nominal": 8001,
+        "mass_hhw_flow_nominal": 11,
+        "boiler_water_flow_minimum": 11,
+        "pressure_drop_hhw_nominal": 55001,
+        "pressure_drop_setpoint": 50000,
+        "temp_setpoint_hhw": 54,
+        "pressure_drop_hhw_valve_nominal": 6001,
+        "chp_installed": false
+      }
+    }
+  },
   "connectors": {
     "default": {
       "pipe_diameter": 12,
diff --git a/tests/system_parameters/test_system_parameters.py b/tests/system_parameters/test_system_parameters.py
index 37185fd..f8260ae 100644
--- a/tests/system_parameters/test_system_parameters.py
+++ b/tests/system_parameters/test_system_parameters.py
@@ -199,9 +199,7 @@ class SystemParametersTest(unittest.TestCase):
             "valve_pressure_drop": 6000,
             "heat_exchanger_secondary_pressure_drop": 500,
             "heat_exchanger_primary_pressure_drop": 500,
-            "cooling_supply_water_temperature_district": 5,
             "cooling_supply_water_temperature_building": 7,
-            "heating_supply_water_temperature_district": 55,
             "heating_supply_water_temperature_building": 50,
             "delta_temp_chw_building": 5,
             "delta_temp_chw_district": 8,
['tests/model_connectors/data/time_series_system_params_no_ets.json', 'geojson_modelica_translator/system_parameters/schema.json', 'tests/model_connectors/data/spawn_system_params_ex2.json', 'tests/data_shared/mixed_loads_district/system_params.json', 'geojson_modelica_translator/model_connectors/load_connectors/load_base.py', 'geojson_modelica_translator/model_connectors/load_connectors/teaser.py', 'tests/system_parameters/data/system_params_2.json', 'tests/model_connectors/data/teaser_system_params_ex1.json', 'geojson_modelica_translator/model_connectors/districts/district.py', 'tests/model_connectors/data/spawn_system_params_ex1.json', 'geojson_modelica_translator/model_connectors/couplings/coupling.py', 'geojson_modelica_translator/model_connectors/couplings/templates/Teaser_HeatingIndirect/ComponentDefinitions.mopt', 'tests/model_connectors/data/time_series_system_params_ets.json', 'geojson_modelica_translator/model_connectors/couplings/templates/TimeSeries_HeatingIndirect/ComponentDefinitions.mopt', 'docs/developer_resources.rst', 'tests/model_connectors/data/teaser_system_params_two_loads.json', 'geojson_modelica_translator/model_connectors/couplings/templates/Network2Pipe_HeatingPlant/ComponentDefinitions.mopt', 'geojson_modelica_translator/system_parameters/time_series_template.json', 'tests/model_connectors/data/teaser_system_params_ex2.json', 'geojson_modelica_translator/model_connectors/energy_transfer_systems/cooling_indirect.py', 'geojson_modelica_translator/model_connectors/couplings/templates/Spawn_HeatingIndirect/ComponentDefinitions.mopt', 'tests/geojson_modelica_translator/data/system_parameters_mix_models.json', 'tests/model_connectors/data/spawn_district_system_params_ex1.json', 'geojson_modelica_translator/model_connectors/energy_transfer_systems/templates/HeatingIndirect.mot', 'geojson_modelica_translator/model_connectors/energy_transfer_systems/heating_indirect.py', 'tests/system_parameters/test_system_parameters.py', 'tests/system_parameters/data/system_params_1.json', 'tests/model_connectors/data/time_series_system_params_chp.json', 'tests/model_connectors/data/time_series_system_params_ex1.json', 'geojson_modelica_translator/model_connectors/energy_transfer_systems/templates/CoolingIndirect.mot', 'tests/model_connectors/data/time_series_system_params_massflow_ex1.json', 'geojson_modelica_translator/model_connectors/model_base.py']