diff --git a/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml b/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml
index 798abf42a..0995a413e 100644
--- a/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml
+++ b/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml
@@ -161,6 +161,8 @@ CSP:
   - OPERATIONAL
   opt_uses:
   - discharge_air_temperature_sensor
+  - high_discharge_air_temperature_alarm
+  - low_discharge_air_temperature_alarm
   - zone_air_relative_humidity_sensor
   - zone_occupancy_status
   - failed_discharge_air_temperature_alarm
@@ -2037,6 +2039,8 @@ DXZC:
   - high_zone_air_temperature_alarm
   - low_zone_air_temperature_alarm
   - overload_compressor_alarm
+  - high_discharge_air_temperature_alarm
+  - low_discharge_air_temperature_alarm
   uses:
   - compressor_run_command
   - compressor_run_status
@@ -5763,6 +5767,8 @@ HWDDC:
   - heating_thermal_power_capacity
   - heating_water_flowrate_sensor
   - heating_water_valve_percentage_sensor
+  - high_discharge_air_temperature_alarm
+  - low_discharge_air_temperature_alarm
   - failed_discharge_air_temperature_alarm
   uses:
   - discharge_air_heating_temperature_setpoint
@@ -5772,6 +5778,25 @@ HWDDC:
   - CONTROL
 
 
+CHWDDC:
+  description: "Chilled water valve with dual setpoint control on discharge side."
+  is_abstract: true
+  opt_uses:
+  - discharge_air_relative_humidity_sensor
+  - cooling_thermal_power_capacity
+  - chilled_water_flowrate_sensor
+  - chilled_water_valve_percentage_sensor
+  - high_discharge_air_temperature_alarm
+  - low_discharge_air_temperature_alarm
+  - failed_discharge_air_temperature_alarm
+  uses:
+  - discharge_air_cooling_temperature_setpoint
+  - discharge_air_temperature_sensor
+  - chilled_water_valve_percentage_command
+  implements:
+  - CONTROL
+
+
 CFDPM:
   guid: "be3e3bc0-e927-46a1-9b63-62717fa740ca"
   description: "Carbon filter pressure monitoring, where specific filter type is required."
diff --git a/ontology/yaml/resources/HVAC/entity_types/CH.yaml b/ontology/yaml/resources/HVAC/entity_types/CH.yaml
index 3ba250d3a..c7b2734bc 100644
--- a/ontology/yaml/resources/HVAC/entity_types/CH.yaml
+++ b/ontology/yaml/resources/HVAC/entity_types/CH.yaml
@@ -640,6 +640,22 @@ CH_SS_DX2SWC_CHDXVSC2X_RWTM_MWDPC_RWISOVM_REFSM2X_REFPM2X_CPC_INVIPWM2X_INVOPWM2
   - INVIPWM2X
   - INVOPWM2X
 
+CH_SS_DX2SWC_CHDXVSC2X_RWTM_MWDPC_REFSM2X_REFPM2X_CPC_INVIPWM2X_INVOPWM2X:
+  description: "Two stage air cooled chiller with dual compressor variable speed control, minimum differential pressure control, return water temperature monitoring, two circuit refrigerant monitoring, circulation pump monitoring and input/output inverter power monitoring."
+  is_canonical: true
+  implements:
+  - CH
+  - SS
+  - DX2SWC
+  - CHDXVSC2X
+  - RWTM
+  - MWDPC
+  - REFSM2X
+  - REFPM2X
+  - CPC
+  - INVIPWM2X
+  - INVOPWM2X
+
 ###################################
 ### Existing Non-standard Types ###
 ###################################
diff --git a/ontology/yaml/resources/HVAC/entity_types/MAU.yaml b/ontology/yaml/resources/HVAC/entity_types/MAU.yaml
index 48ad72226..d9f537ea8 100644
--- a/ontology/yaml/resources/HVAC/entity_types/MAU.yaml
+++ b/ontology/yaml/resources/HVAC/entity_types/MAU.yaml
@@ -728,6 +728,20 @@ MAU_DFSS_DFVSC_DSP_CHWDC_HWDC_OADM_ZSPM:
   opt_uses:
   - smoke_alarm
 
+MAU_DFSS_DFVSC_DSP_HWDDC_CHWDDC_OADM:
+  description: "Makeup air unit with heating and cooling."
+  is_canonical: true
+  implements:
+  - MAU
+  - DFSS
+  - DFVSC
+  - DSP
+  - HWDDC
+  - CHWDDC
+  - OADM
+  opt_uses:
+  - smoke_alarm
+
 ############################
 ###   Remap These Types  ###
 ############################