@matter/model 0.13.0-alpha.0-20250304-d4a7592a4 → 0.13.0-alpha.0-20250311-3eb0af5f2

package/src/standard/elements/DoorLock.ts

@@ -21,11 +21,13 @@ export const DoorLock = Cluster(
         name: "DoorLock", id: 0x101, classification: "application", pics: "DRLK",
         details: "The door lock cluster provides an interface to a generic way to secure a door. The physical object " +
             "that provides the locking functionality is abstracted from the cluster. The cluster has a small " +
-            "list of mandatory attributes and functions and a list of optional features.",
+            "list of mandatory attributes and functions and a list of optional features." +
+            "\n" +
+            "Figure 16. Typical Usage of the Door Lock Cluster",
         xref: { document: "cluster", section: "5.2" }
     },
 
-    Attribute({ name: "ClusterRevision", id: 0xfffd, type: "ClusterRevision", default: 7 }),
+    Attribute({ name: "ClusterRevision", id: 0xfffd, type: "ClusterRevision", default: 8 }),
 
     Attribute(
         { name: "FeatureMap", id: 0xfffc, type: "FeatureMap", xref: { document: "cluster", section: "5.2.4" } },
@@ -51,9 +53,7 @@ export const DoorLock = Cluster(
                 "\n" +
                 "A lock may support multiple credential types so if the User feature is supported the UserType, " +
                 "UserStatus and Schedules are all associated with a User index and not directly with a RFID index. A " +
-                "User" +
-                "\n" +
-                "Index may have several credentials associated with it.",
+                "User Index may have several credentials associated with it.",
 
             xref: { document: "cluster", section: "5.2.4.2" }
         }),
@@ -73,31 +73,27 @@ export const DoorLock = Cluster(
             xref: { document: "cluster", section: "5.2.4.3" }
         }),
 
-        Field({
-            name: "LOG", conformance: "O", constraint: "3", description: "Logging",
-            details: "If Events are not supported the logging feature shall replace the Event reporting structure. If " +
-                "Events are supported the logging feature shall NOT be supported.",
-            xref: { document: "cluster", section: "5.2.4.4" }
-        }),
-
         Field({
             name: "WDSCH", conformance: "O", constraint: "4", description: "WeekDayAccessSchedules",
 
             details: "If the User feature is supported then Week Day Schedules are applied to a User and not a credential." +
                 "\n" +
                 "Week Day Schedules are used to restrict access to a specified time window on certain days of the " +
-                "week. The schedule is repeated each week. When a schedule is cleared this clears the access " +
-                "restrictions and grants unrestricted access to the user. The lock may automatically adjust the " +
-                "UserType when a schedule is created or cleared.",
+                "week. The schedule is repeated each week." +
+                "\n" +
+                "The lock may automatically adjust the UserType when a schedule is created or cleared." +
+                "\n" +
+                "Support for WeekDayAccessSchedules requires that the lock has the capability of keeping track of " +
+                "local time.",
 
-            xref: { document: "cluster", section: "5.2.4.5" }
+            xref: { document: "cluster", section: "5.2.4.4" }
         }),
 
         Field({
             name: "DPS", conformance: "O", constraint: "5", description: "DoorPositionSensor",
             details: "If this feature is supported this indicates that the lock has the ability to determine the position " +
                 "of the door which is separate from the state of the lock.",
-            xref: { document: "cluster", section: "5.2.4.6" }
+            xref: { document: "cluster", section: "5.2.4.5" }
         }),
 
         Field({
@@ -112,48 +108,49 @@ export const DoorLock = Cluster(
                 "A lock may support multiple credential types so if the User feature is supported the UserType, " +
                 "UserStatus and Schedules are all associated with a User and not directly with a credential.",
 
-            xref: { document: "cluster", section: "5.2.4.7" }
+            xref: { document: "cluster", section: "5.2.4.6" }
         }),
 
         Field({
             name: "COTA", conformance: "O", constraint: "7", description: "CredentialOverTheAirAccess",
-            details: "If this feature is supported then the lock supports the ability to verify a credential provided in " +
-                "a lock/unlock command. Currently the cluster only supports providing the PIN credential to the " +
+            details: "If this feature is supported then the lock supports the ability to verify a credential provided in a" +
+                "\n" +
+                "lock/unlock command. Currently the cluster only supports providing the PIN credential to the " +
                 "lock/unlock commands. If this feature is supported then the PIN Credential feature shall also be " +
                 "supported.",
-            xref: { document: "cluster", section: "5.2.4.8" }
+            xref: { document: "cluster", section: "5.2.4.7" }
         }),
 
         Field({
-            name: "USR", conformance: "[PIN | RID | FGP | FACE]", constraint: "8", description: "User",
+            name: "USR", conformance: "ALIRO, [PIN | RID | FGP | FACE]", constraint: "8", description: "User",
             details: "If the User Feature is supported then a lock employs a User database. A User within the User " +
                 "database is used to associate credentials and schedules to single user record within the lock. This " +
                 "also means the UserType and UserStatus fields are associated with a User and not a credential.",
-            xref: { document: "cluster", section: "5.2.4.9" }
-        }),
-
-        Field({
-            name: "NOT", conformance: "O", constraint: "9", description: "Notification",
-            details: "This is a feature used before support of events. This feature supports notification commands and " +
-                "masks used to filter these notifications.",
-            xref: { document: "cluster", section: "5.2.4.10" }
+            xref: { document: "cluster", section: "5.2.4.8" }
         }),
 
         Field({
             name: "YDSCH", conformance: "O", constraint: "10", description: "YearDayAccessSchedules",
-            details: "If the User feature is supported then Year Day Schedules are applied to a User and not a credential." +
+
+            details: "If the User feature is supported then Year Day Schedules are applied to a User and not a " +
+                "credential. Year Day Schedules are used to restrict access to a specified date and time window." +
                 "\n" +
-                "Year Day Schedules are used to restrict access to a specified date and time window. When a schedule " +
-                "is cleared this clears the access restrictions and grants unrestricted access to the user. The lock " +
-                "may automatically adjust the UserType when a schedule is created or cleared.",
-            xref: { document: "cluster", section: "5.2.4.11" }
+                "The lock may automatically adjust the UserType when a schedule is created or cleared." +
+                "\n" +
+                "Support for YearDayAccessSchedules requires that the lock has the capability of keeping track of " +
+                "local time.",
+
+            xref: { document: "cluster", section: "5.2.4.9" }
         }),
 
         Field({
             name: "HDSCH", conformance: "O", constraint: "11", description: "HolidaySchedules",
             details: "This feature is used to setup Holiday Schedule in the lock device. A Holiday Schedule sets a start " +
-                "and stop end date/time for the lock to use the specified operating mode set by the Holiday Schedule.",
-            xref: { document: "cluster", section: "5.2.4.12" }
+                "and stop end date/time for the lock to use the specified operating mode set by the Holiday Schedule." +
+                "\n" +
+                "Support for HolidaySchedules requires that the lock has the capability of keeping track of local " +
+                "time.",
+            xref: { document: "cluster", section: "5.2.4.10" }
         }),
 
         Field({
@@ -163,13 +160,27 @@ export const DoorLock = Cluster(
                 "by retracting the bolt and briefly pulling the latch. While the latch is pulled, the lock state " +
                 "changes to Unlatched. Locks without unbolting support don’t differentiate between unbolting and " +
                 "unlocking and perform the same operation for both commands.",
+            xref: { document: "cluster", section: "5.2.4.11" }
+        }),
+
+        Field({
+            name: "ALIRO", conformance: "O", constraint: "13", description: "AliroProvisioning",
+            details: "Locks that support this feature implement the Aliro specification as defined in [Aliro] and support " +
+                "Matter as a method for provisioning Aliro credentials.",
+            xref: { document: "cluster", section: "5.2.4.12" }
+        }),
+
+        Field({
+            name: "ALBU", conformance: "[ALIRO]", constraint: "14", description: "AliroBleuwb",
+            details: "Locks that support this feature implement the Bluetooth LE + UWB Access Control Flow as defined in " +
+                "[Aliro].",
             xref: { document: "cluster", section: "5.2.4.13" }
         })
     ),
 
     Attribute({
         name: "LockState", id: 0x0, type: "LockStateEnum", access: "R V", conformance: "M",
-        constraint: "desc", quality: "X S P",
+        constraint: "desc", quality: "X P",
 
         details: "This attribute may be NULL if the lock hardware does not currently know the status of the locking " +
             "mechanism. For example, a lock may not know the LockState status after a power cycle until the " +
@@ -179,21 +190,21 @@ export const DoorLock = Cluster(
             "between Locked and Unlocked so it is only partially secured. For example, a deadbolt could be " +
             "partially extended and not in a dead latched state.",
 
-        xref: { document: "cluster", section: "5.2.9.2" }
+        xref: { document: "cluster", section: "5.2.9.1" }
     }),
 
     Attribute({
         name: "LockType", id: 0x1, type: "LockTypeEnum", access: "R V", conformance: "M",
         constraint: "desc",
         details: "Indicates the type of door lock as defined in LockTypeEnum.",
-        xref: { document: "cluster", section: "5.2.9.3" }
+        xref: { document: "cluster", section: "5.2.9.2" }
     }),
 
     Attribute({
         name: "ActuatorEnabled", id: 0x2, type: "bool", access: "R V", conformance: "M",
         details: "Indicates if the lock is currently able to (Enabled) or not able to (Disabled) process remote Lock, " +
             "Unlock, or Unlock with Timeout commands.",
-        xref: { document: "cluster", section: "5.2.9.4" }
+        xref: { document: "cluster", section: "5.2.9.3" }
     }),
 
     Attribute({
@@ -202,88 +213,81 @@ export const DoorLock = Cluster(
         details: "Indicates the current door state as defined in DoorStateEnum." +
             "\n" +
             "Null only if an internal error prevents the retrieval of the current door state.",
-        xref: { document: "cluster", section: "5.2.9.5" }
+        xref: { document: "cluster", section: "5.2.9.4" }
     }),
 
     Attribute({
         name: "DoorOpenEvents", id: 0x4, type: "uint32", access: "RW VM", conformance: "[DPS]",
         details: "This attribute shall hold the number of door open events that have occurred since it was last " +
             "zeroed.",
-        xref: { document: "cluster", section: "5.2.9.6" }
+        xref: { document: "cluster", section: "5.2.9.5" }
     }),
 
     Attribute({
         name: "DoorClosedEvents", id: 0x5, type: "uint32", access: "RW VM", conformance: "[DPS]",
         details: "This attribute shall hold the number of door closed events that have occurred since it was last " +
             "zeroed.",
-        xref: { document: "cluster", section: "5.2.9.7" }
+        xref: { document: "cluster", section: "5.2.9.6" }
     }),
 
     Attribute({
         name: "OpenPeriod", id: 0x6, type: "uint16", access: "RW VM", conformance: "[DPS]",
         details: "This attribute shall hold the number of minutes the door has been open since the last time it " +
             "transitioned from closed to open.",
-        xref: { document: "cluster", section: "5.2.9.8" }
-    }),
-
-    Attribute({
-        name: "NumberOfLogRecordsSupported", id: 0x10, type: "uint16", access: "R V", conformance: "LOG",
-        default: 0, quality: "F",
-        details: "Indicates the number of available log records.",
-        xref: { document: "cluster", section: "5.2.9.9" }
+        xref: { document: "cluster", section: "5.2.9.7" }
     }),
 
     Attribute({
         name: "NumberOfTotalUsersSupported", id: 0x11, type: "uint16", access: "R V", conformance: "USR",
         default: 0, quality: "F",
         details: "Indicates the number of total users supported by the lock.",
-        xref: { document: "cluster", section: "5.2.9.10" }
+        xref: { document: "cluster", section: "5.2.9.8" }
     }),
 
     Attribute({
         name: "NumberOfPinUsersSupported", id: 0x12, type: "uint16", access: "R V", conformance: "PIN",
         default: 0, quality: "F",
         details: "Indicates the number of PIN users supported.",
-        xref: { document: "cluster", section: "5.2.9.11" }
+        xref: { document: "cluster", section: "5.2.9.9" }
     }),
 
     Attribute({
         name: "NumberOfRfidUsersSupported", id: 0x13, type: "uint16", access: "R V", conformance: "RID",
         default: 0, quality: "F",
         details: "Indicates the number of RFID users supported.",
-        xref: { document: "cluster", section: "5.2.9.12" }
+        xref: { document: "cluster", section: "5.2.9.10" }
     }),
 
     Attribute({
         name: "NumberOfWeekDaySchedulesSupportedPerUser", id: 0x14, type: "uint8", access: "R V",
-        conformance: "WDSCH", default: 0, quality: "F",
+        conformance: "WDSCH", constraint: "max 253", default: 0, quality: "F",
         details: "Indicates the number of configurable week day schedule supported per user.",
-        xref: { document: "cluster", section: "5.2.9.13" }
+        xref: { document: "cluster", section: "5.2.9.11" }
     }),
 
     Attribute({
         name: "NumberOfYearDaySchedulesSupportedPerUser", id: 0x15, type: "uint8", access: "R V",
-        conformance: "YDSCH", default: 0, quality: "F",
+        conformance: "YDSCH", constraint: "max 253", default: 0, quality: "F",
         details: "Indicates the number of configurable year day schedule supported per user.",
-        xref: { document: "cluster", section: "5.2.9.14" }
+        xref: { document: "cluster", section: "5.2.9.12" }
     }),
 
     Attribute({
         name: "NumberOfHolidaySchedulesSupported", id: 0x16, type: "uint8", access: "R V",
-        conformance: "HDSCH", default: 0, quality: "F",
+        conformance: "HDSCH", constraint: "max 253", default: 0, quality: "F",
         details: "Indicates the number of holiday schedules supported for the entire door lock device.",
-        xref: { document: "cluster", section: "5.2.9.15" }
+        xref: { document: "cluster", section: "5.2.9.13" }
     }),
 
     Attribute({
         name: "MaxPinCodeLength", id: 0x17, type: "uint8", access: "R V", conformance: "PIN", quality: "F",
         details: "Indicates the maximum length in bytes of a PIN Code on this device.",
-        xref: { document: "cluster", section: "5.2.9.16" }
+        xref: { document: "cluster", section: "5.2.9.14" }
     }),
     Attribute({
         name: "MinPinCodeLength", id: 0x18, type: "uint8", access: "R V", conformance: "PIN", quality: "F",
         details: "Indicates the minimum length in bytes of a PIN Code on this device.",
-        xref: { document: "cluster", section: "5.2.9.17" }
+        xref: { document: "cluster", section: "5.2.9.15" }
     }),
 
     Attribute({
@@ -291,7 +295,7 @@ export const DoorLock = Cluster(
         details: "Indicates the maximum length in bytes of a RFID Code on this device. The value depends on the RFID " +
             "code range specified by the manufacturer, if media anti-collision identifiers (UID) are used as " +
             "RFID code, a value of 20 (equals 10 Byte ISO 14443A UID) is recommended.",
-        xref: { document: "cluster", section: "5.2.9.18" }
+        xref: { document: "cluster", section: "5.2.9.16" }
     }),
 
     Attribute({
@@ -299,7 +303,7 @@ export const DoorLock = Cluster(
         details: "Indicates the minimum length in bytes of a RFID Code on this device. The value depends on the RFID " +
             "code range specified by the manufacturer, if media anti-collision identifiers (UID) are used as " +
             "RFID code, a value of 8 (equals 4 Byte ISO 14443A UID) is recommended.",
-        xref: { document: "cluster", section: "5.2.9.19" }
+        xref: { document: "cluster", section: "5.2.9.17" }
     }),
 
     Attribute({
@@ -307,7 +311,7 @@ export const DoorLock = Cluster(
         conformance: "USR", default: 1, quality: "F",
         details: "This attribute shall contain a bitmap with the bits set for the values of CredentialRuleEnum " +
             "supported on this device.",
-        xref: { document: "cluster", section: "5.2.9.20" }
+        xref: { document: "cluster", section: "5.2.9.18" }
     }),
 
     Attribute({
@@ -324,21 +328,7 @@ export const DoorLock = Cluster(
             "NumberOfRFIDUsersSupported is set to 3, it will not be possible to actually assign 10 credentials " +
             "for a user because maximum number of credentials in the database is 8.",
 
-        xref: { document: "cluster", section: "5.2.9.21" }
-    }),
-
-    Attribute({
-        name: "EnableLogging", id: 0x20, type: "bool", access: "R[W] VA", conformance: "LOG", default: true,
-        quality: "P",
-
-        details: "This attribute shall enable/disable event logging." +
-            "\n" +
-            "When event logging is enabled, all event messages are stored on the lock for retrieval. Logging " +
-            "events can be, but are not limited to, Tamper Alarm, Lock, Unlock, AutoRelock, User Code Added, " +
-            "User Code Cleared, Schedule Added, and Schedule Cleared. For a full detail of all the possible " +
-            "alarms and events, please refer to the full list in the Alarm and Event Masks Attribute Set.",
-
-        xref: { document: "cluster", section: "5.2.9.22" }
+        xref: { document: "cluster", section: "5.2.9.19" }
     }),
 
     Attribute({
@@ -346,14 +336,14 @@ export const DoorLock = Cluster(
         constraint: "max 3", quality: "P",
         details: "Indicates the language for the on-screen or audible user interface using a 2- byte language code " +
             "from ISO-639-1.",
-        xref: { document: "cluster", section: "5.2.9.23" }
+        xref: { document: "cluster", section: "5.2.9.20" }
     }),
 
     Attribute({
         name: "LedSettings", id: 0x22, type: "LEDSettingEnum", access: "R[W] VM", conformance: "O",
         default: 0, quality: "P",
         details: "Indicates the settings for the LED support, as defined by LEDSettingEnum.",
-        xref: { document: "cluster", section: "5.2.9.24" }
+        xref: { document: "cluster", section: "5.2.9.21" }
     }),
 
     Attribute({
@@ -361,21 +351,21 @@ export const DoorLock = Cluster(
         details: "Indicates the number of seconds to wait after unlocking a lock before it automatically locks again. " +
             "0=disabled. If set, unlock operations from any source will be timed. For one time unlock with " +
             "timeout use the specific command.",
-        xref: { document: "cluster", section: "5.2.9.25" }
+        xref: { document: "cluster", section: "5.2.9.22" }
     }),
 
     Attribute({
         name: "SoundVolume", id: 0x24, type: "SoundVolumeEnum", access: "R[W] VM", conformance: "O",
         default: 0, quality: "P",
         details: "Indicates the sound volume on a door lock as defined by SoundVolumeEnum.",
-        xref: { document: "cluster", section: "5.2.9.26" }
+        xref: { document: "cluster", section: "5.2.9.23" }
     }),
 
     Attribute({
         name: "OperatingMode", id: 0x25, type: "OperatingModeEnum", access: "R[W] VM", conformance: "M",
         constraint: "desc", default: 0, quality: "P",
         details: "Indicates the current operating mode of the lock as defined in OperatingModeEnum.",
-        xref: { document: "cluster", section: "5.2.9.27" }
+        xref: { document: "cluster", section: "5.2.9.24" }
     }),
 
     Attribute({
@@ -384,7 +374,7 @@ export const DoorLock = Cluster(
         details: "This attribute shall contain a bitmap with all operating bits of the OperatingMode attribute " +
             "supported by the lock. All operating modes NOT supported by a lock shall be set to one. The value " +
             "of the OperatingMode enumeration defines the related bit to be set.",
-        xref: { document: "cluster", section: "5.2.9.28" }
+        xref: { document: "cluster", section: "5.2.9.25" }
     }),
 
     Attribute({
@@ -392,8 +382,10 @@ export const DoorLock = Cluster(
         conformance: "O", default: 0, quality: "P",
 
         details: "Indicates the default configurations as they are physically set on the device (example: hardware " +
-            "dip switch setting, etc…) and represents the default setting for some of the attributes within this " +
-            "cluster (for example: LED, Auto Lock, Sound Volume, and Operating Mode attributes)." +
+            "dip switch setting, etc…) and represents the default setting for some of the" +
+            "\n" +
+            "attributes within this cluster (for example: LED, Auto Lock, Sound Volume, and Operating Mode " +
+            "attributes)." +
             "\n" +
             "This is a read-only attribute and is intended to allow clients to determine what changes may need " +
             "to be made without having to query all the included attributes. It may be beneficial for the " +
@@ -407,7 +399,7 @@ export const DoorLock = Cluster(
             "the current Sound Volume is High Volume. Therefore, if the client wants to query/modify the current " +
             "Sound Volume setting on the server, the client SHOULD read/write to the Sound Volume attribute.",
 
-        xref: { document: "cluster", section: "5.2.9.29" }
+        xref: { document: "cluster", section: "5.2.9.26" }
     }),
 
     Attribute({
@@ -418,7 +410,7 @@ export const DoorLock = Cluster(
             "on the door lock for all features. If it is set to FALSE then local programming is disabled on the " +
             "door lock for those features whose bit is set to 0 in the LocalProgrammingFeatures attribute. Local " +
             "programming shall be enabled by default.",
-        xref: { document: "cluster", section: "5.2.9.30" }
+        xref: { document: "cluster", section: "5.2.9.27" }
     }),
 
     Attribute({
@@ -426,7 +418,7 @@ export const DoorLock = Cluster(
         default: true, quality: "P",
         details: "This attribute shall enable/disable the ability to lock the door lock with a single touch on the " +
             "door lock.",
-        xref: { document: "cluster", section: "5.2.9.31" }
+        xref: { document: "cluster", section: "5.2.9.28" }
     }),
 
     Attribute({
@@ -434,7 +426,7 @@ export const DoorLock = Cluster(
         default: true, quality: "P",
         details: "This attribute shall enable/disable an inside LED that allows the user to see at a glance if the " +
             "door is locked.",
-        xref: { document: "cluster", section: "5.2.9.32" }
+        xref: { document: "cluster", section: "5.2.9.29" }
     }),
 
     Attribute({
@@ -442,7 +434,7 @@ export const DoorLock = Cluster(
         default: true, quality: "P",
         details: "This attribute shall enable/disable a button inside the door that is used to put the lock into " +
             "privacy mode. When the lock is in privacy mode it cannot be manipulated from the outside.",
-        xref: { document: "cluster", section: "5.2.9.33" }
+        xref: { document: "cluster", section: "5.2.9.30" }
     }),
 
     Attribute({
@@ -458,7 +450,7 @@ export const DoorLock = Cluster(
             "The features that can be disabled from local programming are defined in " +
             "LocalProgrammingFeaturesBitmap.",
 
-        xref: { document: "cluster", section: "5.2.9.34" }
+        xref: { document: "cluster", section: "5.2.9.31" }
     }),
 
     Attribute({
@@ -476,7 +468,7 @@ export const DoorLock = Cluster(
             "internal logic, environmental events, or other reasons. The lock shall reset the counter if a valid " +
             "credential is presented.",
 
-        xref: { document: "cluster", section: "5.2.9.35" }
+        xref: { document: "cluster", section: "5.2.9.32" }
     }),
 
     Attribute({
@@ -486,7 +478,7 @@ export const DoorLock = Cluster(
             "1-255 seconds. Device can shut down to lock user out for specified amount of time. (Makes it " +
             "difficult to try and guess a PIN for the device.) If the attribute accepts writes and an attempt to " +
             "write the attribute to 0 is made, the device shall respond with CONSTRAINT_ERROR.",
-        xref: { document: "cluster", section: "5.2.9.36" }
+        xref: { document: "cluster", section: "5.2.9.33" }
     }),
 
     Attribute({
@@ -498,12 +490,13 @@ export const DoorLock = Cluster(
             "server’s TX operation. If it is false, then it is not ok for the device to send PIN in any messages " +
             "over the air." +
             "\n" +
-            "The PIN field within any door lock cluster message shall keep the first octet unchanged and masks " +
-            "the actual code by replacing with 0xFF. For example (PIN \"1234\" ): If the attribute value is True, " +
-            "0x04 0x31 0x32 0x33 0x34 shall be used in the PIN field in any door lock cluster message payload. " +
-            "If the attribute value is False, 0x04 0xFF 0xFF 0xFF 0xFF shall be used.",
+            "The PIN field within any door lock cluster message shall keep the first octet unchanged and" +
+            "\n" +
+            "masks the actual code by replacing with 0xFF. For example (PIN \"1234\" ): If the attribute value is " +
+            "True, 0x04 0x31 0x32 0x33 0x34 shall be used in the PIN field in any door lock cluster message " +
+            "payload. If the attribute value is False, 0x04 0xFF 0xFF 0xFF 0xFF shall be used.",
 
-        xref: { document: "cluster", section: "5.2.9.37" }
+        xref: { document: "cluster", section: "5.2.9.34" }
     }),
 
     Attribute({
@@ -512,11 +505,11 @@ export const DoorLock = Cluster(
         details: "Indicates if the door lock requires an optional PIN. If this attribute is set to True, the door " +
             "lock server requires that an optional PINs be included in the payload of remote lock operation " +
             "events like Lock, Unlock, Unlock with Timeout and Toggle in order to function.",
-        xref: { document: "cluster", section: "5.2.9.38" }
+        xref: { document: "cluster", section: "5.2.9.35" }
     }),
 
     Attribute({
-        name: "SecurityLevel", id: 0x34, conformance: "D", default: "0",
+        name: "SecurityLevel", id: 0x34, access: "R V", conformance: "D", default: "0",
         xref: { document: "cluster", section: "5.2.9" }
     }),
 
@@ -527,7 +520,7 @@ export const DoorLock = Cluster(
             "user of type ExpiringUser shall remain valid after its first use before expiring. When the " +
             "credential expires the UserStatus for the corresponding user record shall be set to " +
             "OccupiedDisabled.",
-        xref: { document: "cluster", section: "5.2.9.39" }
+        xref: { document: "cluster", section: "5.2.9.36" }
     }),
 
     Attribute({
@@ -541,109 +534,100 @@ export const DoorLock = Cluster(
             "\n" +
             "This mask DOES NOT apply to the Events mechanism of this cluster.",
 
-        xref: { document: "cluster", section: "5.2.9.40" }
-    }),
-
-    Attribute({
-        name: "KeypadOperationEventMask", id: 0x41, type: "EventMaskBitmap", access: "RW VA",
-        conformance: "[NOT & PIN]", default: 65535, quality: "P",
-        details: "Event mask used to turn on and off the transmission of keypad operation events. This mask DOES NOT " +
-            "apply to the storing of events in the event log. This mask only applies to the Operation Event " +
-            "Notification Command." +
-            "\n" +
-            "This mask DOES NOT apply to the Events mechanism of this cluster.",
-        xref: { document: "cluster", section: "5.2.9.41" }
+        xref: { document: "cluster", section: "5.2.9.37" }
     }),
 
     Attribute({
-        name: "RemoteOperationEventMask", id: 0x42, type: "EventMaskBitmap", access: "RW VA",
-        conformance: "[NOT]", default: 65535, quality: "P",
-        details: "Event mask used to turn on and off the transmission of remote operation events. This mask DOES NOT " +
-            "apply to the storing of events in the event log. This mask only applies to the Operation Event " +
-            "Notification Command." +
+        name: "AliroReaderVerificationKey", id: 0x80, type: "octstr", access: "R A", conformance: "ALIRO",
+        constraint: "65", default: null, quality: "X",
+        details: "Indicates the verification key component of the Reader’s key pair as defined in [Aliro]. The value, " +
+            "if not null, shall be an uncompressed elliptic curve public key as defined in section 2.3.3 of SEC " +
+            "1." +
             "\n" +
-            "This mask DOES NOT apply to the Events mechanism of this cluster.",
-        xref: { document: "cluster", section: "5.2.9.42" }
+            "Null if no Reader key pair has been configured on the lock. See SetAliroReaderConfig.",
+        xref: { document: "cluster", section: "5.2.9.38" }
     }),
 
     Attribute({
-        name: "ManualOperationEventMask", id: 0x43, type: "EventMaskBitmap", access: "RW VA",
-        conformance: "[NOT]", default: 65535, quality: "P",
-        details: "Event mask used to turn on and off manual operation events. This mask DOES NOT apply to the storing " +
-            "of events in the event log. This mask only applies to the Operation Event Notification Command." +
+        name: "AliroReaderGroupIdentifier", id: 0x81, type: "octstr", access: "R A", conformance: "ALIRO",
+        constraint: "16", default: null, quality: "X",
+        details: "Indicates the reader_group_identifier as defined in [Aliro]." +
             "\n" +
-            "This mask DOES NOT apply to the Events mechanism of this cluster.",
-        xref: { document: "cluster", section: "5.2.9.43" }
+            "Null if no reader_group_identifier has been configured on the lock. See SetAliroReaderConfig.",
+        xref: { document: "cluster", section: "5.2.9.39" }
     }),
 
     Attribute({
-        name: "RfidOperationEventMask", id: 0x44, type: "EventMaskBitmap", access: "RW VA",
-        conformance: "[NOT & RID]", default: 65535, quality: "P",
-        details: "Event mask used to turn on and off RFID operation events. This mask DOES NOT apply to the storing " +
-            "of events in the event log. This mask only applies to the Operation Event Notification Command." +
-            "\n" +
-            "This mask DOES NOT apply to the Events mechanism of this cluster.",
-        xref: { document: "cluster", section: "5.2.9.44" }
+        name: "AliroReaderGroupSubIdentifier", id: 0x82, type: "octstr", access: "R A",
+        conformance: "ALIRO", constraint: "16", quality: "F",
+        details: "Indicates the reader_group_sub_identifier as defined in [Aliro].",
+        xref: { document: "cluster", section: "5.2.9.40" }
     }),
 
     Attribute(
         {
-            name: "KeypadProgrammingEventMask", id: 0x45, type: "EventMaskBitmap", access: "RW VA",
-            conformance: "[NOT & PIN]", default: 65535, quality: "P",
-            details: "Event mask used to turn on and off keypad programming events. This mask DOES NOT apply to the " +
-                "storing of events in the event log. This mask only applies to the Programming Event Notification " +
-                "Command." +
-                "\n" +
-                "This mask DOES NOT apply to the Events mechanism of this cluster.",
-            xref: { document: "cluster", section: "5.2.9.45" }
+            name: "AliroExpeditedTransactionSupportedProtocolVersions", id: 0x83, type: "list", access: "R A",
+            conformance: "ALIRO", constraint: "max 16[2]", default: [], quality: "F",
+            details: "Indicates the list of protocol versions supported for expedited transactions as defined in [Aliro].",
+            xref: { document: "cluster", section: "5.2.9.41" }
         },
 
-        Field({ name: "Unknown", constraint: "0" }),
-        Field({ name: "PinCodeChanged", constraint: "1" }),
-        Field({ name: "PinAdded", constraint: "2" }),
-        Field({ name: "PinCleared", constraint: "3" }),
-        Field({ name: "PinChanged", constraint: "4" })
+        Field({ name: "entry", type: "octstr" })
     ),
 
+    Attribute({
+        name: "AliroGroupResolvingKey", id: 0x84, type: "octstr", access: "R A", conformance: "ALBU",
+        constraint: "16", default: null, quality: "X",
+        details: "Indicates the Group Resolving Key as defined in [Aliro]." +
+            "\n" +
+            "Null if no group resolving key has been configured on the lock. See SetAliroReaderConfig.",
+        xref: { document: "cluster", section: "5.2.9.42" }
+    }),
+
     Attribute(
         {
-            name: "RemoteProgrammingEventMask", id: 0x46, type: "EventMaskBitmap", access: "RW VA",
-            conformance: "[NOT]", default: 65535, quality: "P",
-            details: "Event mask used to turn on and off remote programming events. This mask DOES NOT apply to the " +
-                "storing of events in the event log. This mask only applies to the Programming Event Notification " +
-                "Command." +
-                "\n" +
-                "This mask DOES NOT apply to the Events mechanism of this cluster.",
-            xref: { document: "cluster", section: "5.2.9.46" }
+            name: "AliroSupportedBleuwbProtocolVersions", id: 0x85, type: "list", access: "R A",
+            conformance: "ALBU", constraint: "max 16[2]", default: [], quality: "F",
+            details: "Indicates the list of protocol versions supported for the Bluetooth LE + UWB Access Control Flow as " +
+                "defined in [Aliro].",
+            xref: { document: "cluster", section: "5.2.9.43" }
         },
 
-        Field({ name: "Unknown", constraint: "0" }),
-        Field({ name: "PinAdded", constraint: "2" }),
-        Field({ name: "PinCleared", constraint: "3" }),
-        Field({ name: "PinChanged", constraint: "4" }),
-        Field({ name: "RfidCodeAdded", constraint: "5" }),
-        Field({ name: "RfidCodeCleared", constraint: "6" })
+        Field({ name: "entry", type: "octstr" })
     ),
 
-    Attribute(
-        {
-            name: "RfidProgrammingEventMask", id: 0x47, type: "EventMaskBitmap", access: "RW VA",
-            conformance: "[NOT & RID]", default: 65535, quality: "P",
+    Attribute({
+        name: "AliroBleAdvertisingVersion", id: 0x86, type: "uint8", access: "R A", conformance: "ALBU",
+        default: 0, quality: "F",
+        details: "Indicates the version of the Bluetooth LE advertisement as defined in [Aliro].",
+        xref: { document: "cluster", section: "5.2.9.44" }
+    }),
 
-            details: "Event mask used to turn on and off RFID programming events. This mask DOES NOT apply to the storing " +
-                "of events in the event log. This mask only applies to the Programming Event Notification Command." +
-                "\n" +
-                "This mask DOES NOT apply to the Events mechanism of this cluster." +
-                "\n" +
-                "This mask DOES NOT apply to the Events mechanism of this cluster.",
+    Attribute({
+        name: "NumberOfAliroCredentialIssuerKeysSupported", id: 0x87, type: "uint16", access: "R V",
+        conformance: "ALIRO", default: 0, quality: "F",
+        details: "Indicates the maximum number of AliroCredentialIssuerKey credentials that can be stored on the lock.",
+        xref: { document: "cluster", section: "5.2.9.45" }
+    }),
 
-            xref: { document: "cluster", section: "5.2.9.47" }
-        },
+    Attribute({
+        name: "NumberOfAliroEndpointKeysSupported", id: 0x88, type: "uint16", access: "R V",
+        conformance: "ALIRO", default: 0, quality: "F",
 
-        Field({ name: "Unknown", constraint: "0" }),
-        Field({ name: "IdAdded", constraint: "5" }),
-        Field({ name: "IdCleared", constraint: "6" })
-    ),
+        details: "Indicates the maximum number of endpoint key credentials that can be stored on the lock. This limit " +
+            "applies to the sum of the number of AliroEvictableEndpointKey credentials and the number of " +
+            "AliroNonEvictableEndpointKey credentials." +
+            "\n" +
+            "NOTE" +
+            "\n" +
+            "The credential indices used for these two credential types are independent of each other, similar " +
+            "to all other credential types. As long as NumberOfAliroEndpointKeysSupported is at least 2 a client " +
+            "could add a credential of type AliroEvictableEndpointKey at any index from 1 to " +
+            "NumberOfAliroEndpointKeysSupported and also add a credential of type AliroNonEvictableEndpointKey " +
+            "at the same index, and both credentials would exist on the server.",
+
+        xref: { document: "cluster", section: "5.2.9.46" }
+    }),
 
     Event(
         {
@@ -701,8 +685,9 @@ export const DoorLock = Cluster(
                 "    ◦ shall generate a LockOperation event of LockOperationType Unlatch when it is actuated from " +
                 "      the outside." +
                 "\n" +
-                "    ◦ may generate a LockOperation event of LockOperationType Unlatch when it is actuated from the " +
-                "      inside.",
+                "    ◦ may generate a LockOperation event of LockOperationType Unlatch when it is actuated" +
+                "\n" +
+                "from the inside.",
 
             xref: { document: "cluster", section: "5.2.11.3" }
         },
@@ -837,7 +822,7 @@ export const DoorLock = Cluster(
 
         Field({
             name: "OperationSource", id: 0x2, type: "OperationSourceEnum", conformance: "M",
-            constraint: "unspecified, keypad, remote",
+            constraint: "aliro, unspecified, keypad, remote",
             details: "This field shall indicate the source of the user data change.",
             xref: { document: "cluster", section: "5.2.11.5.3" }
         }),
@@ -883,9 +868,7 @@ export const DoorLock = Cluster(
             response: "status",
             details: "This command causes the lock device to lock the door. This command includes an optional code for " +
                 "the lock. The door lock may require a PIN depending on the value of the " +
-                "RequirePINForRemoteOperation attribute." +
-                "\n" +
-                "† The PIN/RFID Code is an obsolete field name, use PINCode instead.",
+                "RequirePINForRemoteOperation attribute.",
             xref: { document: "cluster", section: "5.2.10.1" }
         },
 
@@ -918,9 +901,7 @@ export const DoorLock = Cluster(
                 "NOTE" +
                 "\n" +
                 "If the attribute AutoRelockTime is supported the lock will transition to the locked state when the " +
-                "auto relock time has expired." +
-                "\n" +
-                "† The PIN/RFID Code is an obsolete field name, use PINCode instead.",
+                "auto relock time has expired.",
 
             xref: { document: "cluster", section: "5.2.10.2" }
         },
@@ -941,17 +922,11 @@ export const DoorLock = Cluster(
         {
             name: "UnlockWithTimeout", id: 0x3, access: "O T", conformance: "O", direction: "request",
             response: "status",
-
             details: "This command causes the lock device to unlock the door with a timeout parameter. After the time in " +
                 "seconds specified in the timeout field, the lock device will relock itself automatically. This " +
                 "timeout parameter is only temporary for this message transition and overrides the default relock " +
-                "time" +
-                "\n" +
-                "as specified in the AutoRelockTime attribute. If the door lock device is not capable of or does not " +
-                "want to support temporary Relock Timeout, it SHOULD NOT support this optional command." +
-                "\n" +
-                "† The PIN/RFID Code is an obsolete field name, use PINCode instead.",
-
+                "time as specified in the AutoRelockTime attribute. If the door lock device is not capable of or " +
+                "does not want to support temporary Relock Timeout, it SHOULD NOT support this optional command.",
             xref: { document: "cluster", section: "5.2.10.3" }
         },
 
@@ -969,81 +944,6 @@ export const DoorLock = Cluster(
         })
     ),
 
-    Command(
-        {
-            name: "GetLogRecord", id: 0x4, access: "M", conformance: "LOG", direction: "request",
-            response: "GetLogRecordResponse",
-            details: "Request a log record. Log number is between 1 – [Number of Log Records Supported attribute]. If log " +
-                "number 0 is requested then the most recent log entry is returned." +
-                "\n" +
-                "Log record format: The log record format is defined in the description of the GetLogRecordResponse " +
-                "command.",
-            xref: { document: "cluster", section: "5.2.10.4" }
-        },
-
-        Field({ name: "LogIndex", id: 0x0, type: "uint16", conformance: "M", constraint: "desc" })
-    ),
-
-    Command(
-        {
-            name: "GetLogRecordResponse", id: 0x4, conformance: "LOG", direction: "response",
-            details: "Returns the specified log record. If an invalid log entry ID was requested, it is set to 0 and the " +
-                "most recent log entry will be returned.",
-            xref: { document: "cluster", section: "5.2.10.5" }
-        },
-
-        Field({
-            name: "LogEntryId", id: 0x0, type: "uint16", conformance: "M", constraint: "desc",
-            details: "This field shall indicate the index into the log table where this log entry is stored. If the log " +
-                "entry requested is 0, the most recent log is returned with the appropriate log entry ID.",
-            xref: { document: "cluster", section: "5.2.10.5.1" }
-        }),
-
-        Field({
-            name: "Timestamp", id: 0x1, type: "epoch-s", conformance: "M",
-            details: "This field shall indicate the timestamp for all events and alarms on the door lock in Epoch Time in " +
-                "Seconds with local time offset based on the local timezone and DST offset on the day of the event.",
-            xref: { document: "cluster", section: "5.2.10.5.2" }
-        }),
-
-        Field({
-            name: "EventType", id: 0x2, type: "EventTypeEnum", conformance: "M",
-            details: "This field shall indicate the type of event that took place on the door lock, as defined in " +
-                "EventTypeEnum.",
-            xref: { document: "cluster", section: "5.2.10.5.3" }
-        }),
-
-        Field({
-            name: "Source", id: 0x3, type: "EventSourceEnum", conformance: "M",
-            details: "This field shall indicate the source value as defined in EventSourceEnum." +
-                "\n" +
-                "If the EventType is 2 (Alarm) then the source SHOULD be, but does not have to be 255 " +
-                "(Indeterminate).",
-            xref: { document: "cluster", section: "5.2.10.5.4" }
-        }),
-
-        Field({
-            name: "EventId", id: 0x4, type: "uint8", conformance: "M", constraint: "desc",
-            details: "This field shall indicate the type of event that took place on the door lock depending on the event " +
-                "code table provided for a given event type and source. See Operation Event Codes.",
-            xref: { document: "cluster", section: "5.2.10.5.5" }
-        }),
-
-        Field({
-            name: "UserId", id: 0x5, type: "uint16", conformance: "M", constraint: "desc",
-            details: "This field shall indicate the ID of the user who generated the event on the door lock if one is " +
-                "available. Otherwise, the value is 0xFFFF.",
-            xref: { document: "cluster", section: "5.2.10.5.6" }
-        }),
-
-        Field({
-            name: "Pin", id: 0x6, type: "octstr", conformance: "M",
-            details: "This field shall indicate the PIN code or RFID code that was used to create the event on the door " +
-                "lock if one is available.",
-            xref: { document: "cluster", section: "5.2.10.5.7" }
-        })
-    ),
-
     Command(
         {
             name: "SetPinCode", id: 0x5, access: "A T", conformance: "!USR & PIN", direction: "request",
@@ -1052,14 +952,14 @@ export const DoorLock = Cluster(
                 "\n" +
                 "Return status is a global status code or a cluster-specific status code from the Status Codes table " +
                 "and shall be one of the following values:",
-            xref: { document: "cluster", section: "5.2.10.6" }
+            xref: { document: "cluster", section: "5.2.10.4" }
         },
 
         Field({
             name: "UserId", id: 0x0, type: "uint16", conformance: "M", constraint: "desc",
             details: "This field shall indicate the user ID. The value of the UserID field shall be between 0 and the " +
                 "value of the NumberOfPINUsersSupported attribute.",
-            xref: { document: "cluster", section: "5.2.10.6.1" }
+            xref: { document: "cluster", section: "5.2.10.4.1" }
         }),
 
         Field({
@@ -1067,7 +967,7 @@ export const DoorLock = Cluster(
             default: 1, quality: "X",
             details: "This field shall indicate the user status. Only the values 1 (Occupied/Enabled) and 3 " +
                 "(Occupied/Disabled) are allowed for UserStatus.",
-            xref: { document: "cluster", section: "5.2.10.6.2" }
+            xref: { document: "cluster", section: "5.2.10.4.2" }
         }),
 
         Field({ name: "UserType", id: 0x2, type: "UserTypeEnum", conformance: "M", default: 0, quality: "X" }),
@@ -1079,14 +979,14 @@ export const DoorLock = Cluster(
             name: "GetPinCode", id: 0x6, access: "A", conformance: "!USR & PIN", direction: "request",
             response: "GetPinCodeResponse",
             details: "Retrieve a PIN Code.",
-            xref: { document: "cluster", section: "5.2.10.7" }
+            xref: { document: "cluster", section: "5.2.10.5" }
         },
 
         Field({
             name: "UserId", id: 0x0, type: "uint16", conformance: "M", constraint: "desc",
             details: "This field shall indicate the user ID. The value of the UserID field shall be between 0 and the " +
                 "value of the NumberOfPINUsersSupported attribute.",
-            xref: { document: "cluster", section: "5.2.10.7.1" }
+            xref: { document: "cluster", section: "5.2.10.5.1" }
         })
     ),
 
@@ -1106,7 +1006,7 @@ export const DoorLock = Cluster(
                 "shall be equal to CONSTRAINT_ERROR when User_ID is less than the max number of users supported, and " +
                 "NOT_FOUND if greater than or equal to the max number of users supported.",
 
-            xref: { document: "cluster", section: "5.2.10.8" }
+            xref: { document: "cluster", section: "5.2.10.6" }
         },
 
         Field({ name: "UserId", id: 0x0, type: "uint16", conformance: "M", constraint: "desc" }),
@@ -1122,16 +1022,12 @@ export const DoorLock = Cluster(
         {
             name: "ClearPinCode", id: 0x7, access: "A T", conformance: "!USR & PIN", direction: "request",
             response: "status",
-
             details: "Clear a PIN code or all PIN codes." +
-                "\n" +
-                "† The User ID is an obsolete field name, use PINSlotIndex instead." +
                 "\n" +
                 "For each PIN Code cleared whose user doesn’t have a RFID Code or other credential type, then " +
                 "corresponding user record’s UserStatus value shall be set to Available, and UserType value shall be " +
                 "set to UnrestrictedUser and all schedules shall be cleared.",
-
-            xref: { document: "cluster", section: "5.2.10.9" }
+            xref: { document: "cluster", section: "5.2.10.7" }
         },
 
         Field({
@@ -1139,7 +1035,7 @@ export const DoorLock = Cluster(
             constraint: "1 to numberOfPinUsersSupported, 65534",
             details: "This field shall specify a valid PIN code slot index or 0xFFFE to indicate all PIN code slots shall " +
                 "be cleared.",
-            xref: { document: "cluster", section: "5.2.10.9.1" }
+            xref: { document: "cluster", section: "5.2.10.7.1" }
         })
     ),
 
@@ -1154,7 +1050,7 @@ export const DoorLock = Cluster(
             "On the server, the clear all PIN codes command SHOULD have the same effect as the ClearPINCode " +
             "command with respect to the setting of user status, user type and schedules.",
 
-        xref: { document: "cluster", section: "5.2.10.10" }
+        xref: { document: "cluster", section: "5.2.10.8" }
     }),
 
     Command(
@@ -1162,21 +1058,21 @@ export const DoorLock = Cluster(
             name: "SetUserStatus", id: 0x9, access: "A", conformance: "!USR & (PIN | RID | FGP)",
             direction: "request", response: "status",
             details: "Set the status of a user ID.",
-            xref: { document: "cluster", section: "5.2.10.11" }
+            xref: { document: "cluster", section: "5.2.10.9" }
         },
 
         Field({
             name: "UserId", id: 0x0, type: "uint16", conformance: "M", constraint: "desc",
             details: "This field shall indicate the user ID. The value of the UserID field shall be between 0 and the " +
                 "value of the NumberOfPINUsersSupported attribute.",
-            xref: { document: "cluster", section: "5.2.10.11.1" }
+            xref: { document: "cluster", section: "5.2.10.9.1" }
         }),
 
         Field({
             name: "UserStatus", id: 0x1, type: "UserStatusEnum", conformance: "M", constraint: "desc",
             details: "UserStatus value of Available is not allowed. In order to clear a user id, the ClearUser Command " +
                 "shall be used. For user status value please refer to UserStatusEnum.",
-            xref: { document: "cluster", section: "5.2.10.11.2" }
+            xref: { document: "cluster", section: "5.2.10.9.2" }
         })
     ),
 
@@ -1185,14 +1081,14 @@ export const DoorLock = Cluster(
             name: "GetUserStatus", id: 0xa, access: "A", conformance: "!USR & (PIN | RID | FGP)",
             direction: "request", response: "GetUserStatusResponse",
             details: "Get the status of a user.",
-            xref: { document: "cluster", section: "5.2.10.12" }
+            xref: { document: "cluster", section: "5.2.10.10" }
         },
 
         Field({
             name: "UserId", id: 0x0, type: "uint16", conformance: "M", constraint: "desc",
             details: "This field shall indicate the user ID. The value of the UserID field shall be between 0 and the " +
                 "value of the NumberOfPINUsersSupported attribute.",
-            xref: { document: "cluster", section: "5.2.10.12.1" }
+            xref: { document: "cluster", section: "5.2.10.10.1" }
         })
     ),
 
@@ -1200,17 +1096,17 @@ export const DoorLock = Cluster(
         {
             name: "GetUserStatusResponse", id: 0xa, conformance: "!USR", direction: "response",
             details: "Returns the user status for the specified user ID.",
-            xref: { document: "cluster", section: "5.2.10.13" }
+            xref: { document: "cluster", section: "5.2.10.11" }
         },
         Field({
             name: "UserId", id: 0x0, type: "uint16", conformance: "M", constraint: "desc",
             details: "This field shall indicate the user ID provided in the request.",
-            xref: { document: "cluster", section: "5.2.10.13.1" }
+            xref: { document: "cluster", section: "5.2.10.11.1" }
         }),
         Field({
             name: "UserStatus", id: 0x1, type: "UserStatusEnum", conformance: "M",
             details: "This field shall indicate the current status of the requested user ID.",
-            xref: { document: "cluster", section: "5.2.10.13.2" }
+            xref: { document: "cluster", section: "5.2.10.11.2" }
         })
     ),
 
@@ -1220,60 +1116,60 @@ export const DoorLock = Cluster(
             response: "status",
 
             details: "Set a weekly repeating schedule for a specified user." +
-                "\n" +
-                "† The Schedule ID and User ID are obsolete field names, use WeekDayIndex and UserIndex instead, " +
-                "respectively." +
                 "\n" +
                 "The associated UserType may be changed to ScheduleRestrictedUser by the lock when a Week Day " +
                 "schedule is set." +
                 "\n" +
                 "Return status shall be one of the following values:",
 
-            xref: { document: "cluster", section: "5.2.10.14" }
+            xref: { document: "cluster", section: "5.2.10.12" }
         },
 
         Field({
             name: "WeekDayIndex", id: 0x0, type: "uint8", conformance: "M",
             constraint: "1 to numberOfWeekDaySchedulesSupportedPerUser",
             details: "This field shall indicate the index of the Week Day schedule.",
-            xref: { document: "cluster", section: "5.2.10.14.1" }
+            xref: { document: "cluster", section: "5.2.10.12.1" }
         }),
 
         Field({
-            name: "UserIndexUserId", id: 0x1, type: "uint16", conformance: "M",
-            constraint: "1 to numberOfTotalUsersSupported"
+            name: "UserIndex", id: 0x1, type: "uint16", conformance: "M",
+            constraint: "1 to numberOfTotalUsersSupported",
+            details: "This field shall indicate the user ID.",
+            xref: { document: "cluster", section: "5.2.10.12.2" }
         }),
+
         Field({
             name: "DaysMask", id: 0x2, type: "DaysMaskBitmap", conformance: "M",
             details: "This field shall indicate which week days the schedule is active.",
-            xref: { document: "cluster", section: "5.2.10.14.3" }
+            xref: { document: "cluster", section: "5.2.10.12.3" }
         }),
         Field({
-            name: "StartHour", id: 0x3, type: "uint8", conformance: "M", constraint: "0 to 23",
+            name: "StartHour", id: 0x3, type: "uint8", conformance: "M", constraint: "max 23",
             details: "This field shall indicate the starting hour for the Week Day schedule.",
-            xref: { document: "cluster", section: "5.2.10.14.4" }
+            xref: { document: "cluster", section: "5.2.10.12.4" }
         }),
         Field({
-            name: "StartMinute", id: 0x4, type: "uint8", conformance: "M", constraint: "0 to 59",
+            name: "StartMinute", id: 0x4, type: "uint8", conformance: "M", constraint: "max 59",
             details: "This field shall indicate the starting minute for the Week Day schedule.",
-            xref: { document: "cluster", section: "5.2.10.14.5" }
+            xref: { document: "cluster", section: "5.2.10.12.5" }
         }),
 
         Field({
-            name: "EndHour", id: 0x5, type: "uint8", conformance: "M", constraint: "0 to 23",
+            name: "EndHour", id: 0x5, type: "uint8", conformance: "M", constraint: "max 23",
             details: "This field shall indicate the ending hour for the Week Day schedule. EndHour shall be equal to or " +
                 "greater than StartHour.",
-            xref: { document: "cluster", section: "5.2.10.14.6" }
+            xref: { document: "cluster", section: "5.2.10.12.6" }
         }),
 
         Field({
-            name: "EndMinute", id: 0x6, type: "uint8", conformance: "M", constraint: "0 to 59",
+            name: "EndMinute", id: 0x6, type: "uint8", conformance: "M", constraint: "max 59",
             details: "This field shall indicate the ending minute for the Week Day schedule. If EndHour is equal to " +
                 "StartHour then EndMinute shall be greater than StartMinute." +
                 "\n" +
                 "If the EndHour is equal to 23 and the EndMinute is equal to 59 the Lock shall grant access to the " +
                 "user up until 23:59:59.",
-            xref: { document: "cluster", section: "5.2.10.14.7" }
+            xref: { document: "cluster", section: "5.2.10.12.7" }
         })
     ),
 
@@ -1281,11 +1177,8 @@ export const DoorLock = Cluster(
         {
             name: "GetWeekDaySchedule", id: 0xc, access: "A", conformance: "WDSCH", direction: "request",
             response: "GetWeekDayScheduleResponse",
-            details: "Retrieve the specific weekly schedule for the specific user." +
-                "\n" +
-                "† The Schedule ID and User ID are obsolete field names, use WeekDayIndex and UserIndex instead, " +
-                "respectively.",
-            xref: { document: "cluster", section: "5.2.10.15" }
+            details: "Retrieve the specific weekly schedule for the specific user.",
+            xref: { document: "cluster", section: "5.2.10.13" }
         },
 
         Field({
@@ -1293,7 +1186,7 @@ export const DoorLock = Cluster(
             constraint: "1 to numberOfWeekDaySchedulesSupportedPerUser"
         }),
         Field({
-            name: "UserIndexUserId", id: 0x1, type: "uint16", conformance: "M",
+            name: "UserIndex", id: 0x1, type: "uint16", conformance: "M",
             constraint: "1 to numberOfTotalUsersSupported"
         })
     ),
@@ -1301,23 +1194,22 @@ export const DoorLock = Cluster(
     Command(
         {
             name: "GetWeekDayScheduleResponse", id: 0xc, conformance: "WDSCH", direction: "response",
-            details: "Returns the weekly repeating schedule data for the specified schedule index." +
-                "\n" +
-                "† The Schedule ID and User ID are obsolete field names, use WeekDayIndex and UserIndex instead, " +
-                "respectively.",
-            xref: { document: "cluster", section: "5.2.10.16" }
+            details: "Returns the weekly repeating schedule data for the specified schedule index.",
+            xref: { document: "cluster", section: "5.2.10.14" }
         },
 
         Field({
             name: "WeekDayIndex", id: 0x0, type: "uint8", conformance: "M",
             constraint: "1 to numberOfWeekDaySchedulesSupportedPerUser",
             details: "This field shall indicate the index of the Week Day schedule.",
-            xref: { document: "cluster", section: "5.2.10.16.1" }
+            xref: { document: "cluster", section: "5.2.10.14.1" }
         }),
 
         Field({
-            name: "UserIndexUserId", id: 0x1, type: "uint16", conformance: "M",
-            constraint: "1 to numberOfTotalUsersSupported"
+            name: "UserIndex", id: 0x1, type: "uint16", conformance: "M",
+            constraint: "1 to numberOfTotalUsersSupported",
+            details: "This field shall indicate the user ID.",
+            xref: { document: "cluster", section: "5.2.10.14.2" }
         }),
 
         Field({
@@ -1337,33 +1229,33 @@ export const DoorLock = Cluster(
                 "If this field is SUCCESS, the optional fields for this command shall be present. For other (error) " +
                 "status values, only the fields up to the status field shall be present.",
 
-            xref: { document: "cluster", section: "5.2.10.16.3" }
+            xref: { document: "cluster", section: "5.2.10.14.3" }
         }),
 
         Field({ name: "DaysMask", id: 0x3, type: "DaysMaskBitmap", conformance: "O" }),
         Field({
-            name: "StartHour", id: 0x4, type: "uint8", conformance: "O", constraint: "0 to 23",
+            name: "StartHour", id: 0x4, type: "uint8", conformance: "O", constraint: "max 23",
             details: "This field shall indicate the starting hour for the Week Day schedule.",
-            xref: { document: "cluster", section: "5.2.10.16.4" }
+            xref: { document: "cluster", section: "5.2.10.14.4" }
         }),
         Field({
-            name: "StartMinute", id: 0x5, type: "uint8", conformance: "O", constraint: "0 to 59",
+            name: "StartMinute", id: 0x5, type: "uint8", conformance: "O", constraint: "max 59",
             details: "This field shall indicate the starting minute for the Week Day schedule.",
-            xref: { document: "cluster", section: "5.2.10.16.5" }
+            xref: { document: "cluster", section: "5.2.10.14.5" }
         }),
 
         Field({
-            name: "EndHour", id: 0x6, type: "uint8", conformance: "O", constraint: "0 to 23",
+            name: "EndHour", id: 0x6, type: "uint8", conformance: "O", constraint: "max 23",
             details: "This field shall indicate the ending hour for the Week Day schedule. EndHour shall be equal to or " +
                 "greater than StartHour.",
-            xref: { document: "cluster", section: "5.2.10.16.6" }
+            xref: { document: "cluster", section: "5.2.10.14.6" }
         }),
 
         Field({
-            name: "EndMinute", id: 0x7, type: "uint8", conformance: "O", constraint: "0 to 59",
+            name: "EndMinute", id: 0x7, type: "uint8", conformance: "O", constraint: "max 59",
             details: "This field shall indicate the ending minute for the Week Day schedule. If EndHour is equal to " +
                 "StartHour then EndMinute shall be greater than StartMinute.",
-            xref: { document: "cluster", section: "5.2.10.16.7" }
+            xref: { document: "cluster", section: "5.2.10.14.7" }
         })
     ),
 
@@ -1371,15 +1263,10 @@ export const DoorLock = Cluster(
         {
             name: "ClearWeekDaySchedule", id: 0xd, access: "A", conformance: "WDSCH", direction: "request",
             response: "status",
-
             details: "Clear the specific weekly schedule or all weekly schedules for the specific user." +
-                "\n" +
-                "† The Schedule ID and User ID are obsolete field names, use WeekDayIndex and UserIndex instead, " +
-                "respectively." +
                 "\n" +
                 "Return status shall be one of the following values:",
-
-            xref: { document: "cluster", section: "5.2.10.17" }
+            xref: { document: "cluster", section: "5.2.10.15" }
         },
 
         Field({
@@ -1387,12 +1274,14 @@ export const DoorLock = Cluster(
             constraint: "1 to numberOfWeekDaySchedulesSupportedPerUser, 254",
             details: "This field shall indicate the Week Day schedule index to clear or 0xFE to clear all Week Day " +
                 "schedules for the specified user.",
-            xref: { document: "cluster", section: "5.2.10.17.1" }
+            xref: { document: "cluster", section: "5.2.10.15.1" }
         }),
 
         Field({
-            name: "UserIndexUserId", id: 0x1, type: "uint16", conformance: "M",
-            constraint: "1 to numberOfTotalUsersSupported"
+            name: "UserIndex", id: 0x1, type: "uint16", conformance: "M",
+            constraint: "1 to numberOfTotalUsersSupported",
+            details: "This field shall indicate the user ID.",
+            xref: { document: "cluster", section: "5.2.10.15.2" }
         })
     ),
 
@@ -1402,35 +1291,34 @@ export const DoorLock = Cluster(
             response: "status",
 
             details: "Set a time-specific schedule ID for a specified user." +
-                "\n" +
-                "† The Schedule ID and User ID are obsolete field names, use YearDayIndex and UserIndex instead, " +
-                "respectively." +
                 "\n" +
                 "The associated UserType may be changed to ScheduleRestrictedUser by the lock when a Year Day " +
                 "schedule is set." +
                 "\n" +
                 "Return status shall be one of the following values:",
 
-            xref: { document: "cluster", section: "5.2.10.18" }
+            xref: { document: "cluster", section: "5.2.10.16" }
         },
 
         Field({
             name: "YearDayIndex", id: 0x0, type: "uint8", conformance: "M",
             constraint: "1 to numberOfYearDaySchedulesSupportedPerUser",
             details: "This field shall indicate the index of the Year Day schedule.",
-            xref: { document: "cluster", section: "5.2.10.18.1" }
+            xref: { document: "cluster", section: "5.2.10.16.1" }
         }),
 
         Field({
-            name: "UserIndexUserId", id: 0x1, type: "uint16", conformance: "M",
-            constraint: "1 to numberOfTotalUsersSupported"
+            name: "UserIndex", id: 0x1, type: "uint16", conformance: "M",
+            constraint: "1 to numberOfTotalUsersSupported",
+            details: "This field shall indicate the user ID.",
+            xref: { document: "cluster", section: "5.2.10.16.2" }
         }),
 
         Field({
             name: "LocalStartTime", id: 0x2, type: "epoch-s", conformance: "M",
             details: "This field shall indicate the starting time for the Year Day schedule in Epoch Time in Seconds with " +
                 "local time offset based on the local timezone and DST offset on the day represented by the value.",
-            xref: { document: "cluster", section: "5.2.10.18.3" }
+            xref: { document: "cluster", section: "5.2.10.16.3" }
         }),
 
         Field({
@@ -1438,7 +1326,7 @@ export const DoorLock = Cluster(
             details: "This field shall indicate the ending time for the Year Day schedule in Epoch Time in Seconds with " +
                 "local time offset based on the local timezone and DST offset on the day represented by the value. " +
                 "LocalEndTime shall be greater than LocalStartTime.",
-            xref: { document: "cluster", section: "5.2.10.18.4" }
+            xref: { document: "cluster", section: "5.2.10.16.4" }
         })
     ),
 
@@ -1446,11 +1334,8 @@ export const DoorLock = Cluster(
         {
             name: "GetYearDaySchedule", id: 0xf, access: "A", conformance: "YDSCH", direction: "request",
             response: "GetYearDayScheduleResponse",
-            details: "Retrieve the specific year day schedule for the specific schedule and user indexes." +
-                "\n" +
-                "† The Schedule ID and User ID are obsolete field names, use YearDayIndex and UserIndex instead, " +
-                "respectively.",
-            xref: { document: "cluster", section: "5.2.10.19" }
+            details: "Retrieve the specific year day schedule for the specific schedule and user indexes.",
+            xref: { document: "cluster", section: "5.2.10.17" }
         },
 
         Field({
@@ -1458,7 +1343,7 @@ export const DoorLock = Cluster(
             constraint: "1 to numberOfYearDaySchedulesSupportedPerUser"
         }),
         Field({
-            name: "UserIndexUserId", id: 0x1, type: "uint16", conformance: "M",
+            name: "UserIndex", id: 0x1, type: "uint16", conformance: "M",
             constraint: "1 to numberOfTotalUsersSupported"
         })
     ),
@@ -1466,23 +1351,22 @@ export const DoorLock = Cluster(
     Command(
         {
             name: "GetYearDayScheduleResponse", id: 0xf, conformance: "YDSCH", direction: "response",
-            details: "Returns the year day schedule data for the specified schedule and user indexes." +
-                "\n" +
-                "† The Schedule ID and User ID are obsolete field names, use YearDayIndex and UserIndex instead, " +
-                "respectively.",
-            xref: { document: "cluster", section: "5.2.10.20" }
+            details: "Returns the year day schedule data for the specified schedule and user indexes.",
+            xref: { document: "cluster", section: "5.2.10.18" }
         },
 
         Field({
             name: "YearDayIndex", id: 0x0, type: "uint8", conformance: "M",
             constraint: "1 to numberOfYearDaySchedulesSupportedPerUser",
             details: "This field shall indicate the index of the Year Day schedule.",
-            xref: { document: "cluster", section: "5.2.10.20.1" }
+            xref: { document: "cluster", section: "5.2.10.18.1" }
         }),
 
         Field({
-            name: "UserIndexUserId", id: 0x1, type: "uint16", conformance: "M",
-            constraint: "1 to numberOfTotalUsersSupported"
+            name: "UserIndex", id: 0x1, type: "uint16", conformance: "M",
+            constraint: "1 to numberOfTotalUsersSupported",
+            details: "This field shall indicate the user ID.",
+            xref: { document: "cluster", section: "5.2.10.18.2" }
         }),
 
         Field({
@@ -1502,7 +1386,7 @@ export const DoorLock = Cluster(
                 "If this field is SUCCESS, the optional fields for this command shall be present. For other (error) " +
                 "status values, only the fields up to the status field shall be present.",
 
-            xref: { document: "cluster", section: "5.2.10.20.3" }
+            xref: { document: "cluster", section: "5.2.10.18.3" }
         }),
 
         Field({
@@ -1510,7 +1394,7 @@ export const DoorLock = Cluster(
             details: "This field shall indicate the starting time for the Year Day schedule in Epoch Time in Seconds with " +
                 "local time offset based on the local timezone and DST offset on the day represented by the value. " +
                 "This shall be null if the schedule is not set for the YearDayIndex and UserIndex provided.",
-            xref: { document: "cluster", section: "5.2.10.20.4" }
+            xref: { document: "cluster", section: "5.2.10.18.4" }
         }),
 
         Field({
@@ -1519,7 +1403,7 @@ export const DoorLock = Cluster(
                 "local time offset based on the local timezone and DST offset on the day represented by the value. " +
                 "LocalEndTime shall be greater than LocalStartTime. This shall be null if the schedule is not set " +
                 "for the YearDayIndex and UserIndex provided.",
-            xref: { document: "cluster", section: "5.2.10.20.5" }
+            xref: { document: "cluster", section: "5.2.10.18.5" }
         })
     ),
 
@@ -1527,15 +1411,10 @@ export const DoorLock = Cluster(
         {
             name: "ClearYearDaySchedule", id: 0x10, access: "A", conformance: "YDSCH", direction: "request",
             response: "status",
-
             details: "Clears the specific year day schedule or all year day schedules for the specific user." +
-                "\n" +
-                "† The Schedule ID and User ID are obsolete field names, use YearDayIndex and UserIndex instead, " +
-                "respectively." +
                 "\n" +
                 "Return status shall be one of the following values:",
-
-            xref: { document: "cluster", section: "5.2.10.21" }
+            xref: { document: "cluster", section: "5.2.10.19" }
         },
 
         Field({
@@ -1543,12 +1422,14 @@ export const DoorLock = Cluster(
             constraint: "1 to numberOfYearDaySchedulesSupportedPerUser, 254",
             details: "This field shall indicate the Year Day schedule index to clear or 0xFE to clear all Year Day " +
                 "schedules for the specified user.",
-            xref: { document: "cluster", section: "5.2.10.21.1" }
+            xref: { document: "cluster", section: "5.2.10.19.1" }
         }),
 
         Field({
-            name: "UserIndexUserId", id: 0x1, type: "uint16", conformance: "M",
-            constraint: "1 to numberOfTotalUsersSupported"
+            name: "UserIndex", id: 0x1, type: "uint16", conformance: "M",
+            constraint: "1 to numberOfTotalUsersSupported",
+            details: "This field shall indicate the user ID.",
+            xref: { document: "cluster", section: "5.2.10.19.2" }
         })
     ),
 
@@ -1559,16 +1440,15 @@ export const DoorLock = Cluster(
             details: "Set the holiday Schedule by specifying local start time and local end time with respect to any Lock " +
                 "Operating Mode." +
                 "\n" +
-                "† The Holiday Schedule ID is an obsolete field name, use HolidayIndex instead. Return status shall " +
-                "be one of the following values:",
-            xref: { document: "cluster", section: "5.2.10.22" }
+                "Return status shall be one of the following values:",
+            xref: { document: "cluster", section: "5.2.10.20" }
         },
 
         Field({
             name: "HolidayIndex", id: 0x0, type: "uint8", conformance: "M",
             constraint: "1 to numberOfHolidaySchedulesSupported",
             details: "This field shall indicate the index of the Holiday schedule.",
-            xref: { document: "cluster", section: "5.2.10.22.1" }
+            xref: { document: "cluster", section: "5.2.10.20.1" }
         }),
 
         Field({
@@ -1576,7 +1456,7 @@ export const DoorLock = Cluster(
             details: "This field shall indicate the starting time for the Holiday Day schedule in Epoch Time in Seconds " +
                 "with local time offset based on the local timezone and DST offset on the day represented by the " +
                 "value.",
-            xref: { document: "cluster", section: "5.2.10.22.2" }
+            xref: { document: "cluster", section: "5.2.10.20.2" }
         }),
 
         Field({
@@ -1584,13 +1464,13 @@ export const DoorLock = Cluster(
             details: "This field shall indicate the ending time for the Holiday Day schedule in Epoch Time in Seconds " +
                 "with local time offset based on the local timezone and DST offset on the day represented by the " +
                 "value. LocalEndTime shall be greater than LocalStartTime.",
-            xref: { document: "cluster", section: "5.2.10.22.3" }
+            xref: { document: "cluster", section: "5.2.10.20.3" }
         }),
 
         Field({
             name: "OperatingMode", id: 0x3, type: "OperatingModeEnum", conformance: "M",
             details: "This field shall indicate the operating mode to use during this Holiday schedule start/end time.",
-            xref: { document: "cluster", section: "5.2.10.22.4" }
+            xref: { document: "cluster", section: "5.2.10.20.4" }
         })
     ),
 
@@ -1598,10 +1478,8 @@ export const DoorLock = Cluster(
         {
             name: "GetHolidaySchedule", id: 0x12, access: "A", conformance: "HDSCH", direction: "request",
             response: "GetHolidayScheduleResponse",
-            details: "Get the holiday schedule for the specified index." +
-                "\n" +
-                "† The Holiday Schedule ID is an obsolete field name, use HolidayIndex instead.",
-            xref: { document: "cluster", section: "5.2.10.23" }
+            details: "Get the holiday schedule for the specified index.",
+            xref: { document: "cluster", section: "5.2.10.21" }
         },
 
         Field({
@@ -1613,17 +1491,15 @@ export const DoorLock = Cluster(
     Command(
         {
             name: "GetHolidayScheduleResponse", id: 0x12, conformance: "HDSCH", direction: "response",
-            details: "Returns the Holiday Schedule Entry for the specified Holiday ID." +
-                "\n" +
-                "† The Holiday Schedule ID is an obsolete field name, use HolidayIndex instead.",
-            xref: { document: "cluster", section: "5.2.10.24" }
+            details: "Returns the Holiday Schedule Entry for the specified Holiday ID.",
+            xref: { document: "cluster", section: "5.2.10.22" }
         },
 
         Field({
             name: "HolidayIndex", id: 0x0, type: "uint8", conformance: "M",
             constraint: "1 to numberOfHolidaySchedulesSupported",
             details: "This field shall indicate the index of the Holiday schedule.",
-            xref: { document: "cluster", section: "5.2.10.24.1" }
+            xref: { document: "cluster", section: "5.2.10.22.1" }
         }),
 
         Field({
@@ -1643,7 +1519,7 @@ export const DoorLock = Cluster(
                 "If this field is SUCCESS, the optional fields for this command shall be present. For other (error) " +
                 "status values, only the fields up to the status field shall be present.",
 
-            xref: { document: "cluster", section: "5.2.10.24.2" }
+            xref: { document: "cluster", section: "5.2.10.22.2" }
         }),
 
         Field({
@@ -1651,7 +1527,7 @@ export const DoorLock = Cluster(
             details: "This field shall indicate the starting time for the Holiday schedule in Epoch Time in Seconds with " +
                 "local time offset based on the local timezone and DST offset on the day represented by the value. " +
                 "This shall be null if the schedule is not set for the HolidayIndex provided.",
-            xref: { document: "cluster", section: "5.2.10.24.3" }
+            xref: { document: "cluster", section: "5.2.10.22.3" }
         }),
 
         Field({
@@ -1660,14 +1536,14 @@ export const DoorLock = Cluster(
                 "local time offset based on the local timezone and DST offset on the day represented by the value. " +
                 "LocalEndTime shall be greater than LocalStartTime. This shall be null if the schedule is not set " +
                 "for the HolidayIndex provided.",
-            xref: { document: "cluster", section: "5.2.10.24.4" }
+            xref: { document: "cluster", section: "5.2.10.22.4" }
         }),
 
         Field({
             name: "OperatingMode", id: 0x4, type: "OperatingModeEnum", conformance: "O", quality: "X",
             details: "This field shall indicate the operating mode to use during this Holiday schedule start/end time. " +
                 "This shall be null if the schedule is not set for the HolidayIndex provided.",
-            xref: { document: "cluster", section: "5.2.10.24.5" }
+            xref: { document: "cluster", section: "5.2.10.22.5" }
         })
     ),
 
@@ -1675,10 +1551,8 @@ export const DoorLock = Cluster(
         {
             name: "ClearHolidaySchedule", id: 0x13, access: "A", conformance: "HDSCH", direction: "request",
             response: "status",
-            details: "Clears the holiday schedule or all holiday schedules." +
-                "\n" +
-                "† The Holiday Schedule ID is an obsolete field name, use HolidayIndex instead.",
-            xref: { document: "cluster", section: "5.2.10.25" }
+            details: "Clears the holiday schedule or all holiday schedules.",
+            xref: { document: "cluster", section: "5.2.10.23" }
         },
 
         Field({
@@ -1686,7 +1560,7 @@ export const DoorLock = Cluster(
             constraint: "1 to numberOfHolidaySchedulesSupported, 254",
             details: "This field shall indicate the Holiday schedule index to clear or 0xFE to clear all Holiday " +
                 "schedules.",
-            xref: { document: "cluster", section: "5.2.10.25.1" }
+            xref: { document: "cluster", section: "5.2.10.23.1" }
         })
     ),
 
@@ -1699,27 +1573,18 @@ export const DoorLock = Cluster(
                 "For user type value please refer to User Type Value." +
                 "\n" +
                 "Return status shall be one of the following values:",
-            xref: { document: "cluster", section: "5.2.10.26" }
+            xref: { document: "cluster", section: "5.2.10.24" }
         },
 
         Field({
             name: "UserId", id: 0x0, type: "uint16", conformance: "M", constraint: "desc",
             details: "This field shall indicate the user ID.",
-            xref: { document: "cluster", section: "5.2.10.26.1" }
+            xref: { document: "cluster", section: "5.2.10.24.1" }
         }),
-
         Field({
             name: "UserType", id: 0x1, type: "UserTypeEnum", conformance: "M",
-
-            details: "This field shall indicate the user type." +
-                "\n" +
-                "If UserType is currently YearDayScheduleUser, WeekDayScheduleUser, or ScheduleRestrictedUser and " +
-                "the new UserType is UnrestrictedUser then all existing Year Day and/or Week Day schedules shall be " +
-                "ignored or disabled (if this transition is supported by the door lock). If UserType is " +
-                "ScheduleRestrictedUser and the new UserType is ScheduleRestrictedUser then all existing Year Day " +
-                "and/or Week Day schedules shall be applied or enabled.",
-
-            xref: { document: "cluster", section: "5.2.10.26.2" }
+            details: "This field shall indicate the user type.",
+            xref: { document: "cluster", section: "5.2.10.24.2" }
         })
     ),
 
@@ -1728,7 +1593,7 @@ export const DoorLock = Cluster(
             name: "GetUserType", id: 0x15, access: "A", conformance: "!USR & (PIN | RID | FGP)",
             direction: "request", response: "GetUserTypeResponse",
             details: "Retrieve the user type for a specific user.",
-            xref: { document: "cluster", section: "5.2.10.27" }
+            xref: { document: "cluster", section: "5.2.10.25" }
         },
 
         Field({ name: "UserId", id: 0x0, type: "uint16", conformance: "M", constraint: "desc" })
@@ -1739,7 +1604,7 @@ export const DoorLock = Cluster(
             name: "GetUserTypeResponse", id: 0x15, conformance: "!USR", direction: "response",
             details: "Returns the user type for the specified user ID. If the requested User ID is invalid, send Default " +
                 "Response with an error status equal to FAILURE.",
-            xref: { document: "cluster", section: "5.2.10.28" }
+            xref: { document: "cluster", section: "5.2.10.26" }
         },
 
         Field({ name: "UserId", id: 0x0, type: "uint16", conformance: "M", constraint: "desc" }),
@@ -1754,7 +1619,7 @@ export const DoorLock = Cluster(
                 "\n" +
                 "Return status is a global status code or a cluster-specific status code from the Status Codes table " +
                 "and shall be one of the following values:",
-            xref: { document: "cluster", section: "5.2.10.29" }
+            xref: { document: "cluster", section: "5.2.10.27" }
         },
 
         Field({
@@ -1763,7 +1628,7 @@ export const DoorLock = Cluster(
                 "\n" +
                 "The value of the UserID field shall be between 0 and the value of the NumberOfRFIDUsersSupported " +
                 "attribute.",
-            xref: { document: "cluster", section: "5.2.10.29.1" }
+            xref: { document: "cluster", section: "5.2.10.27.1" }
         }),
 
         Field({
@@ -1773,14 +1638,14 @@ export const DoorLock = Cluster(
                 "“Set PIN” while not all are supported." +
                 "\n" +
                 "Only the values 1 (Occupied/Enabled) and 3 (Occupied/Disabled) are allowed for UserStatus.",
-            xref: { document: "cluster", section: "5.2.10.29.2" }
+            xref: { document: "cluster", section: "5.2.10.27.2" }
         }),
 
         Field({
             name: "UserType", id: 0x2, type: "UserTypeEnum", conformance: "M", constraint: "desc", default: 0,
             quality: "X",
             details: "The values are the same as used for SetPINCode command.",
-            xref: { document: "cluster", section: "5.2.10.29.3" }
+            xref: { document: "cluster", section: "5.2.10.27.3" }
         }),
 
         Field({ name: "RfidCode", id: 0x3, type: "octstr", conformance: "M" })
@@ -1791,7 +1656,7 @@ export const DoorLock = Cluster(
             name: "GetRfidCode", id: 0x17, access: "A", conformance: "!USR & RID", direction: "request",
             response: "GetRfidCodeResponse",
             details: "Retrieve an RFID code.",
-            xref: { document: "cluster", section: "5.2.10.30" }
+            xref: { document: "cluster", section: "5.2.10.28" }
         },
 
         Field({
@@ -1800,7 +1665,7 @@ export const DoorLock = Cluster(
                 "\n" +
                 "The value of the UserID field shall be between 0 and the value of the NumberOfRFIDUsersSupported " +
                 "attribute.",
-            xref: { document: "cluster", section: "5.2.10.30.1" }
+            xref: { document: "cluster", section: "5.2.10.28.1" }
         })
     ),
 
@@ -1820,7 +1685,7 @@ export const DoorLock = Cluster(
                 "be equal to CONSTRAINT_ERROR when User_ID is less than the max number of users supported, and " +
                 "NOT_FOUND if greater than or equal to the max number of users supported.",
 
-            xref: { document: "cluster", section: "5.2.10.31" }
+            xref: { document: "cluster", section: "5.2.10.29" }
         },
 
         Field({ name: "UserId", id: 0x0, type: "uint16", conformance: "M", constraint: "desc" }),
@@ -1836,16 +1701,12 @@ export const DoorLock = Cluster(
         {
             name: "ClearRfidCode", id: 0x18, access: "A T", conformance: "!USR & RID", direction: "request",
             response: "status",
-
             details: "Clear an RFID code or all RFID codes." +
-                "\n" +
-                "† The User ID is an obsolete field name, use RFIDSlotIndex instead." +
                 "\n" +
                 "For each RFID Code cleared whose user doesn’t have a PIN Code or other credential type, then the " +
                 "corresponding user record’s UserStatus value shall be set to Available, and UserType value shall be " +
                 "set to UnrestrictedUser and all schedules shall be cleared.",
-
-            xref: { document: "cluster", section: "5.2.10.32" }
+            xref: { document: "cluster", section: "5.2.10.30" }
         },
 
         Field({
@@ -1853,7 +1714,7 @@ export const DoorLock = Cluster(
             constraint: "1 to numberOfRfidUsersSupported, 65534",
             details: "This field shall indicate a valid RFID code slot index or 0xFFFE to indicate all RFID code slots " +
                 "shall be cleared.",
-            xref: { document: "cluster", section: "5.2.10.32.1" }
+            xref: { document: "cluster", section: "5.2.10.30.1" }
         })
     ),
 
@@ -1863,7 +1724,7 @@ export const DoorLock = Cluster(
         details: "Clear out all RFIDs on the lock. If you clear all RFID codes and this user didn’t have a PIN code, " +
             "the user status has to be set to \"0 Available\", the user type has to be set to the default value, " +
             "and all schedules which are supported have to be set to the default values.",
-        xref: { document: "cluster", section: "5.2.10.33" }
+        xref: { document: "cluster", section: "5.2.10.31" }
     }),
 
     Command(
@@ -1889,21 +1750,21 @@ export const DoorLock = Cluster(
                 "  • INVALID_COMMAND, if one or more fields violate constraints or are invalid or if OperationType " +
                 "    is Modify and UserIndex points to an available slot.",
 
-            xref: { document: "cluster", section: "5.2.10.34" }
+            xref: { document: "cluster", section: "5.2.10.32" }
         },
 
         Field({
             name: "OperationType", id: 0x0, type: "DataOperationTypeEnum", conformance: "M",
             constraint: "add, modify",
             details: "This field shall indicate the type of operation.",
-            xref: { document: "cluster", section: "5.2.10.34.1" }
+            xref: { document: "cluster", section: "5.2.10.32.1" }
         }),
 
         Field({
             name: "UserIndex", id: 0x1, type: "uint16", conformance: "M",
             constraint: "1 to numberOfTotalUsersSupported",
             details: "This field shall indicate the user ID.",
-            xref: { document: "cluster", section: "5.2.10.34.2" }
+            xref: { document: "cluster", section: "5.2.10.32.2" }
         }),
 
         Field({
@@ -1920,7 +1781,7 @@ export const DoorLock = Cluster(
                 "\n" +
                 "If UserName is not null, the UserName in the user record shall be set to the provided value.",
 
-            xref: { document: "cluster", section: "5.2.10.34.3" }
+            xref: { document: "cluster", section: "5.2.10.32.3" }
         }),
 
         Field({
@@ -1939,7 +1800,7 @@ export const DoorLock = Cluster(
                 "\n" +
                 "If UserUniqueID is not null, the UserUniqueID in the user record shall be set to the provided value.",
 
-            xref: { document: "cluster", section: "5.2.10.34.4" }
+            xref: { document: "cluster", section: "5.2.10.32.4" }
         }),
 
         Field({
@@ -1957,7 +1818,7 @@ export const DoorLock = Cluster(
                 "\n" +
                 "If UserStatus is not null, the UserStatus in the user record shall be set to the provided value.",
 
-            xref: { document: "cluster", section: "5.2.10.34.5" }
+            xref: { document: "cluster", section: "5.2.10.32.5" }
         }),
 
         Field({
@@ -1976,7 +1837,7 @@ export const DoorLock = Cluster(
                 "\n" +
                 "If UserType is not null, the UserType in the user record shall be set to the provided value.",
 
-            xref: { document: "cluster", section: "5.2.10.34.6" }
+            xref: { document: "cluster", section: "5.2.10.32.6" }
         }),
 
         Field({
@@ -1999,7 +1860,7 @@ export const DoorLock = Cluster(
                 "If CredentialRule is not null, the CredentialRule in the user record shall be set to the provided " +
                 "value.",
 
-            xref: { document: "cluster", section: "5.2.10.34.7" }
+            xref: { document: "cluster", section: "5.2.10.32.7" }
         })
     ),
 
@@ -2015,7 +1876,7 @@ export const DoorLock = Cluster(
                 "COMMAND, etc.) as needed otherwise the GetUserResponse Command shall be sent implying a status of " +
                 "SUCCESS.",
 
-            xref: { document: "cluster", section: "5.2.10.35" }
+            xref: { document: "cluster", section: "5.2.10.33" }
         },
 
         Field({
@@ -2032,42 +1893,42 @@ export const DoorLock = Cluster(
                 "If the requested UserIndex is valid and the UserStatus is Available for the requested UserIndex " +
                 "then UserName, UserUniqueID, UserStatus, UserType, CredentialRule, Credentials, CreatorFabricIndex, " +
                 "and LastModifiedFabricIndex shall all be null in the response.",
-            xref: { document: "cluster", section: "5.2.10.36" }
+            xref: { document: "cluster", section: "5.2.10.34" }
         },
 
         Field({
             name: "UserIndex", id: 0x0, type: "uint16", conformance: "M",
             constraint: "1 to numberOfTotalUsersSupported",
             details: "This field shall indicate the user ID.",
-            xref: { document: "cluster", section: "5.2.10.36.1" }
+            xref: { document: "cluster", section: "5.2.10.34.1" }
         }),
 
         Field({
             name: "UserName", id: 0x1, type: "string", conformance: "M", constraint: "max 10", quality: "X",
             details: "This field shall contain a string to use as a human readable identifier for the user.",
-            xref: { document: "cluster", section: "5.2.10.36.2" }
+            xref: { document: "cluster", section: "5.2.10.34.2" }
         }),
         Field({
             name: "UserUniqueId", id: 0x2, type: "uint32", conformance: "M", default: 0, quality: "X",
             details: "See UserUniqueID field.",
-            xref: { document: "cluster", section: "5.2.10.36.3" }
+            xref: { document: "cluster", section: "5.2.10.34.3" }
         }),
         Field({
             name: "UserStatus", id: 0x3, type: "UserStatusEnum", conformance: "M", default: 0, quality: "X",
             details: "This field shall indicate the UserStatus assigned to the user when created or modified.",
-            xref: { document: "cluster", section: "5.2.10.36.4" }
+            xref: { document: "cluster", section: "5.2.10.34.4" }
         }),
         Field({
             name: "UserType", id: 0x4, type: "UserTypeEnum", conformance: "M", default: 0, quality: "X",
             details: "This field shall indicate the UserType assigned to this user when created or modified.",
-            xref: { document: "cluster", section: "5.2.10.36.5" }
+            xref: { document: "cluster", section: "5.2.10.34.5" }
         }),
 
         Field({
             name: "CredentialRule", id: 0x5, type: "CredentialRuleEnum", conformance: "M", constraint: "desc",
             default: 0, quality: "X",
             details: "This field shall indicate the CredentialRule set for this user.",
-            xref: { document: "cluster", section: "5.2.10.36.6" }
+            xref: { document: "cluster", section: "5.2.10.34.6" }
         }),
 
         Field(
@@ -2075,7 +1936,7 @@ export const DoorLock = Cluster(
                 name: "Credentials", id: 0x6, type: "list", conformance: "M",
                 constraint: "0 to numberOfCredentialsSupportedPerUser", quality: "X",
                 details: "This field shall contain a list of credentials for this user.",
-                xref: { document: "cluster", section: "5.2.10.36.7" }
+                xref: { document: "cluster", section: "5.2.10.34.7" }
             },
 
             Field({ name: "entry", type: "CredentialStruct" })
@@ -2087,7 +1948,7 @@ export const DoorLock = Cluster(
                 "UserStatus is set to Available or when the creator fabric cannot be determined (for example, when " +
                 "user was created outside the Interaction Model) and shall NOT be null otherwise. This value shall " +
                 "be set to 0 if the original creator fabric was deleted.",
-            xref: { document: "cluster", section: "5.2.10.36.8" }
+            xref: { document: "cluster", section: "5.2.10.34.8" }
         }),
 
         Field({
@@ -2096,7 +1957,7 @@ export const DoorLock = Cluster(
                 "null if UserStatus is set to Available or when the modifier fabric cannot be determined (for " +
                 "example, when user was modified outside the Interaction Model) and shall NOT be null otherwise. " +
                 "This value shall be set to 0 if the last modifier fabric was deleted.",
-            xref: { document: "cluster", section: "5.2.10.36.9" }
+            xref: { document: "cluster", section: "5.2.10.34.9" }
         }),
 
         Field({
@@ -2106,7 +1967,7 @@ export const DoorLock = Cluster(
                 "identifying occupied user slots in the database. This shall NOT be null if there is at least one " +
                 "occupied entry after the requested UserIndex in the User database and shall be null if there are no " +
                 "more occupied entries.",
-            xref: { document: "cluster", section: "5.2.10.36.10" }
+            xref: { document: "cluster", section: "5.2.10.34.10" }
         })
     ),
 
@@ -2124,79 +1985,14 @@ export const DoorLock = Cluster(
                 "A LockUserChange event with the provided UserIndex shall be generated after successfully clearing " +
                 "users.",
 
-            xref: { document: "cluster", section: "5.2.10.37" }
+            xref: { document: "cluster", section: "5.2.10.35" }
         },
 
         Field({
             name: "UserIndex", id: 0x0, type: "uint16", conformance: "M",
             constraint: "1 to numberOfTotalUsersSupported, 65534",
             details: "This field shall specify a valid User index or 0xFFFE to indicate all user slots shall be cleared.",
-            xref: { document: "cluster", section: "5.2.10.37.1" }
-        })
-    ),
-
-    Command({
-        name: "OperatingEventNotification", id: 0x20, conformance: "[NOT]", direction: "response",
-        xref: { document: "cluster", section: "5.2.10" }
-    }),
-
-    Command(
-        {
-            name: "ProgrammingEventNotification", id: 0x21, conformance: "[NOT]", direction: "response",
-
-            details: "The door lock server sends out a programming event notification whenever a programming event takes " +
-                "place on the door lock." +
-                "\n" +
-                "As with operational events, all programming events can be turned on and off by flipping bits in the " +
-                "associated event mask." +
-                "\n" +
-                "The programming event notification command includes an optional string of data that can be used by " +
-                "the manufacturer to pass some manufacturer-specific information if that is required.",
-
-            xref: { document: "cluster", section: "5.2.10.39" }
-        },
-
-        Field({
-            name: "ProgramEventSource", id: 0x0, type: "EventSourceEnum", conformance: "M", constraint: "desc",
-            details: "This field shall indicate where the event was triggered from.",
-            xref: { document: "cluster", section: "5.2.10.39.1" }
-        }),
-        Field({ name: "ProgramEventCode", id: 0x1, type: "ProgrammingEventCodeEnum", conformance: "M", constraint: "desc" }),
-        Field({
-            name: "UserId", id: 0x2, type: "uint16", conformance: "M", constraint: "desc",
-            details: "This field shall indicate the UserID who performed the event",
-            xref: { document: "cluster", section: "5.2.10.39.6" }
-        }),
-        Field({
-            name: "Pin", id: 0x3, type: "octstr", conformance: "M",
-            details: "This field shall indicate the PIN that is associated with the UserID who performed the event",
-            xref: { document: "cluster", section: "5.2.10.39.7" }
-        }),
-        Field({
-            name: "UserType", id: 0x4, type: "UserTypeEnum", conformance: "M", constraint: "desc",
-            details: "This field shall indicate the UserType that is associated with the UserID who performed the event",
-            xref: { document: "cluster", section: "5.2.10.39.8" }
-        }),
-        Field({
-            name: "UserStatus", id: 0x5, type: "UserStatusEnum", conformance: "M", constraint: "desc",
-            details: "This field shall indicate the UserStatus that is associated with the UserID who performed the event",
-            xref: { document: "cluster", section: "5.2.10.39.9" }
-        }),
-
-        Field({
-            name: "LocalTime", id: 0x6, type: "epoch-s", conformance: "M",
-            details: "This field shall indicate the time when the event was triggered in Epoch Time in Seconds with local " +
-                "time offset based on the local timezone and DST offset on the day represented by the value. If time " +
-                "is not supported, the field shall be populated with default not used value 0xFFFFFFFF.",
-            xref: { document: "cluster", section: "5.2.10.39.10" }
-        }),
-
-        Field({
-            name: "Data", id: 0x7, type: "string", conformance: "O",
-            details: "This field may contain a variable string, which can be used to pass data associated with a " +
-                "particular event. Generally this field will be left empty. However, manufacturer can choose to use " +
-                "this field to store/display manufacturer-specific information.",
-            xref: { document: "cluster", section: "5.2.10.39.11" }
+            xref: { document: "cluster", section: "5.2.10.35.1" }
         })
     ),
 
@@ -2208,21 +2004,21 @@ export const DoorLock = Cluster(
                 "or ProgrammingUser." +
                 "\n" +
                 "Fields used for different use cases:",
-            xref: { document: "cluster", section: "5.2.10.40" }
+            xref: { document: "cluster", section: "5.2.10.36" }
         },
 
         Field({
             name: "OperationType", id: 0x0, type: "DataOperationTypeEnum", conformance: "M",
             constraint: "add, modify",
             details: "This field shall indicate the set credential operation type requested.",
-            xref: { document: "cluster", section: "5.2.10.40.1" }
+            xref: { document: "cluster", section: "5.2.10.36.1" }
         }),
 
         Field({
             name: "Credential", id: 0x1, type: "CredentialStruct", conformance: "M",
             details: "This field shall contain a credential structure that contains the CredentialTypeEnum and the " +
                 "credential index (if applicable or 0 if not) to set.",
-            xref: { document: "cluster", section: "5.2.10.40.2" }
+            xref: { document: "cluster", section: "5.2.10.36.2" }
         }),
 
         Field({
@@ -2231,7 +2027,7 @@ export const DoorLock = Cluster(
                 "The length of the credential data shall conform to the limits of the CredentialType specified in " +
                 "the Credential structure otherwise an INVALID_COMMAND status shall be returned in the " +
                 "SetCredentialResponse command.",
-            xref: { document: "cluster", section: "5.2.10.40.3" }
+            xref: { document: "cluster", section: "5.2.10.36.3" }
         }),
 
         Field({
@@ -2240,7 +2036,7 @@ export const DoorLock = Cluster(
             details: "This field shall indicate the user index to the user record that corresponds to the credential " +
                 "being added or modified. This shall be null if OperationType is add and a new credential and user " +
                 "is being added at the same time.",
-            xref: { document: "cluster", section: "5.2.10.40.4" }
+            xref: { document: "cluster", section: "5.2.10.36.4" }
         }),
 
         Field({
@@ -2249,7 +2045,7 @@ export const DoorLock = Cluster(
             details: "This field shall indicate the user status to use in the new user record if a new user is being " +
                 "created. This shall be null if OperationType is Modify. This may be null when adding a new " +
                 "credential and user.",
-            xref: { document: "cluster", section: "5.2.10.40.5" }
+            xref: { document: "cluster", section: "5.2.10.36.5" }
         }),
 
         Field({
@@ -2259,7 +2055,7 @@ export const DoorLock = Cluster(
             details: "This field shall indicate the user type to use in the new user record if a new user is being " +
                 "created. This shall be null if OperationType is Modify. This may be null when adding a new " +
                 "credential and user.",
-            xref: { document: "cluster", section: "5.2.10.40.6" }
+            xref: { document: "cluster", section: "5.2.10.36.6" }
         })
     ),
 
@@ -2267,7 +2063,7 @@ export const DoorLock = Cluster(
         {
             name: "SetCredentialResponse", id: 0x23, conformance: "USR", direction: "response",
             details: "Returns the status for setting the specified credential.",
-            xref: { document: "cluster", section: "5.2.10.41" }
+            xref: { document: "cluster", section: "5.2.10.37" }
         },
 
         Field({
@@ -2288,8 +2084,15 @@ export const DoorLock = Cluster(
                 "  • DUPLICATE, if CredentialData provided is a duplicate of another credential with the same " +
                 "    CredentialType (e.g. duplicate PIN code)." +
                 "\n" +
-                "  • RESOURCE_EXHAUSTED, if OperationType is Add and the user referred to by UserIndex already has " +
-                "    NumberOfCredentialsSupportedPerUser credentials associated." +
+                "  • RESOURCE_EXHAUSTED, if OperationType is Add and the new credential cannot be added due to " +
+                "    resource constraints such as:" +
+                "\n" +
+                "    ◦ The user referred to by UserIndex already has NumberOfCredentialsSupportedPerUser credentials " +
+                "      associated." +
+                "\n" +
+                "    ◦ The credential is of type AliroEvictableEndpointKey or AliroNonEvictableEndpointKey, and " +
+                "      adding it would cause the total number of credentials of those two types to exceed " +
+                "      NumberOfAliroEndpointKeysSupported." +
                 "\n" +
                 "  • INVALID_COMMAND, if one or more fields violate constraints or are invalid." +
                 "\n" +
@@ -2298,7 +2101,7 @@ export const DoorLock = Cluster(
                 "\n" +
                 "  • INVALID_COMMAND, if OperationType is Modify and UserIndex points to an available slot.",
 
-            xref: { document: "cluster", section: "5.2.10.41.1" }
+            xref: { document: "cluster", section: "5.2.10.37.1" }
         }),
 
         Field({
@@ -2309,7 +2112,7 @@ export const DoorLock = Cluster(
                 "Modify; if the OperationType was Add and a new User was created this shall NOT be null and shall " +
                 "provide the UserIndex created. If the OperationType was Add and an existing User was associated " +
                 "with the new credential then this shall be null.",
-            xref: { document: "cluster", section: "5.2.10.41.2" }
+            xref: { document: "cluster", section: "5.2.10.37.2" }
         }),
 
         Field({
@@ -2323,7 +2126,7 @@ export const DoorLock = Cluster(
                 "NextCredentialIndex reported shall NOT exceed the maximum number of credentials for a particular " +
                 "credential type.",
 
-            xref: { document: "cluster", section: "5.2.10.41.3" }
+            xref: { document: "cluster", section: "5.2.10.37.3" }
         })
     ),
 
@@ -2336,14 +2139,14 @@ export const DoorLock = Cluster(
                 "An InvokeResponse command shall be sent with an appropriate error (e.g. FAILURE, INVALID_COMMAND, " +
                 "etc.) as needed otherwise the GetCredentialStatusResponse command shall be sent implying a status " +
                 "of SUCCESS.",
-            xref: { document: "cluster", section: "5.2.10.42" }
+            xref: { document: "cluster", section: "5.2.10.38" }
         },
 
         Field({
             name: "Credential", id: 0x0, type: "CredentialStruct", conformance: "M",
             details: "This field shall contain a credential structure that contains the CredentialTypeEnum and the " +
                 "credential index (if applicable or 0 if not) to retrieve the status for.",
-            xref: { document: "cluster", section: "5.2.10.42.1" }
+            xref: { document: "cluster", section: "5.2.10.38.1" }
         })
     ),
 
@@ -2351,14 +2154,14 @@ export const DoorLock = Cluster(
         {
             name: "GetCredentialStatusResponse", id: 0x25, conformance: "USR", direction: "response",
             details: "Returns the status for the specified credential.",
-            xref: { document: "cluster", section: "5.2.10.43" }
+            xref: { document: "cluster", section: "5.2.10.39" }
         },
 
         Field({
             name: "CredentialExists", id: 0x0, type: "bool", conformance: "M",
             details: "This field shall indicate if the requested credential type and index exists and is populated for " +
                 "the requested user index.",
-            xref: { document: "cluster", section: "5.2.10.43.1" }
+            xref: { document: "cluster", section: "5.2.10.39.1" }
         }),
 
         Field({
@@ -2368,7 +2171,7 @@ export const DoorLock = Cluster(
                 "If CredentialType requested was ProgrammingPIN then UserIndex shall be null; otherwise, UserIndex " +
                 "shall be null if CredentialExists is set to False and shall NOT be null if CredentialExists is set " +
                 "to True.",
-            xref: { document: "cluster", section: "5.2.10.43.2" }
+            xref: { document: "cluster", section: "5.2.10.39.2" }
         }),
 
         Field({
@@ -2377,7 +2180,7 @@ export const DoorLock = Cluster(
                 "if CredentialExists is set to False or when the creator fabric cannot be determined (for example, " +
                 "when credential was created outside the Interaction Model) and shall NOT be null otherwise. This " +
                 "value shall be set to 0 if the original creator fabric was deleted.",
-            xref: { document: "cluster", section: "5.2.10.43.3" }
+            xref: { document: "cluster", section: "5.2.10.39.3" }
         }),
 
         Field({
@@ -2386,7 +2189,7 @@ export const DoorLock = Cluster(
                 "shall be null if CredentialExists is set to False or when the modifier fabric cannot be determined " +
                 "(for example, when credential was modified outside the Interaction Model) and shall NOT be null " +
                 "otherwise. This value shall be set to 0 if the last modifier fabric was deleted.",
-            xref: { document: "cluster", section: "5.2.10.43.4" }
+            xref: { document: "cluster", section: "5.2.10.39.4" }
         }),
 
         Field({
@@ -2396,11 +2199,34 @@ export const DoorLock = Cluster(
             details: "This field shall indicate the next occupied index in the database for the credential type " +
                 "requested, which is useful for quickly identifying occupied credential slots in the database. This " +
                 "shall NOT be null if there is at least one occupied entry after the requested credential index in " +
-                "the corresponding database and shall be null if there are no more occupied entries. The " +
-                "NextCredentialIndex reported shall NOT exceed the maximum number of credentials for a particular " +
-                "credential type.",
+                "the corresponding" +
+                "\n" +
+                "database and shall be null if there are no more occupied entries. The NextCredentialIndex reported " +
+                "shall NOT exceed the maximum number of credentials for a particular credential type.",
+
+            xref: { document: "cluster", section: "5.2.10.39.5" }
+        }),
+
+        Field({
+            name: "CredentialData", id: 0x5, type: "octstr", conformance: "[ALIRO]", constraint: "desc",
+            quality: "X",
+
+            details: "This field shall indicate the credential data for the requested user index." +
+                "\n" +
+                "If the CredentialType in the GetCredentialStatus command was not AliroCredentialIssuerKey, " +
+                "AliroEvictableEndpointKey, or AliroNonEvictableEndpointKey, this field shall NOT be included." +
+                "\n" +
+                "Otherwise, if CredentialExists is false this field shall be null." +
+                "\n" +
+                "Otherwise, the value of this field shall be the value of the relevant credential, as a 65-byte " +
+                "uncompressed elliptic curve public key as defined in section 2.3.3 of SEC 1." +
+                "\n" +
+                "NOTE" +
+                "\n" +
+                "Since the Aliro credentials are public keys, there is no security risk in allowing them to be read. " +
+                "Possession of the credential octet string does not allow operating the lock.",
 
-            xref: { document: "cluster", section: "5.2.10.43.5" }
+            xref: { document: "cluster", section: "5.2.10.39.6" }
         })
     ),
 
@@ -2415,12 +2241,12 @@ export const DoorLock = Cluster(
                 "\n" +
                 "For each credential cleared whose user doesn’t have another valid credential, the corresponding " +
                 "user record shall be reset back to default values and its UserStatus value shall be set to " +
-                "Available and UserType value shall be set to UnrestrictedUser and all schedules shall be cleared. In" +
+                "Available and UserType value shall be set to UnrestrictedUser and all schedules shall be cleared. " +
+                "In this case a LockUserChange event shall be generated for the user being cleared." +
                 "\n" +
-                "this case a LockUserChange event shall be generated for the user being cleared. Return status shall " +
-                "be one of the following values:",
+                "Return status shall be one of the following values:",
 
-            xref: { document: "cluster", section: "5.2.10.44" }
+            xref: { document: "cluster", section: "5.2.10.40" }
         },
 
         Field({
@@ -2429,7 +2255,7 @@ export const DoorLock = Cluster(
             details: "This field shall contain a credential structure that contains the CredentialTypeEnum and the " +
                 "credential index (0xFFFE for all credentials or 0 if not applicable) to clear. This shall be null " +
                 "if clearing all credential types otherwise it shall NOT be null.",
-            xref: { document: "cluster", section: "5.2.10.44.1" }
+            xref: { document: "cluster", section: "5.2.10.40.1" }
         })
     ),
 
@@ -2447,16 +2273,65 @@ export const DoorLock = Cluster(
                 "If the attribute AutoRelockTime is supported, the lock will transition to the locked state when the " +
                 "auto relock time has expired.",
 
-            xref: { document: "cluster", section: "5.2.10.45" }
+            xref: { document: "cluster", section: "5.2.10.41" }
         },
 
         Field({
             name: "PinCode", id: 0x0, type: "octstr", conformance: "[COTA & PIN]",
             details: "See PINCode field.",
-            xref: { document: "cluster", section: "5.2.10.45.1" }
+            xref: { document: "cluster", section: "5.2.10.41.1" }
+        })
+    ),
+
+    Command(
+        {
+            name: "SetAliroReaderConfig", id: 0x28, access: "A T", conformance: "ALIRO", direction: "request",
+            response: "status",
+            details: "This command allows communicating an Aliro Reader configuration, as defined in [Aliro], to the lock.",
+            xref: { document: "cluster", section: "5.2.10.42" }
+        },
+
+        Field({
+            name: "SigningKey", id: 0x0, type: "octstr", conformance: "M", constraint: "32",
+            details: "This field shall indicate the signing key component of the Reader’s key pair.",
+            xref: { document: "cluster", section: "5.2.10.42.1" }
+        }),
+
+        Field({
+            name: "VerificationKey", id: 0x1, type: "octstr", conformance: "M", constraint: "65",
+            details: "This field shall indicate the verification key component of the Reader’s key pair. This shall be an " +
+                "uncompressed elliptic curve public key as defined in section 2.3.3 of SEC 1.",
+            xref: { document: "cluster", section: "5.2.10.42.2" }
+        }),
+
+        Field({
+            name: "GroupIdentifier", id: 0x2, type: "octstr", conformance: "M", constraint: "16",
+            details: "This field shall indicate the reader group identifier for the lock.",
+            xref: { document: "cluster", section: "5.2.10.42.3" }
+        }),
+        Field({
+            name: "GroupResolvingKey", id: 0x3, type: "octstr", conformance: "ALBU", constraint: "16",
+            details: "This field shall indicate the group resolving key for the lock.",
+            xref: { document: "cluster", section: "5.2.10.42.4" }
         })
     ),
 
+    Command({
+        name: "ClearAliroReaderConfig", id: 0x29, access: "A T", conformance: "ALIRO", direction: "request",
+        response: "status",
+
+        details: "This command allows clearing an existing Aliro Reader configuration for the lock. Administrators " +
+            "shall NOT clear an Aliro Reader configuration without explicit user permission." +
+            "\n" +
+            "NOTE" +
+            "\n" +
+            "Using this command will revoke the ability of all existing Aliro user devices that have the old " +
+            "verification key to interact with the lock. This effect is not restricted to a single fabric or " +
+            "otherwise scoped in any way.",
+
+        xref: { document: "cluster", section: "5.2.10.43" }
+    }),
+
     Datatype(
         {
             name: "DaysMaskBitmap", type: "map8",
@@ -2625,7 +2500,6 @@ export const DoorLock = Cluster(
         { name: "AlarmMaskBitmap", type: "map16", xref: { document: "cluster", section: "5.2.6.6" } },
         Field({ name: "LockJammed", constraint: "0", description: "Locking Mechanism Jammed" }),
         Field({ name: "LockFactoryReset", constraint: "1", description: "Lock Reset to Factory Defaults" }),
-        Field({ name: "NA", constraint: "2", description: "Reserved" }),
         Field({ name: "LockRadioPowerCycled", constraint: "3", description: "RF Module Power Cycled" }),
         Field({ name: "WrongCodeEntryLimit", constraint: "4", description: "Tamper Alarm - wrong code entry limit" }),
         Field({
@@ -2635,31 +2509,11 @@ export const DoorLock = Cluster(
         Field({ name: "DoorForcedOpen", constraint: "6", description: "Forced Door Open under Door Locked Condition" })
     ),
 
-    Datatype(
-        { name: "EventMaskBitmap", type: "map16", xref: { document: "cluster", section: "5.2.6.7" } },
-        Field({ name: "Bit0", constraint: "0", description: "State of bit 0" }),
-        Field({ name: "Bit1", constraint: "1", description: "State of bit 1" }),
-        Field({ name: "Bit2", constraint: "2", description: "State of bit 2" }),
-        Field({ name: "Bit3", constraint: "3", description: "State of bit 3" }),
-        Field({ name: "Bit4", constraint: "4", description: "State of bit 4" }),
-        Field({ name: "Bit5", constraint: "5", description: "State of bit 5" }),
-        Field({ name: "Bit6", constraint: "6", description: "State of bit 6" }),
-        Field({ name: "Bit7", constraint: "7", description: "State of bit 7" }),
-        Field({ name: "Bit8", constraint: "8", description: "State of bit 8" }),
-        Field({ name: "Bit9", constraint: "9", description: "State of bit 9" }),
-        Field({ name: "Bit10", constraint: "10", description: "State of bit 10" }),
-        Field({ name: "Bit11", constraint: "11", description: "State of bit 11" }),
-        Field({ name: "Bit12", constraint: "12", description: "State of bit 12" }),
-        Field({ name: "Bit13", constraint: "13", description: "State of bit 13" }),
-        Field({ name: "Bit14", constraint: "14", description: "State of bit 14" }),
-        Field({ name: "Bit15", constraint: "15", description: "State of bit 15" })
-    ),
-
     Datatype(
         {
             name: "AlarmCodeEnum", type: "enum8",
             details: "This enumeration shall indicate the alarm type.",
-            xref: { document: "cluster", section: "5.2.6.8" }
+            xref: { document: "cluster", section: "5.2.6.7" }
         },
         Field({ name: "LockJammed", id: 0x0, conformance: "M", description: "Locking Mechanism Jammed" }),
         Field({ name: "LockFactoryReset", id: 0x1, conformance: "O", description: "Lock Reset to Factory Defaults" }),
@@ -2684,7 +2538,7 @@ export const DoorLock = Cluster(
         {
             name: "CredentialRuleEnum", type: "enum8",
             details: "This enumeration shall indicate the credential rule that can be applied to a particular user.",
-            xref: { document: "cluster", section: "5.2.6.9" }
+            xref: { document: "cluster", section: "5.2.6.8" }
         },
         Field({
             name: "Single", id: 0x0, conformance: "USR",
@@ -2704,21 +2558,80 @@ export const DoorLock = Cluster(
         {
             name: "CredentialTypeEnum", type: "enum8",
             details: "This enumeration shall indicate the credential type.",
-            xref: { document: "cluster", section: "5.2.6.10" }
+            xref: { document: "cluster", section: "5.2.6.9" }
         },
         Field({ name: "ProgrammingPin", id: 0x0, conformance: "O", description: "Programming PIN code credential type" }),
         Field({ name: "Pin", id: 0x1, conformance: "PIN", description: "PIN code credential type" }),
         Field({ name: "Rfid", id: 0x2, conformance: "RID", description: "RFID identifier credential type" }),
         Field({ name: "Fingerprint", id: 0x3, conformance: "FGP", description: "Fingerprint identifier credential type" }),
         Field({ name: "FingerVein", id: 0x4, conformance: "FGP", description: "Finger vein identifier credential type" }),
-        Field({ name: "Face", id: 0x5, conformance: "FACE", description: "Face identifier credential type" })
+        Field({ name: "Face", id: 0x5, conformance: "FACE", description: "Face identifier credential type" }),
+
+        Field({
+            name: "AliroCredentialIssuerKey", id: 0x6, conformance: "ALIRO",
+            description: "A Credential Issuer public key as defined in [Aliro]",
+
+            details: "Credentials of this type shall be 65-byte uncompressed elliptic curve public keys as defined in " +
+                "section 2.3.3 of SEC 1." +
+                "\n" +
+                "Credentials of this type shall NOT be used to allow operating the lock. They shall be used, as " +
+                "defined in [Aliro], to create new credentials of type AliroEvictableEndpointKey via a step-up " +
+                "transaction." +
+                "\n" +
+                "When performing the step-up transaction, the lock shall request the data element with identifier " +
+                "\"matter1\", and shall attempt to create a new credential of type AliroEvictableEndpointKey if and " +
+                "only if the data element is returned and the Access Credential can be validated using the " +
+                "AliroCredentialIssuerKey." +
+                "\n" +
+                "When a new credential of type AliroEvictableEndpointKey is added in this manner, it shall be " +
+                "associated with the same user record as the AliroCredentialIssuerKey credential that allowed the " +
+                "new credential to be added." +
+                "\n" +
+                "If there are no available credential slots to add a new AliroEvictableEndpointKey credential (i.e. " +
+                "either the NumberOfCredentialsSupportedPerUser or the NumberOfAliroEndpointKeysSupported limit has " +
+                "been reached) but there exist credentials of type AliroEvictableEndpointKey associated with the " +
+                "user record, the server shall remove one of those credentials using the same procedure it would " +
+                "follow for the ClearCredential command before adding the new credential." +
+                "\n" +
+                "If there are no available credential slots to add a new AliroEvictableEndpointKey credential (i.e. " +
+                "either the NumberOfCredentialsSupportedPerUser or the NumberOfAliroEndpointKeysSupported limit has " +
+                "been reached) and there do not exist credentials of type AliroEvictableEndpointKey associated with " +
+                "the user record, a new AliroEvictableEndpointKey credential shall NOT be created." +
+                "\n" +
+                "If the step-up process results in addition of new credentials, the corresponding LockUserChange " +
+                "event shall have OperationSource set to Aliro." +
+                "\n" +
+                "If the step-up process results in the lock state changing (e.g. locking or unlocking), the " +
+                "credential associated with those changes in the LockOperation events shall be the newly provisioned " +
+                "AliroEvictableEndpointKey credential if one was created. If no new AliroEvictableEndpointKey " +
+                "credential was created, the credential associated with the changes in the LockOperation events " +
+                "shall be the AliroCredentialIssuerKey credential used for the step-up.",
+
+            xref: { document: "cluster", section: "5.2.6.9.1" }
+        }),
+
+        Field({
+            name: "AliroEvictableEndpointKey", id: 0x7, conformance: "ALIRO",
+            description: "An Endpoint public key as defined in [Aliro] which can be evicted if space is needed for another endpoint key",
+            details: "Credentials of this type shall be 65-byte uncompressed elliptic curve public keys as defined in " +
+                "section 2.3.3 of SEC 1.",
+            xref: { document: "cluster", section: "5.2.6.9.2" }
+        }),
+
+        Field({
+            name: "AliroNonEvictableEndpointKey", id: 0x8, conformance: "ALIRO",
+            description: "An Endpoint public key as defined in [Aliro] which cannot be evicted if space is needed for another endpoint key",
+            details: "Credentials of this type shall be 65-byte uncompressed elliptic curve public keys as defined in " +
+                "section 2.3.3 of SEC 1.",
+            xref: { document: "cluster", section: "5.2.6.9.3" }
+        })
     ),
 
     Datatype(
         {
             name: "DataOperationTypeEnum", type: "enum8",
             details: "This enumeration shall indicate the data operation performed.",
-            xref: { document: "cluster", section: "5.2.6.11" }
+            xref: { document: "cluster", section: "5.2.6.10" }
         },
         Field({ name: "Add", id: 0x0, conformance: "M", description: "Data is being added or was added" }),
         Field({ name: "Clear", id: 0x1, conformance: "M", description: "Data is being cleared or was cleared" }),
@@ -2729,7 +2642,7 @@ export const DoorLock = Cluster(
         {
             name: "DoorStateEnum", type: "enum8",
             details: "This enumeration shall indicate the current door state.",
-            xref: { document: "cluster", section: "5.2.6.12" }
+            xref: { document: "cluster", section: "5.2.6.11" }
         },
         Field({ name: "DoorOpen", id: 0x0, conformance: "DPS", description: "Door state is open" }),
         Field({ name: "DoorClosed", id: 0x1, conformance: "DPS", description: "Door state is closed" }),
@@ -2746,7 +2659,7 @@ export const DoorLock = Cluster(
         {
             name: "LockDataTypeEnum", type: "enum8",
             details: "This enumeration shall indicate the data type that is being or has changed.",
-            xref: { document: "cluster", section: "5.2.6.13" }
+            xref: { document: "cluster", section: "5.2.6.12" }
         },
         Field({
             name: "Unspecified", id: 0x0, conformance: "O",
@@ -2791,6 +2704,18 @@ export const DoorLock = Cluster(
         Field({
             name: "Face", id: 0xa, conformance: "FACE",
             description: "Lock user face information was added, cleared, or modified."
+        }),
+        Field({
+            name: "AliroCredentialIssuerKey", id: 0xb, conformance: "ALIRO",
+            description: "An Aliro credential issuer key credential was added, cleared, or modified."
+        }),
+        Field({
+            name: "AliroEvictableEndpointKey", id: 0xc, conformance: "ALIRO",
+            description: "An Aliro endpoint key credential which can be evicted credential was added, cleared, or modified."
+        }),
+        Field({
+            name: "AliroNonEvictableEndpointKey", id: 0xd, conformance: "ALIRO",
+            description: "An Aliro endpoint key credential which cannot be evicted was added, cleared, or modified."
         })
     ),
 
@@ -2798,7 +2723,7 @@ export const DoorLock = Cluster(
         {
             name: "LockOperationTypeEnum", type: "enum8",
             details: "This enumeration shall indicate the type of Lock operation performed.",
-            xref: { document: "cluster", section: "5.2.6.14" }
+            xref: { document: "cluster", section: "5.2.6.13" }
         },
         Field({ name: "Lock", id: 0x0, conformance: "M", description: "Lock operation" }),
         Field({ name: "Unlock", id: 0x1, conformance: "M", description: "Unlock operation" }),
@@ -2817,7 +2742,7 @@ export const DoorLock = Cluster(
         {
             name: "OperationErrorEnum", type: "enum8",
             details: "This enumeration shall indicate the error cause of the Lock/Unlock operation performed.",
-            xref: { document: "cluster", section: "5.2.6.15" }
+            xref: { document: "cluster", section: "5.2.6.14" }
         },
         Field({
             name: "Unspecified", id: 0x0, conformance: "O",
@@ -2859,18 +2784,18 @@ export const DoorLock = Cluster(
                 "by those commands. The door lock shall NOT disable the radio or otherwise unbind or leave the " +
                 "network. It shall still respond to all other commands and requests.",
 
-            xref: { document: "cluster", section: "5.2.6.16" }
+            xref: { document: "cluster", section: "5.2.6.15" }
         },
 
         Field({
             name: "Normal", id: 0x0, conformance: "M",
             details: "The lock operates normally. All interfaces are enabled.",
-            xref: { document: "cluster", section: "5.2.6.16.1" }
+            xref: { document: "cluster", section: "5.2.6.15.1" }
         }),
         Field({
             name: "Vacation", id: 0x1, conformance: "O",
             details: "Only remote interaction is enabled. The keypad shall only be operable by the master user.",
-            xref: { document: "cluster", section: "5.2.6.16.2" }
+            xref: { document: "cluster", section: "5.2.6.15.2" }
         }),
 
         Field({
@@ -2878,7 +2803,7 @@ export const DoorLock = Cluster(
             details: "This mode is only possible if the door is locked. Manual unlocking changes the mode to Normal " +
                 "operating mode. All external interaction with the door lock is disabled. This mode is intended to " +
                 "be used so that users, presumably inside the property, will have control over the entrance.",
-            xref: { document: "cluster", section: "5.2.6.16.3" }
+            xref: { document: "cluster", section: "5.2.6.15.3" }
         }),
 
         Field({
@@ -2886,14 +2811,14 @@ export const DoorLock = Cluster(
             details: "This mode only disables remote interaction with the lock. This does not apply to any remote " +
                 "proprietary means of communication. It specifically applies to the Lock, Unlock, Toggle, and Unlock " +
                 "with Timeout Commands.",
-            xref: { document: "cluster", section: "5.2.6.16.4" }
+            xref: { document: "cluster", section: "5.2.6.15.4" }
         }),
 
         Field({
             name: "Passage", id: 0x4, conformance: "O",
             details: "The lock is open or can be opened or closed at will without the use of a Keypad or other means of " +
                 "user validation (e.g. a lock for a business during work hours).",
-            xref: { document: "cluster", section: "5.2.6.16.5" }
+            xref: { document: "cluster", section: "5.2.6.15.5" }
         })
     ),
 
@@ -2901,7 +2826,7 @@ export const DoorLock = Cluster(
         {
             name: "OperationSourceEnum", type: "enum8",
             details: "This enumeration shall indicate the source of the Lock/Unlock or user change operation performed.",
-            xref: { document: "cluster", section: "5.2.6.17" }
+            xref: { document: "cluster", section: "5.2.6.16" }
         },
         Field({
             name: "Unspecified", id: 0x0, conformance: "O",
@@ -2933,6 +2858,10 @@ export const DoorLock = Cluster(
         Field({
             name: "Biometric", id: 0x9, conformance: "[USR]",
             description: "Lock/unlock operation came from biometric source (e.g. face, fingerprint/fingervein)"
+        }),
+        Field({
+            name: "Aliro", id: 0xa, conformance: "ALIRO",
+            description: "Lock/unlock operation came from an interaction defined in [Aliro], or user change operation was a step-up credential provisioning as defined in [Aliro]"
         })
     ),
 
@@ -2940,7 +2869,7 @@ export const DoorLock = Cluster(
         {
             name: "UserStatusEnum", type: "enum8",
             details: "This enumeration shall indicate what the status is for a specific user ID.",
-            xref: { document: "cluster", section: "5.2.6.18" }
+            xref: { document: "cluster", section: "5.2.6.17" }
         },
         Field({ name: "Available", id: 0x0, conformance: "M", description: "The user ID is available" }),
         Field({ name: "OccupiedEnabled", id: 0x1, conformance: "M", description: "The user ID is occupied and enabled" }),
@@ -2951,7 +2880,7 @@ export const DoorLock = Cluster(
         {
             name: "UserTypeEnum", type: "enum8",
             details: "This enumeration shall indicate what the type is for a specific user ID.",
-            xref: { document: "cluster", section: "5.2.6.19" }
+            xref: { document: "cluster", section: "5.2.6.18" }
         },
 
         Field({
@@ -2959,21 +2888,41 @@ export const DoorLock = Cluster(
             description: "The user ID type is unrestricted",
             details: "This value shall indicate the user has access 24/7 provided proper PIN or RFID is supplied (e.g., " +
                 "owner).",
-            xref: { document: "cluster", section: "5.2.6.19.1" }
+            xref: { document: "cluster", section: "5.2.6.18.1" }
         }),
 
         Field({
             name: "YearDayScheduleUser", id: 0x1, conformance: "O", description: "The user ID type is schedule",
+
             details: "This value shall indicate the user has the ability to open lock within a specific time period " +
-                "(e.g., guest).",
-            xref: { document: "cluster", section: "5.2.6.19.2" }
+                "(e.g., guest)." +
+                "\n" +
+                "When UserType is set to YearDayScheduleUser, user access shall be restricted as follows:" +
+                "\n" +
+                "  • If no YearDaySchedules are set for the user, then access shall be denied" +
+                "\n" +
+                "  • If one or more YearDaySchedules are set, user access shall be granted if and only if the " +
+                "    current time falls within at least one of the YearDaySchedules. If current time is not known, " +
+                "    user access shall NOT be granted.",
+
+            xref: { document: "cluster", section: "5.2.6.18.2" }
         }),
 
         Field({
             name: "WeekDayScheduleUser", id: 0x2, conformance: "O", description: "The user ID type is schedule",
+
             details: "This value shall indicate the user has the ability to open lock based on specific time period " +
-                "within a reoccurring weekly schedule (e.g., cleaning worker).",
-            xref: { document: "cluster", section: "5.2.6.19.3" }
+                "within a reoccurring weekly schedule (e.g., cleaning worker)." +
+                "\n" +
+                "When UserType is set to WeekDayScheduleUser, user access shall be restricted as follows:" +
+                "\n" +
+                "  • If no WeekDaySchedules are set for the user, then access shall be denied" +
+                "\n" +
+                "  • If one or more WeekDaySchedules are set, user access shall be granted if and only if the " +
+                "    current time falls within at least one of the WeekDaySchedules. If current time is not known, " +
+                "    user access shall NOT be granted.",
+
+            xref: { document: "cluster", section: "5.2.6.18.3" }
         }),
 
         Field({
@@ -2982,7 +2931,7 @@ export const DoorLock = Cluster(
                 "user can manage the users and user schedules. In all other respects this user matches the " +
                 "unrestricted (default) user. ProgrammingUser is the only user that can disable the user interface " +
                 "(keypad, remote, etc…).",
-            xref: { document: "cluster", section: "5.2.6.19.4" }
+            xref: { document: "cluster", section: "5.2.6.18.4" }
         }),
 
         Field({
@@ -2990,7 +2939,7 @@ export const DoorLock = Cluster(
             details: "This value shall indicate the user is recognized by the lock but does not have the ability to open " +
                 "the lock. This user will only cause the lock to generate the appropriate event notification to any " +
                 "bound devices.",
-            xref: { document: "cluster", section: "5.2.6.19.5" }
+            xref: { document: "cluster", section: "5.2.6.18.5" }
         }),
 
         Field({
@@ -2998,7 +2947,7 @@ export const DoorLock = Cluster(
             details: "This value shall indicate the user has the ability to open lock but a ForcedUser LockOperationType " +
                 "and ForcedUser silent alarm will be emitted to allow a notified Node to alert emergency services or " +
                 "contacts on the user account when used.",
-            xref: { document: "cluster", section: "5.2.6.19.6" }
+            xref: { document: "cluster", section: "5.2.6.18.6" }
         }),
 
         Field({
@@ -3006,7 +2955,7 @@ export const DoorLock = Cluster(
             description: "The user ID type is disposable",
             details: "This value shall indicate the user has the ability to open lock once after which the lock shall " +
                 "change the corresponding user record UserStatus value to OccupiedDisabled automatically.",
-            xref: { document: "cluster", section: "5.2.6.19.7" }
+            xref: { document: "cluster", section: "5.2.6.18.7" }
         }),
 
         Field({
@@ -3016,14 +2965,29 @@ export const DoorLock = Cluster(
                 "ExpiringUserTimeout minutes the corresponding user record UserStatus value shall be set to " +
                 "OccupiedDisabled automatically by the lock. The lock shall persist the timeout across reboots such " +
                 "that the ExpiringUserTimeout is honored.",
-            xref: { document: "cluster", section: "5.2.6.19.8" }
+            xref: { document: "cluster", section: "5.2.6.18.8" }
         }),
 
         Field({
             name: "ScheduleRestrictedUser", id: 0x8, conformance: "WDSCH | YDSCH",
             description: "The user ID type is schedule restricted",
-            details: "This value shall indicate the user access is restricted by Week Day and/or Year Day schedule.",
-            xref: { document: "cluster", section: "5.2.6.19.9" }
+
+            details: "This value shall indicate the user access is restricted by Week Day and/or Year Day schedule. When " +
+                "UserType is set to ScheduleRestrictedUser, user access shall be restricted as follows:" +
+                "\n" +
+                "  • If no WeekDaySchedules and no YearDaySchedules are set for the user, then access shall be denied" +
+                "\n" +
+                "  • If one or more WeekDaySchedules are set, but no YearDaySchedules are set for the user, then " +
+                "    user access shall be equivalent to the WeekDayScheduleUser UserType" +
+                "\n" +
+                "  • If one or more YearDaySchedules are set, but no WeekDaySchedules are set for the user, then " +
+                "    user access shall be equivalent to the YearDayScheduleUser UserType" +
+                "\n" +
+                "  • If one or WeekDaySchedules are set AND one or more YearDaySchedules are set, then user access " +
+                "    shall be granted if and only if the current time falls within at least one of the " +
+                "    WeekDaySchedules AND the current time falls within at least one of the YearDaySchedules.",
+
+            xref: { document: "cluster", section: "5.2.6.18.9" }
         }),
 
         Field({
@@ -3033,12 +2997,12 @@ export const DoorLock = Cluster(
                 "only. This type of user might be useful for regular delivery services or voice assistant unlocking " +
                 "operations to prevent a PIN code credential created for them from being used at the keypad. The PIN " +
                 "code credential would only be provided over-the-air for the lock/unlock commands.",
-            xref: { document: "cluster", section: "5.2.6.19.10" }
+            xref: { document: "cluster", section: "5.2.6.18.10" }
         })
     ),
 
     Datatype(
-        { name: "LockStateEnum", type: "enum8", xref: { document: "cluster", section: "5.2.6.20" } },
+        { name: "LockStateEnum", type: "enum8", xref: { document: "cluster", section: "5.2.6.19" } },
         Field({ name: "NotFullyLocked", id: 0x0, conformance: "M", description: "Lock state is not fully locked" }),
         Field({ name: "Locked", id: 0x1, conformance: "M", description: "Lock state is fully locked" }),
         Field({ name: "Unlocked", id: 0x2, conformance: "M", description: "Lock state is fully unlocked" }),
@@ -3049,7 +3013,7 @@ export const DoorLock = Cluster(
     ),
 
     Datatype(
-        { name: "LockTypeEnum", type: "enum8", xref: { document: "cluster", section: "5.2.6.21" } },
+        { name: "LockTypeEnum", type: "enum8", xref: { document: "cluster", section: "5.2.6.20" } },
         Field({ name: "DeadBolt", id: 0x0, conformance: "M", description: "Physical lock type is dead bolt" }),
         Field({ name: "Magnetic", id: 0x1, conformance: "M", description: "Physical lock type is magnetic" }),
         Field({ name: "Other", id: 0x2, conformance: "M", description: "Physical lock type is other" }),
@@ -3068,7 +3032,7 @@ export const DoorLock = Cluster(
     ),
 
     Datatype(
-        { name: "LEDSettingEnum", type: "enum8", xref: { document: "cluster", section: "5.2.6.22" } },
+        { name: "LEDSettingEnum", type: "enum8", xref: { document: "cluster", section: "5.2.6.21" } },
         Field({ name: "NoLedSignal", id: 0x0, conformance: "M", description: "Never use LED for signalization" }),
         Field({
             name: "NoLedSignalAccessAllowed", id: 0x1, conformance: "M",
@@ -3078,7 +3042,7 @@ export const DoorLock = Cluster(
     ),
 
     Datatype(
-        { name: "SoundVolumeEnum", type: "enum8", xref: { document: "cluster", section: "5.2.6.23" } },
+        { name: "SoundVolumeEnum", type: "enum8", xref: { document: "cluster", section: "5.2.6.22" } },
         Field({ name: "Silent", id: 0x0, conformance: "M", description: "Silent Mode" }),
         Field({ name: "Low", id: 0x1, conformance: "M", description: "Low Volume" }),
         Field({ name: "High", id: 0x2, conformance: "M", description: "High Volume" }),
@@ -3086,82 +3050,24 @@ export const DoorLock = Cluster(
     ),
 
     Datatype(
-        { name: "EventTypeEnum", type: "enum8", xref: { document: "cluster", section: "5.2.6.24" } },
+        { name: "EventTypeEnum", type: "enum8", xref: { document: "cluster", section: "5.2.6.23" } },
         Field({ name: "Operation", id: 0x0, conformance: "M", description: "Event type is operation" }),
         Field({ name: "Programming", id: 0x1, conformance: "M", description: "Event type is programming" }),
         Field({ name: "Alarm", id: 0x2, conformance: "M", description: "Event type is alarm" })
     ),
 
-    Datatype(
-        { name: "EventSourceEnum", type: "enum8", xref: { document: "cluster", section: "5.2.6.25" } },
-        Field({ name: "Keypad", id: 0x0, conformance: "M", description: "Event source is keypad" }),
-        Field({ name: "Remote", id: 0x1, conformance: "M", description: "Event source is remote" }),
-        Field({ name: "Manual", id: 0x2, conformance: "M", description: "Event source is manual" }),
-        Field({ name: "Rfid", id: 0x3, conformance: "M", description: "Event source is RFID" }),
-        Field({ name: "Indeterminate", id: 0xff, conformance: "M", description: "Event source is unknown" })
-    ),
-
-    Datatype(
-        { name: "OperationEventCodeEnum", type: "enum8", xref: { document: "cluster", section: "5.2.6.25.1" } },
-        Field({ name: "UnknownOrMfgSpecific", id: 0x0, conformance: "O", description: "Event code is unknown" }),
-        Field({ name: "Lock", id: 0x1, conformance: "O", description: "Event code is lock" }),
-        Field({ name: "Unlock", id: 0x2, conformance: "O", description: "Event code is unlock" }),
-        Field({
-            name: "LockFailureInvalidPiNorRfid", id: 0x3, conformance: "O",
-            description: "Event code is lock failure due to invalid PIN or RFID"
-        }),
-        Field({
-            name: "LockFailureInvalidSchedule", id: 0x4, conformance: "O",
-            description: "Event code is lock failure due to invalid schedule"
-        }),
-        Field({
-            name: "UnlockFailureInvalidPiNorRfid", id: 0x5, conformance: "O",
-            description: "Event code is unlock failure due to invalid PIN or RFID"
-        }),
-        Field({
-            name: "UnlockFailureInvalidSchedule", id: 0x6, conformance: "O",
-            description: "Event code is unlock failure due to invalid schedule"
-        }),
-        Field({ name: "OneTouchLock", id: 0x7, conformance: "O", description: "Event code is one touch lock" }),
-        Field({ name: "KeyLock", id: 0x8, conformance: "O", description: "Event code is key lock" }),
-        Field({ name: "KeyUnlock", id: 0x9, conformance: "O", description: "Event code is key unlock" }),
-        Field({ name: "AutoLock", id: 0xa, conformance: "O", description: "Event code is auto lock" }),
-        Field({ name: "ScheduleLock", id: 0xb, conformance: "WDSCH | YDSCH", description: "Event code is schedule lock" }),
-        Field({ name: "ScheduleUnlock", id: 0xc, conformance: "WDSCH | YDSCH", description: "Event code is schedule unlock" }),
-        Field({ name: "ManualLock", id: 0xd, conformance: "O", description: "Event code is manual lock (Key or Thumbturn)" }),
-        Field({
-            name: "ManualUnlock", id: 0xe, conformance: "O",
-            description: "Event code is manual unlock (Key or Thumbturn)"
-        }),
-        Field({
-            name: "NonAccessUserOperationEvent", id: 0xf, conformance: "O",
-            description: "Event code is non access user operation"
-        })
-    ),
-
-    Datatype(
-        { name: "ProgrammingEventCodeEnum", type: "enum8", xref: { document: "cluster", section: "5.2.6.25.2" } },
-        Field({ name: "UnknownOrMfgSpecific", id: 0x0, conformance: "O", description: "Event code is unknown" }),
-        Field({ name: "ProgrammingCodeChanged", id: 0x1, conformance: "O", description: "Event code is code changed" }),
-        Field({ name: "PinCodeAdded", id: 0x2, conformance: "O", description: "Event code is PIN added" }),
-        Field({ name: "PinCodeCleared", id: 0x3, conformance: "O", description: "Event code is PIN cleared" }),
-        Field({ name: "PinCodeChanged", id: 0x4, conformance: "O", description: "Event code is PIN changed" }),
-        Field({ name: "RfidCodeAdded", id: 0x5, conformance: "O", description: "Event code is RFID added" }),
-        Field({ name: "RfidCodeCleared", id: 0x6, conformance: "O", description: "Event code is RFID cleared" })
-    ),
-
     Datatype(
         {
             name: "CredentialStruct", type: "struct",
             details: "This struct shall indicate the credential types and their corresponding indices (if any) for the " +
                 "event or user record.",
-            xref: { document: "cluster", section: "5.2.6.26" }
+            xref: { document: "cluster", section: "5.2.6.24" }
         },
 
         Field({
             name: "CredentialType", id: 0x0, type: "CredentialTypeEnum", conformance: "M",
             details: "This field shall indicate the credential field used to authorize the lock operation.",
-            xref: { document: "cluster", section: "5.2.6.26.1" }
+            xref: { document: "cluster", section: "5.2.6.24.1" }
         }),
 
         Field({
@@ -3170,14 +3076,14 @@ export const DoorLock = Cluster(
                 "in the list of credentials identified by CredentialType (e.g. PIN, RFID, etc.). This field shall be " +
                 "set to 0 if CredentialType is ProgrammingPIN or does not correspond to a list that can be indexed " +
                 "into.",
-            xref: { document: "cluster", section: "5.2.6.26.2" }
+            xref: { document: "cluster", section: "5.2.6.24.2" }
         })
     ),
 
     Datatype(
         { name: "StatusCodeEnum", type: "enum8", xref: { document: "cluster", section: "5.2.7.1" } },
-        Field({ name: "Duplicate", id: 0x2, description: "Entry would cause a duplicate credential/ID." }),
-        Field({ name: "Occupied", id: 0x3, description: "Entry would replace an occupied slot." })
+        Field({ name: "Duplicate", id: 0x2, conformance: "M", description: "Entry would cause a duplicate credential/ID." }),
+        Field({ name: "Occupied", id: 0x3, conformance: "M", description: "Entry would replace an occupied slot." })
     )
 );