diff --git a/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml b/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml
index f6c9de776..52ada1ca9 100644
--- a/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml
+++ b/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml
@@ -6675,6 +6675,35 @@ VMADC:
   implements:
   - CONTROL
 
+TLM:
+  description: "Level and temperature monitoring"
+  is_abstract: true
+  uses:
+  - supply_water_temperature_sensor
+  - water_high_level_status
+  - water_low_level_status
+  - high_water_temperature_alarm
+  - high_water_temperature_setpoint
+  implements:
+  - MONITORING
+
+TLM2X:
+  description: "Level and temperature monitoring 2x"
+  is_abstract: true
+  uses:
+  - supply_water_temperature_sensor_1
+  - water_high_level_status_1
+  - water_low_level_status_1
+  - high_water_temperature_setpoint_1
+  - high_water_temperature_alarm_1
+  - supply_water_temperature_sensor_2
+  - water_high_level_status_2
+  - water_low_level_status_2
+  - high_water_temperature_setpoint_2
+  - high_water_temperature_alarm_2
+  implements:
+  - MONITORING
+
 OAQM:
   guid: "99e4f482-278e-40ee-9524-9f687c41ba22"
   description: "Outside air quality monitoring (particulates and gases)"
@@ -6691,3 +6720,4 @@ OAQM:
   - outside_air_co2_concentration_sensor
   implements:
   - MONITORING
+
diff --git a/ontology/yaml/resources/HVAC/entity_types/TANK.yaml b/ontology/yaml/resources/HVAC/entity_types/TANK.yaml
index be15ea179..49c32749d 100644
--- a/ontology/yaml/resources/HVAC/entity_types/TANK.yaml
+++ b/ontology/yaml/resources/HVAC/entity_types/TANK.yaml
@@ -43,3 +43,18 @@ TK_LM:
   implements:
   - /TK # Inherits from global namespace
   - LM
+
+TK_TLM:
+  description: "Tank with level monitoring "
+  is_canonical: true
+  implements:
+  - /TK # Inherits from global namespace
+  - TLM
+
+
+TK_TLM2X:
+  description: "Tank with level monitoring "
+  is_canonical: true
+  implements:
+  - /TK # Inherits from global namespace
+  - TLM2X
\ No newline at end of file
diff --git a/ontology/yaml/resources/fields/telemetry_fields.yaml b/ontology/yaml/resources/fields/telemetry_fields.yaml
index fbb0ee417..84672f564 100644
--- a/ontology/yaml/resources/fields/telemetry_fields.yaml
+++ b/ontology/yaml/resources/fields/telemetry_fields.yaml
@@ -3129,6 +3129,10 @@ literals:
     fixed_min: 0.0
     flexible_max: 2000.0
 
+- high_water_temperature_setpoint:
+    flexible_min: 255.9259259
+    flexible_max: 380.3703704
+
 - purge_command:
   - ON
   - OFF 
@@ -3139,4 +3143,5 @@ literals:
 
 - low_discharge_air_temperature_alarm:
   - ACTIVE
-  - INACTIVE
\ No newline at end of file
+  - INACTIVE
+