diff --git a/ontology/yaml/resources/HVAC/entity_types/GENERALTYPES.yaml b/ontology/yaml/resources/HVAC/entity_types/GENERALTYPES.yaml
index dce318d92..3dd4044b8 100644
--- a/ontology/yaml/resources/HVAC/entity_types/GENERALTYPES.yaml
+++ b/ontology/yaml/resources/HVAC/entity_types/GENERALTYPES.yaml
@@ -107,6 +107,8 @@ MAU:
   - failed_communication_alarm
   - failed_alarm
   - emergency_alarm
+  - smoke_alarm
+  - filter_alarm
   implements:
   - EQUIPMENT
 
diff --git a/ontology/yaml/resources/LIGHTING/entity_types/ABSTRACT.yaml b/ontology/yaml/resources/LIGHTING/entity_types/ABSTRACT.yaml
index b62828613..e90dad906 100644
--- a/ontology/yaml/resources/LIGHTING/entity_types/ABSTRACT.yaml
+++ b/ontology/yaml/resources/LIGHTING/entity_types/ABSTRACT.yaml
@@ -218,3 +218,11 @@ CTC:
   - lighting_color_temperature_sensor
   uses:
   - lighting_color_temperature_setpoint
+
+
+LPS:
+  guid: "a6981abe-eb32-4431-88fa-9b2660b84762"
+  description: "Individual lighting percentage sensor monitoring, not used for control"
+  is_abstract: true
+  uses:
+  - lighting_percentage_sensor
\ No newline at end of file
diff --git a/ontology/yaml/resources/LIGHTING/entity_types/LS.yaml b/ontology/yaml/resources/LIGHTING/entity_types/LS.yaml
index d812ec8b2..98d30e4e9 100644
--- a/ontology/yaml/resources/LIGHTING/entity_types/LS.yaml
+++ b/ontology/yaml/resources/LIGHTING/entity_types/LS.yaml
@@ -94,3 +94,11 @@ LS_OS_IS_MTS:
   - zone_air_temperature_sensor
   - zone_air_relative_humidity_sensor
 
+LS_LPS_OS:
+  guid: "502f5b67-1373-47e7-b151-08f185b67ec7"
+  description: "Lighting percentage sensing and zone occupancy monitoring"
+  is_canonical: true
+  implements:
+  - LS
+  - LPS
+  - OS
\ No newline at end of file