diff --git a/src/xeto/ashrae.g36/vavs.xeto b/src/xeto/ashrae.g36/vavs.xeto
index 412e14f..7f8663f 100644
--- a/src/xeto/ashrae.g36/vavs.xeto
+++ b/src/xeto/ashrae.g36/vavs.xeto
@@ -6,9 +6,6 @@
 // Author: Avijit Saha, Jaime Gagne, Maggie Sullivan
 //
 
-// Suggested Marker Tags in the tags.pog file
-// override: Marker
-
 // Guideline 36 base type for VAVs terminal units
 G36Vav : Vav <abstract> {
   points: {
@@ -16,7 +13,8 @@ G36Vav : Vav <abstract> {
     ZoneAirTempEffectiveSp
     ZoneOccupiedSensor
     ZoneCo2Sensor
-    // {window, override, cmd, point}
+    WindowOverrideCmd?
+    OccupantOverrideCmd?
   }
 }
 
diff --git a/src/xeto/ph.points.sugar/misc.xeto b/src/xeto/ph.points.sugar/misc.xeto
index c1bff60..484b954 100644
--- a/src/xeto/ph.points.sugar/misc.xeto
+++ b/src/xeto/ph.points.sugar/misc.xeto
@@ -9,6 +9,13 @@
 // Sensor for open/close state of a window
 WindowOpenSensor : OpenSensor { window }
 
+// Command to override normal automatic operation when a window is open
+WindowOverrideCmd : OverrideCmd { window }
+
 // Sensor for open/close state of a door
 DoorOpenSensor : OpenSensor { door }
 
+// Command to override normal automatic operation to occupied mode,
+// initiated by an occupant pressing a local button or switch.
+OccupantOverrideCmd : OverrideCmd { occupant }
+
diff --git a/src/xeto/ph.points/misc.xeto b/src/xeto/ph.points/misc.xeto
index 9e31731..5b02285 100644
--- a/src/xeto/ph.points/misc.xeto
+++ b/src/xeto/ph.points/misc.xeto
@@ -137,3 +137,14 @@ DessicantDehumidifierCmd : BoolPoint { dessicantDehumidifier }
 // Temperature conditioning mode for a zone in an HVAC system
 ZoneAirHvacModeSp : EnumPoint & SpPoint { zone, air, hvacMode }
 
+// Auto and override enumeration
+OverrideEnum: Enum { auto, override }
+
+// Point associated with an override of normal automatic operation
+OverridePoint : BoolPoint <abstract> {
+  override
+  enum: Obj <val:OverrideEnum>
+}
+
+// Command to override normal automatic operation
+OverrideCmd : OverridePoint & CmdPoint
diff --git a/src/xeto/ph/entity.xeto b/src/xeto/ph/entity.xeto
index 3fc1d87..3e5b810 100644
--- a/src/xeto/ph/entity.xeto
+++ b/src/xeto/ph/entity.xeto
@@ -1043,6 +1043,10 @@ PhEntity: Entity <abstract> {
   // See [ph.doc::Zones#occupancy] chapter.
   *occupancy: Marker
 
+  // A person who uses or occupies a space.
+  // See [ph.doc::Zones#occupancy] chapter.
+  *occupant: Marker
+
   // People who use the built environment.
   // See [ph.doc::Zones#occupancy] chapter.
   *occupants: Marker
@@ -1072,6 +1076,10 @@ PhEntity: Entity <abstract> {
   // Duct to access fresh outside air for both ventilation and economizer.
   *outside: Marker
 
+  // Manual, local, or other higher-priority control that supersedes
+  // normal automatic operation.
+  *override: Marker
+
   // Enclosure for electrical and control equipment.  Panels may be
   // used to isolate electrical connections and provide environmental
   // protection.