diff --git a/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml b/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml
index 014e40cf55..5bcd069558 100644
--- a/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml
+++ b/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml
@@ -6859,6 +6859,46 @@ RDC:
   implements:
   - MONITORING
 
+CHWZOUC:
+  description: "Chilled water valve control with occupied/unoccupied setpoints and temperature monitoring."
+  is_abstract: true
+  opt_uses:
+  - chilled_supply_water_temperature_sensor
+  uses:  
+  - chilled_water_valve_percentage_command
+  - zone_air_temperature_sensor
+  - zone_air_occupied_temperature_setpoint
+  - zone_air_unoccupied_cooling_temperature_setpoint
+  implements:
+  - CONTROL
+  
+PERHWZOUC:
+  description: "Perimeter heating water valve control with occupied/unoccupied setpoints and temperature monitoring."
+  is_abstract: true
+  opt_uses:
+  - perimeter_heating_supply_water_temperature_sensor
+  - perimeter_heating_water_valve_percentage_sensor
+  uses:  
+  - perimeter_heating_water_valve_percentage_command
+  - zone_air_temperature_sensor
+  - zone_air_occupied_temperature_setpoint
+  - zone_air_unoccupied_heating_temperature_setpoint
+  implements:
+  - CONTROL
+
+ZTOUC:
+  description: "Zone air temperature unoccupied/occupied control."
+  is_abstract: true
+  opt_uses:
+  - zone_air_relative_humidity_sensor
+  - zone_occupancy_status
+  uses:  
+  - zone_air_temperature_sensor
+  - zone_air_occupied_temperature_setpoint
+  - zone_air_unoccupied_heating_temperature_setpoint
+  - zone_air_unoccupied_cooling_temperature_setpoint
+  implements:
+  - OPERATIONAL
 
 RFSS:
   guid: "2ca79174-7d36-4341-a820-0db83cd9470c"
diff --git a/ontology/yaml/resources/HVAC/entity_types/CHB.yaml b/ontology/yaml/resources/HVAC/entity_types/CHB.yaml
new file mode 100644
index 0000000000..373075e363
--- /dev/null
+++ b/ontology/yaml/resources/HVAC/entity_types/CHB.yaml
@@ -0,0 +1,28 @@
+# Copyright 2020 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the License);
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an AS IS BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+########################
+### Canonical Types  ###
+########################
+
+CHB_ZTOUC_CHWZOUC_PERHWZOUC_CO2M_RMM:
+  description: "Chilled beam with perimeter heating, CO2 and run mode monitoring."
+  is_canonical: true
+  implements:
+  - CHB
+  - ZTOUC
+  - CHWZOUC
+  - PERHWZOUC
+  - CO2M
+  - RMM
diff --git a/ontology/yaml/resources/HVAC/entity_types/GENERALTYPES.yaml b/ontology/yaml/resources/HVAC/entity_types/GENERALTYPES.yaml
index d798f6ecf9..27cc1d1dcd 100644
--- a/ontology/yaml/resources/HVAC/entity_types/GENERALTYPES.yaml
+++ b/ontology/yaml/resources/HVAC/entity_types/GENERALTYPES.yaml
@@ -424,6 +424,12 @@ CRREF:
   implements:
   - EQUIPMENT
 
+CHB:
+  description: "Tag for chilled beams."
+  is_abstract: true
+  implements:
+  - EQUIPMENT
+
 WSHP:
   guid: "55c3b629-1018-462d-9e23-fd56a38743ec"
   description: "Tag for water source heat pumps.WSHP serves as a heating or cooling system using water as a heat exchange medium. In contrast to chillers that centralize cooling production and distribute chilled water, WSHPs operate locally, offering isolated control by using water from a nearby source for both heating and cooling functions within a building."
diff --git a/ontology/yaml/resources/fields/telemetry_fields.yaml b/ontology/yaml/resources/fields/telemetry_fields.yaml
index 55d0369298..1fc903886f 100644
--- a/ontology/yaml/resources/fields/telemetry_fields.yaml
+++ b/ontology/yaml/resources/fields/telemetry_fields.yaml
@@ -2909,6 +2909,38 @@ literals:
 - exhaust_fan_speed_mode:
   - BYPASS
   - VFD
+
+## New fields for EM##
+- electricalgrid_energy_accumulator
+- generator_run_time_accumulator
+- generator_energy_accumulator
+- electricalgrid_run_time_accumulator
+
+## New fields for fans##
+- discharge_fan_energy_accumulator
+- supply_fan_energy_accumulator
+- compressor_run_time_accumulator
+
+- total_lamp_failed_counter
+- total_wireless_device_failed_counter
+- total_communication_failed_counter
+
+## New fields for seismic detector
+- seismic_alarm
+
+## New fields for chilled beams
+- zone_air_occupied_temperature_setpoint
+- zone_air_unoccupied_cooling_temperature_setpoint
+- perimeter_heating_water_valve_percentage_sensor
+- perimeter_heating_water_valve_percentage_command
+- perimeter_heating_supply_water_temperature_sensor
+
+## New fields for RO water system
+- water_totaldissolvedsolids_concentration_sensor
+
+## New field for SDC
+- shade_extent_percentage_sensor
+
 - electricalgrid_energy_accumulator:
     fixed_min: 0.0
     flexible_max: 4000000.0
diff --git a/ontology/yaml/resources/subfields/subfields.yaml b/ontology/yaml/resources/subfields/subfields.yaml
index 7414cbeaac..7725be89ca 100644
--- a/ontology/yaml/resources/subfields/subfields.yaml
+++ b/ontology/yaml/resources/subfields/subfields.yaml
@@ -183,6 +183,7 @@ descriptor:
   ozone: "Highly reactive gaseous compound comprised of three oxygen atoms."
   particle: "A very fine clump of solid matter."
   outside: "Process or measurement of local atmospheric conditions."
+  perimeter: "The outermost parts or boundary of an area or object (e.g. a zone)"
   phase: "A phase of three-phase power distribution systems."
   phase1: "The first (nominally A) phase of three-phase power distribution systems."
   phase2: "The second (nominally B) phase of three-phase power distribution systems."