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

package/dist/esm/standard/elements/DoorLock.js

@@ -18,10 +18,10 @@ const DoorLock = Cluster(
     id: 257,
     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.",
+    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.\nFigure 16. Typical Usage of the Door Lock Cluster",
     xref: { document: "cluster", section: "5.2" }
   },
-  Attribute({ name: "ClusterRevision", id: 65533, type: "ClusterRevision", default: 7 }),
+  Attribute({ name: "ClusterRevision", id: 65533, type: "ClusterRevision", default: 8 }),
   Attribute(
     { name: "FeatureMap", id: 65532, type: "FeatureMap", xref: { document: "cluster", section: "5.2.4" } },
     Field({
@@ -37,7 +37,7 @@ const DoorLock = Cluster(
       conformance: "O",
       constraint: "1",
       description: "RfidCredential",
-      details: "If the User Feature is also supported then any RFID credential stored in the lock shall be associated with a User.\nA 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\nIndex may have several credentials associated with it.",
+      details: "If the User Feature is also supported then any RFID credential stored in the lock shall be associated with a User.\nA 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 Index may have several credentials associated with it.",
       xref: { document: "cluster", section: "5.2.4.2" }
     }),
     Field({
@@ -48,21 +48,13 @@ const DoorLock = Cluster(
       details: "Currently the cluster only defines the metadata format for notifications when a fingerprint/ finger vein credential is used to access the lock and doesn\u2019t describe how to create fingerprint/finger vein credentials. If the Users feature is also supported then the User that a fingerprint/finger vein is associated with can also have its UserType, UserStatus and Schedule modified.\nA 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 Finger index. A User Index may have several credentials associated with it.",
       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.\nWeek 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.",
-      xref: { document: "cluster", section: "5.2.4.5" }
+      details: "If the User feature is supported then Week Day Schedules are applied to a User and not a credential.\nWeek Day Schedules are used to restrict access to a specified time window on certain days of the week. The schedule is repeated each week.\nThe lock may automatically adjust the UserType when a schedule is created or cleared.\nSupport for WeekDayAccessSchedules requires that the lock has the capability of keeping track of local time.",
+      xref: { document: "cluster", section: "5.2.4.4" }
     }),
     Field({
       name: "DPS",
@@ -70,7 +62,7 @@ const DoorLock = Cluster(
       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({
       name: "FACE",
@@ -78,47 +70,39 @@ const DoorLock = Cluster(
       constraint: "6",
       description: "FaceCredentials",
       details: "Currently the cluster only defines the metadata format for notifications when a face recognition, iris, or retina credential is used to access the lock and doesn\u2019t describe how to create face recognition, iris, or retina credentials. If the Users feature is also supported then the User that a face recognition, iris, or retina credential is associated with can also have its UserType, UserStatus and Schedule modified.\nA 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 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" }
+      details: "If this feature is supported then the lock supports the ability to verify a credential provided in a\nlock/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.7" }
     }),
     Field({
       name: "USR",
-      conformance: "[PIN | RID | FGP | FACE]",
+      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.\nYear 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" }
+      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.\nThe lock may automatically adjust the UserType when a schedule is created or cleared.\nSupport 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" }
+      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.\nSupport for HolidaySchedules requires that the lock has the capability of keeping track of local time.",
+      xref: { document: "cluster", section: "5.2.4.10" }
     }),
     Field({
       name: "UBOLT",
@@ -126,6 +110,22 @@ const DoorLock = Cluster(
       constraint: "12",
       description: "Unbolting",
       details: "Locks that support this feature differentiate between unbolting and unlocking. The Unbolt Door command retracts the bolt without pulling the latch. The Unlock Door command fully unlocks the door 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\u2019t 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" }
     })
   ),
@@ -136,9 +136,9 @@ const DoorLock = Cluster(
     access: "R V",
     conformance: "M",
     constraint: "desc",
-    quality: "X S P",
+    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 first lock actuation is completed.\nThe Not Fully Locked value is used by a lock to indicate that the state of the lock is somewhere 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",
@@ -148,7 +148,7 @@ const DoorLock = Cluster(
     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",
@@ -157,7 +157,7 @@ const DoorLock = Cluster(
     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({
     name: "DoorState",
@@ -168,7 +168,7 @@ const DoorLock = Cluster(
     constraint: "desc",
     quality: "X P",
     details: "Indicates the current door state as defined in DoorStateEnum.\nNull 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",
@@ -177,7 +177,7 @@ const DoorLock = Cluster(
     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",
@@ -186,7 +186,7 @@ const DoorLock = Cluster(
     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",
@@ -195,18 +195,7 @@ const DoorLock = Cluster(
     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: 16,
-    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",
@@ -217,7 +206,7 @@ const DoorLock = Cluster(
     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",
@@ -228,7 +217,7 @@ const DoorLock = Cluster(
     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",
@@ -239,7 +228,7 @@ const DoorLock = Cluster(
     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",
@@ -247,10 +236,11 @@ const DoorLock = Cluster(
     type: "uint8",
     access: "R V",
     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",
@@ -258,10 +248,11 @@ const DoorLock = Cluster(
     type: "uint8",
     access: "R V",
     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",
@@ -269,10 +260,11 @@ const DoorLock = Cluster(
     type: "uint8",
     access: "R V",
     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",
@@ -282,7 +274,7 @@ const DoorLock = Cluster(
     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",
@@ -292,7 +284,7 @@ const DoorLock = Cluster(
     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({
     name: "MaxRfidCodeLength",
@@ -302,7 +294,7 @@ const DoorLock = Cluster(
     conformance: "RID",
     quality: "F",
     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({
     name: "MinRfidCodeLength",
@@ -312,7 +304,7 @@ const DoorLock = Cluster(
     conformance: "RID",
     quality: "F",
     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({
     name: "CredentialRulesSupport",
@@ -323,7 +315,7 @@ const DoorLock = Cluster(
     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({
     name: "NumberOfCredentialsSupportedPerUser",
@@ -334,18 +326,7 @@ const DoorLock = Cluster(
     default: 0,
     quality: "F",
     details: "Indicates the number of credentials that could be assigned for each user.\nDepending on the value of NumberOfRFIDUsersSupported and NumberOfPINUsersSupported it may not be possible to assign that number of credentials for a user.\nFor example, if the device supports only PIN and RFID credential types, NumberOfCredentialsSupportedPerUser is set to 10, NumberOfPINUsersSupported is set to 5 and 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: 32,
-    type: "bool",
-    access: "R[W] VA",
-    conformance: "LOG",
-    default: true,
-    quality: "P",
-    details: "This attribute shall enable/disable event logging.\nWhen 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({
     name: "Language",
@@ -356,7 +337,7 @@ 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",
@@ -367,7 +348,7 @@ const DoorLock = Cluster(
     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({
     name: "AutoRelockTime",
@@ -377,7 +358,7 @@ const DoorLock = Cluster(
     conformance: "O",
     quality: "P",
     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",
@@ -388,7 +369,7 @@ const DoorLock = Cluster(
     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",
@@ -400,7 +381,7 @@ const DoorLock = Cluster(
     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({
     name: "SupportedOperatingModes",
@@ -411,7 +392,7 @@ const DoorLock = Cluster(
     default: 65526,
     quality: "F",
     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({
     name: "DefaultConfigurationRegister",
@@ -421,8 +402,8 @@ 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\u2026) and represents the default setting for some of the attributes within this cluster (for example: LED, Auto Lock, Sound Volume, and Operating Mode attributes).\nThis 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 clients to know what the device\u2019s original settings were in the event that the device needs to be restored to factory default settings.\nIf the Client device would like to query and modify the door lock server\u2019s operating settings, it SHOULD send read and write attribute requests to the specific attributes.\nFor example, the Sound Volume attribute default value is Silent Mode. However, it is possible that 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" }
+    details: "Indicates the default configurations as they are physically set on the device (example: hardware dip switch setting, etc\u2026) and represents the default setting for some of the\nattributes within this cluster (for example: LED, Auto Lock, Sound Volume, and Operating Mode attributes).\nThis 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 clients to know what the device\u2019s original settings were in the event that the device needs to be restored to factory default settings.\nIf the Client device would like to query and modify the door lock server\u2019s operating settings, it SHOULD send read and write attribute requests to the specific attributes.\nFor example, the Sound Volume attribute default value is Silent Mode. However, it is possible that 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.26" }
   }),
   Attribute({
     name: "EnableLocalProgramming",
@@ -433,7 +414,7 @@ const DoorLock = Cluster(
     default: true,
     quality: "P",
     details: "This attribute shall enable/disable local programming on the door lock of certain features (see LocalProgrammingFeatures attribute). If this value is set to TRUE then local programming is enabled 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({
     name: "EnableOneTouchLocking",
@@ -444,7 +425,7 @@ 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({
     name: "EnableInsideStatusLed",
@@ -455,7 +436,7 @@ 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({
     name: "EnablePrivacyModeButton",
@@ -466,7 +447,7 @@ 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({
     name: "LocalProgrammingFeatures",
@@ -477,7 +458,7 @@ const DoorLock = Cluster(
     default: 0,
     quality: "P",
     details: "Indicates the local programming features that will be disabled when EnableLocalProgramming attribute is set to False. If a door lock doesn\u2019t support disabling one aspect of local programming it shall return CONSTRAINT_ERROR during a write operation of this attribute. If the EnableLocalProgramming attribute is set to True then all local programming features shall be enabled regardless of the bits set to 0 in this attribute.\nThe 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({
     name: "WrongCodeEntryLimit",
@@ -488,7 +469,7 @@ const DoorLock = Cluster(
     constraint: "1 to 255",
     quality: "P",
     details: "Indicates the number of incorrect Pin codes or RFID presentment attempts a user is allowed to enter before the lock will enter a lockout state. The value of this attribute is compared to all failing forms of credential presentation, including Pin codes used in an Unlock Command when RequirePINforRemoteOperation is set to true. Valid range is 1-255 incorrect attempts. The lockout state will be for the duration of UserCodeTemporaryDisableTime. If the attribute accepts writes and an attempt to write the value 0 is made, the device shall respond with CONSTRAINT_ERROR.\nThe lock may reset the counter used to track incorrect credential presentations as required by 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({
     name: "UserCodeTemporaryDisableTime",
@@ -499,7 +480,7 @@ const DoorLock = Cluster(
     constraint: "1 to 255",
     quality: "P",
     details: "Indicates the number of seconds that the lock shuts down following wrong code entry. Valid range is 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({
     name: "SendPinOverTheAir",
@@ -509,8 +490,8 @@ const DoorLock = Cluster(
     conformance: "[!USR & PIN]",
     default: true,
     quality: "P",
-    details: 'Indicates the door locks ability to send PINs over the air. If the attribute is True it is ok for the door lock server to send PINs over the air. This attribute determines the behavior of the server\u2019s TX operation. If it is false, then it is not ok for the device to send PIN in any messages over the air.\nThe 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.',
-    xref: { document: "cluster", section: "5.2.9.37" }
+    details: 'Indicates the door locks ability to send PINs over the air. If the attribute is True it is ok for the door lock server to send PINs over the air. This attribute determines the behavior of the server\u2019s TX operation. If it is false, then it is not ok for the device to send PIN in any messages over the air.\nThe PIN field within any door lock cluster message shall keep the first octet unchanged and\nmasks 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.34" }
   }),
   Attribute({
     name: "RequirePinForRemoteOperation",
@@ -521,11 +502,12 @@ const DoorLock = Cluster(
     default: true,
     quality: "P",
     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: 52,
+    access: "R V",
     conformance: "D",
     default: "0",
     xref: { document: "cluster", section: "5.2.9" }
@@ -539,7 +521,7 @@ const DoorLock = Cluster(
     constraint: "1 to 2880",
     quality: "P",
     details: "Indicates the number of minutes a PIN, RFID, Fingerprint, or other credential associated with a 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({
     name: "AlarmMask",
@@ -550,105 +532,118 @@ const DoorLock = Cluster(
     default: 65535,
     quality: "P",
     details: "This attribute is only supported if the Alarms cluster is on the same endpoint. The alarm mask is used to turn on/off alarms for particular functions. Alarms for an alarm group are enabled if the associated alarm mask bit is set. Each bit represents a group of alarms. Entire alarm groups can be turned on or off by setting or clearing the associated bit in the alarm mask.\nThis mask DOES NOT apply to the Events mechanism of this cluster.",
-    xref: { document: "cluster", section: "5.2.9.40" }
-  }),
-  Attribute({
-    name: "KeypadOperationEventMask",
-    id: 65,
-    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.\nThis 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: 66,
-    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.\nThis mask DOES NOT apply to the Events mechanism of this cluster.",
-    xref: { document: "cluster", section: "5.2.9.42" }
+    name: "AliroReaderVerificationKey",
+    id: 128,
+    type: "octstr",
+    access: "R A",
+    conformance: "ALIRO",
+    constraint: "65",
+    default: null,
+    quality: "X",
+    details: "Indicates the verification key component of the Reader\u2019s 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.\nNull 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: 67,
-    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.\nThis mask DOES NOT apply to the Events mechanism of this cluster.",
-    xref: { document: "cluster", section: "5.2.9.43" }
+    name: "AliroReaderGroupIdentifier",
+    id: 129,
+    type: "octstr",
+    access: "R A",
+    conformance: "ALIRO",
+    constraint: "16",
+    default: null,
+    quality: "X",
+    details: "Indicates the reader_group_identifier as defined in [Aliro].\nNull 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: 68,
-    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.\nThis mask DOES NOT apply to the Events mechanism of this cluster.",
-    xref: { document: "cluster", section: "5.2.9.44" }
+    name: "AliroReaderGroupSubIdentifier",
+    id: 130,
+    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: 69,
-      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.\nThis mask DOES NOT apply to the Events mechanism of this cluster.",
-      xref: { document: "cluster", section: "5.2.9.45" }
-    },
-    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" })
-  ),
-  Attribute(
-    {
-      name: "RemoteProgrammingEventMask",
-      id: 70,
-      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.\nThis mask DOES NOT apply to the Events mechanism of this cluster.",
-      xref: { document: "cluster", section: "5.2.9.46" }
+      name: "AliroExpeditedTransactionSupportedProtocolVersions",
+      id: 131,
+      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: "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: "AliroGroupResolvingKey",
+    id: 132,
+    type: "octstr",
+    access: "R A",
+    conformance: "ALBU",
+    constraint: "16",
+    default: null,
+    quality: "X",
+    details: "Indicates the Group Resolving Key as defined in [Aliro].\nNull if no group resolving key has been configured on the lock. See SetAliroReaderConfig.",
+    xref: { document: "cluster", section: "5.2.9.42" }
+  }),
   Attribute(
     {
-      name: "RfidProgrammingEventMask",
-      id: 71,
-      type: "EventMaskBitmap",
-      access: "RW VA",
-      conformance: "[NOT & RID]",
-      default: 65535,
-      quality: "P",
-      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.\nThis mask DOES NOT apply to the Events mechanism of this cluster.\nThis mask DOES NOT apply to the Events mechanism of this cluster.",
-      xref: { document: "cluster", section: "5.2.9.47" }
+      name: "AliroSupportedBleuwbProtocolVersions",
+      id: 133,
+      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: "IdAdded", constraint: "5" }),
-    Field({ name: "IdCleared", constraint: "6" })
+    Field({ name: "entry", type: "octstr" })
   ),
+  Attribute({
+    name: "AliroBleAdvertisingVersion",
+    id: 134,
+    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" }
+  }),
+  Attribute({
+    name: "NumberOfAliroCredentialIssuerKeysSupported",
+    id: 135,
+    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" }
+  }),
+  Attribute({
+    name: "NumberOfAliroEndpointKeysSupported",
+    id: 136,
+    type: "uint16",
+    access: "R V",
+    conformance: "ALIRO",
+    default: 0,
+    quality: "F",
+    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.\nNOTE\nThe 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(
     {
       name: "DoorLockAlarm",
@@ -694,7 +689,7 @@ const DoorLock = Cluster(
       access: "V",
       conformance: "M",
       priority: "critical",
-      details: "The door lock server sends out a LockOperation event when the event is triggered by the various lock operation sources.\n  \u2022 If the door lock server supports the Unbolt Door command, it shall generate a LockOperation     event with LockOperationType set to Unlock after an Unbolt Door command succeeds.\n  \u2022 If the door lock server supports the Unbolting feature and an Unlock Door command is performed,     it shall generate a LockOperation event with LockOperationType set to Unlatch when the     unlatched state is reached and a LockOperation event with LockOperationType set to Unlock when     the lock successfully completes the unlock \u2192 hold latch \u2192 release latch and return to unlock     state operation.\n  \u2022 If the command fails during holding or releasing the latch but after passing the unlocked     state, the door lock server shall generate a LockOperationError event with LockOperationType     set to Unlatch and a LockOperation event with LockOperationType set to Unlock.\n    \u25E6 If it fails before reaching the unlocked state, the door lock server shall generate only a       LockOperationError event with LockOperationType set to Unlock.\n  \u2022 Upon manual actuation, a door lock server that supports the Unbolting feature:\n    \u25E6 shall generate a LockOperation event of LockOperationType Unlatch when it is actuated from       the outside.\n    \u25E6 may generate a LockOperation event of LockOperationType Unlatch when it is actuated from the       inside.",
+      details: "The door lock server sends out a LockOperation event when the event is triggered by the various lock operation sources.\n  \u2022 If the door lock server supports the Unbolt Door command, it shall generate a LockOperation     event with LockOperationType set to Unlock after an Unbolt Door command succeeds.\n  \u2022 If the door lock server supports the Unbolting feature and an Unlock Door command is performed,     it shall generate a LockOperation event with LockOperationType set to Unlatch when the     unlatched state is reached and a LockOperation event with LockOperationType set to Unlock when     the lock successfully completes the unlock \u2192 hold latch \u2192 release latch and return to unlock     state operation.\n  \u2022 If the command fails during holding or releasing the latch but after passing the unlocked     state, the door lock server shall generate a LockOperationError event with LockOperationType     set to Unlatch and a LockOperation event with LockOperationType set to Unlock.\n    \u25E6 If it fails before reaching the unlocked state, the door lock server shall generate only a       LockOperationError event with LockOperationType set to Unlock.\n  \u2022 Upon manual actuation, a door lock server that supports the Unbolting feature:\n    \u25E6 shall generate a LockOperation event of LockOperationType Unlatch when it is actuated from       the outside.\n    \u25E6 may generate a LockOperation event of LockOperationType Unlatch when it is actuated\nfrom the inside.",
       xref: { document: "cluster", section: "5.2.11.3" }
     },
     Field({
@@ -860,7 +855,7 @@ const DoorLock = Cluster(
       id: 2,
       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" }
     }),
@@ -909,7 +904,7 @@ const DoorLock = Cluster(
       conformance: "M",
       direction: "request",
       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\u2020 The PIN/RFID Code is an obsolete field name, use PINCode instead.",
+      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.",
       xref: { document: "cluster", section: "5.2.10.1" }
     },
     Field({
@@ -929,7 +924,7 @@ const DoorLock = Cluster(
       conformance: "M",
       direction: "request",
       response: "status",
-      details: "This command causes the lock device to unlock the door. This command includes an optional code for the lock. The door lock may require a code depending on the value of the RequirePINForRemoteOperation attribute.\nNOTE\nIf the attribute AutoRelockTime is supported the lock will transition to the locked state when the auto relock time has expired.\n\u2020 The PIN/RFID Code is an obsolete field name, use PINCode instead.",
+      details: "This command causes the lock device to unlock the door. This command includes an optional code for the lock. The door lock may require a code depending on the value of the RequirePINForRemoteOperation attribute.\nNOTE\nIf 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.2" }
     },
     Field({
@@ -958,7 +953,7 @@ const DoorLock = Cluster(
       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\nas 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\u2020 The PIN/RFID Code is an obsolete field name, use PINCode instead.",
+      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 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" }
     },
     Field({
@@ -978,88 +973,6 @@ const DoorLock = Cluster(
       xref: { document: "cluster", section: "5.2.10.3.2" }
     })
   ),
-  Command(
-    {
-      name: "GetLogRecord",
-      id: 4,
-      access: "M",
-      conformance: "LOG",
-      direction: "request",
-      response: "GetLogRecordResponse",
-      details: "Request a log record. Log number is between 1 \u2013 [Number of Log Records Supported attribute]. If log number 0 is requested then the most recent log entry is returned.\nLog 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: 0, type: "uint16", conformance: "M", constraint: "desc" })
-  ),
-  Command(
-    {
-      name: "GetLogRecordResponse",
-      id: 4,
-      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: 0,
-      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: 1,
-      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: 2,
-      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: 3,
-      type: "EventSourceEnum",
-      conformance: "M",
-      details: "This field shall indicate the source value as defined in EventSourceEnum.\nIf 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: 4,
-      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: 5,
-      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: 6,
-      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",
@@ -1069,7 +982,7 @@ const DoorLock = Cluster(
       direction: "request",
       response: "status",
       details: "Set a PIN Code into the lock.\nReturn 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",
@@ -1078,7 +991,7 @@ const DoorLock = Cluster(
       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({
       name: "UserStatus",
@@ -1089,7 +1002,7 @@ 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: 2, type: "UserTypeEnum", conformance: "M", default: 0, quality: "X" }),
     Field({ name: "Pin", id: 3, type: "octstr", conformance: "M" })
@@ -1103,7 +1016,7 @@ const DoorLock = Cluster(
       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",
@@ -1112,7 +1025,7 @@ const DoorLock = Cluster(
       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" }
     })
   ),
   Command(
@@ -1122,7 +1035,7 @@ const DoorLock = Cluster(
       conformance: "!USR & PIN",
       direction: "response",
       details: "Returns the PIN for the specified user ID.\nIf the requested UserID is valid and the Code doesn\u2019t exist, Get RFID Code Response shall have the following format:\nUserID = requested User ID UserStatus = 0 (Available) UserType = Null (Not supported) PINCode = 0 (zero length)\nIf the requested UserID is invalid, send Default Response with an error status. The error status 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: 0, type: "uint16", conformance: "M", constraint: "desc" }),
     Field({
@@ -1145,8 +1058,8 @@ const DoorLock = Cluster(
       conformance: "!USR & PIN",
       direction: "request",
       response: "status",
-      details: "Clear a PIN code or all PIN codes.\n\u2020 The User ID is an obsolete field name, use PINSlotIndex instead.\nFor each PIN Code cleared whose user doesn\u2019t have a RFID Code or other credential type, then corresponding user record\u2019s 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" }
+      details: "Clear a PIN code or all PIN codes.\nFor each PIN Code cleared whose user doesn\u2019t have a RFID Code or other credential type, then corresponding user record\u2019s 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.7" }
     },
     Field({
       name: "PinSlotIndex",
@@ -1155,7 +1068,7 @@ const DoorLock = Cluster(
       conformance: "M",
       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" }
     })
   ),
   Command({
@@ -1166,7 +1079,7 @@ const DoorLock = Cluster(
     direction: "request",
     response: "status",
     details: "Clear out all PINs on the lock.\nNOTE\nOn 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(
     {
@@ -1177,7 +1090,7 @@ const DoorLock = Cluster(
       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",
@@ -1186,7 +1099,7 @@ const DoorLock = Cluster(
       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",
@@ -1195,7 +1108,7 @@ const DoorLock = Cluster(
       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" }
     })
   ),
   Command(
@@ -1207,7 +1120,7 @@ const DoorLock = Cluster(
       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",
@@ -1216,7 +1129,7 @@ const DoorLock = Cluster(
       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" }
     })
   ),
   Command(
@@ -1226,7 +1139,7 @@ const DoorLock = Cluster(
       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",
@@ -1235,7 +1148,7 @@ const DoorLock = Cluster(
       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",
@@ -1243,7 +1156,7 @@ const DoorLock = Cluster(
       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" }
     })
   ),
   Command(
@@ -1254,8 +1167,8 @@ const DoorLock = Cluster(
       conformance: "WDSCH",
       direction: "request",
       response: "status",
-      details: "Set a weekly repeating schedule for a specified user.\n\u2020 The Schedule ID and User ID are obsolete field names, use WeekDayIndex and UserIndex instead, respectively.\nThe associated UserType may be changed to ScheduleRestrictedUser by the lock when a Week Day schedule is set.\nReturn status shall be one of the following values:",
-      xref: { document: "cluster", section: "5.2.10.14" }
+      details: "Set a weekly repeating schedule for a specified user.\nThe associated UserType may be changed to ScheduleRestrictedUser by the lock when a Week Day schedule is set.\nReturn status shall be one of the following values:",
+      xref: { document: "cluster", section: "5.2.10.12" }
     },
     Field({
       name: "WeekDayIndex",
@@ -1264,14 +1177,16 @@ const DoorLock = Cluster(
       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",
+      name: "UserIndex",
       id: 1,
       type: "uint16",
       conformance: "M",
-      constraint: "1 to numberOfTotalUsersSupported"
+      constraint: "1 to numberOfTotalUsersSupported",
+      details: "This field shall indicate the user ID.",
+      xref: { document: "cluster", section: "5.2.10.12.2" }
     }),
     Field({
       name: "DaysMask",
@@ -1279,43 +1194,43 @@ const DoorLock = Cluster(
       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: 3,
       type: "uint8",
       conformance: "M",
-      constraint: "0 to 23",
+      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: 4,
       type: "uint8",
       conformance: "M",
-      constraint: "0 to 59",
+      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: 5,
       type: "uint8",
       conformance: "M",
-      constraint: "0 to 23",
+      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: 6,
       type: "uint8",
       conformance: "M",
-      constraint: "0 to 59",
+      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.\nIf 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" }
     })
   ),
   Command(
@@ -1326,8 +1241,8 @@ const DoorLock = Cluster(
       conformance: "WDSCH",
       direction: "request",
       response: "GetWeekDayScheduleResponse",
-      details: "Retrieve the specific weekly schedule for the specific user.\n\u2020 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({
       name: "WeekDayIndex",
@@ -1337,7 +1252,7 @@ const DoorLock = Cluster(
       constraint: "1 to numberOfWeekDaySchedulesSupportedPerUser"
     }),
     Field({
-      name: "UserIndexUserId",
+      name: "UserIndex",
       id: 1,
       type: "uint16",
       conformance: "M",
@@ -1350,8 +1265,8 @@ const DoorLock = Cluster(
       id: 12,
       conformance: "WDSCH",
       direction: "response",
-      details: "Returns the weekly repeating schedule data for the specified schedule index.\n\u2020 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",
@@ -1360,14 +1275,16 @@ const DoorLock = Cluster(
       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",
+      name: "UserIndex",
       id: 1,
       type: "uint16",
       conformance: "M",
-      constraint: "1 to numberOfTotalUsersSupported"
+      constraint: "1 to numberOfTotalUsersSupported",
+      details: "This field shall indicate the user ID.",
+      xref: { document: "cluster", section: "5.2.10.14.2" }
     }),
     Field({
       name: "Status",
@@ -1377,7 +1294,7 @@ const DoorLock = Cluster(
       constraint: "desc",
       default: 0,
       details: "Status shall be one of the following values:\n  \u2022 SUCCESS if both WeekDayIndex and UserIndex are valid and there is a corresponding schedule     entry.\n  \u2022 INVALID_COMMAND if either WeekDayIndex and/or UserIndex values are not within valid range\n  \u2022 NOT_FOUND if no corresponding schedule entry found for WeekDayIndex.\n  \u2022 NOT_FOUND if no corresponding user entry found for UserIndex.\nIf 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: 3, type: "DaysMaskBitmap", conformance: "O" }),
     Field({
@@ -1385,36 +1302,36 @@ const DoorLock = Cluster(
       id: 4,
       type: "uint8",
       conformance: "O",
-      constraint: "0 to 23",
+      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: 5,
       type: "uint8",
       conformance: "O",
-      constraint: "0 to 59",
+      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: 6,
       type: "uint8",
       conformance: "O",
-      constraint: "0 to 23",
+      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: 7,
       type: "uint8",
       conformance: "O",
-      constraint: "0 to 59",
+      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" }
     })
   ),
   Command(
@@ -1425,8 +1342,8 @@ const DoorLock = Cluster(
       conformance: "WDSCH",
       direction: "request",
       response: "status",
-      details: "Clear the specific weekly schedule or all weekly schedules for the specific user.\n\u2020 The Schedule ID and User ID are obsolete field names, use WeekDayIndex and UserIndex instead, respectively.\nReturn status shall be one of the following values:",
-      xref: { document: "cluster", section: "5.2.10.17" }
+      details: "Clear the specific weekly schedule or all weekly schedules for the specific user.\nReturn status shall be one of the following values:",
+      xref: { document: "cluster", section: "5.2.10.15" }
     },
     Field({
       name: "WeekDayIndex",
@@ -1435,14 +1352,16 @@ const DoorLock = Cluster(
       conformance: "M",
       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",
+      name: "UserIndex",
       id: 1,
       type: "uint16",
       conformance: "M",
-      constraint: "1 to numberOfTotalUsersSupported"
+      constraint: "1 to numberOfTotalUsersSupported",
+      details: "This field shall indicate the user ID.",
+      xref: { document: "cluster", section: "5.2.10.15.2" }
     })
   ),
   Command(
@@ -1453,8 +1372,8 @@ const DoorLock = Cluster(
       conformance: "YDSCH",
       direction: "request",
       response: "status",
-      details: "Set a time-specific schedule ID for a specified user.\n\u2020 The Schedule ID and User ID are obsolete field names, use YearDayIndex and UserIndex instead, respectively.\nThe associated UserType may be changed to ScheduleRestrictedUser by the lock when a Year Day schedule is set.\nReturn status shall be one of the following values:",
-      xref: { document: "cluster", section: "5.2.10.18" }
+      details: "Set a time-specific schedule ID for a specified user.\nThe associated UserType may be changed to ScheduleRestrictedUser by the lock when a Year Day schedule is set.\nReturn status shall be one of the following values:",
+      xref: { document: "cluster", section: "5.2.10.16" }
     },
     Field({
       name: "YearDayIndex",
@@ -1463,14 +1382,16 @@ const DoorLock = Cluster(
       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",
+      name: "UserIndex",
       id: 1,
       type: "uint16",
       conformance: "M",
-      constraint: "1 to numberOfTotalUsersSupported"
+      constraint: "1 to numberOfTotalUsersSupported",
+      details: "This field shall indicate the user ID.",
+      xref: { document: "cluster", section: "5.2.10.16.2" }
     }),
     Field({
       name: "LocalStartTime",
@@ -1478,7 +1399,7 @@ const DoorLock = Cluster(
       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({
       name: "LocalEndTime",
@@ -1486,7 +1407,7 @@ const DoorLock = Cluster(
       type: "epoch-s",
       conformance: "M",
       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" }
     })
   ),
   Command(
@@ -1497,8 +1418,8 @@ const DoorLock = Cluster(
       conformance: "YDSCH",
       direction: "request",
       response: "GetYearDayScheduleResponse",
-      details: "Retrieve the specific year day schedule for the specific schedule and user indexes.\n\u2020 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({
       name: "YearDayIndex",
@@ -1508,7 +1429,7 @@ const DoorLock = Cluster(
       constraint: "1 to numberOfYearDaySchedulesSupportedPerUser"
     }),
     Field({
-      name: "UserIndexUserId",
+      name: "UserIndex",
       id: 1,
       type: "uint16",
       conformance: "M",
@@ -1521,8 +1442,8 @@ const DoorLock = Cluster(
       id: 15,
       conformance: "YDSCH",
       direction: "response",
-      details: "Returns the year day schedule data for the specified schedule and user indexes.\n\u2020 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",
@@ -1531,14 +1452,16 @@ const DoorLock = Cluster(
       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",
+      name: "UserIndex",
       id: 1,
       type: "uint16",
       conformance: "M",
-      constraint: "1 to numberOfTotalUsersSupported"
+      constraint: "1 to numberOfTotalUsersSupported",
+      details: "This field shall indicate the user ID.",
+      xref: { document: "cluster", section: "5.2.10.18.2" }
     }),
     Field({
       name: "Status",
@@ -1548,7 +1471,7 @@ const DoorLock = Cluster(
       constraint: "desc",
       default: 0,
       details: "Status shall be one of the following values:\n  \u2022 SUCCESS if both YearDayIndex and UserIndex are valid and there is a corresponding schedule     entry.\n  \u2022 INVALID_COMMAND if either YearDayIndex and/or UserIndex values are not within valid range\n  \u2022 NOT_FOUND if no corresponding schedule entry found for YearDayIndex.\n  \u2022 NOT_FOUND if no corresponding user entry found for UserIndex.\nIf 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({
       name: "LocalStartTime",
@@ -1556,7 +1479,7 @@ const DoorLock = Cluster(
       type: "epoch-s",
       conformance: "O",
       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({
       name: "LocalEndTime",
@@ -1564,7 +1487,7 @@ const DoorLock = Cluster(
       type: "epoch-s",
       conformance: "O",
       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. 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" }
     })
   ),
   Command(
@@ -1575,8 +1498,8 @@ const DoorLock = Cluster(
       conformance: "YDSCH",
       direction: "request",
       response: "status",
-      details: "Clears the specific year day schedule or all year day schedules for the specific user.\n\u2020 The Schedule ID and User ID are obsolete field names, use YearDayIndex and UserIndex instead, respectively.\nReturn status shall be one of the following values:",
-      xref: { document: "cluster", section: "5.2.10.21" }
+      details: "Clears the specific year day schedule or all year day schedules for the specific user.\nReturn status shall be one of the following values:",
+      xref: { document: "cluster", section: "5.2.10.19" }
     },
     Field({
       name: "YearDayIndex",
@@ -1585,14 +1508,16 @@ const DoorLock = Cluster(
       conformance: "M",
       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",
+      name: "UserIndex",
       id: 1,
       type: "uint16",
       conformance: "M",
-      constraint: "1 to numberOfTotalUsersSupported"
+      constraint: "1 to numberOfTotalUsersSupported",
+      details: "This field shall indicate the user ID.",
+      xref: { document: "cluster", section: "5.2.10.19.2" }
     })
   ),
   Command(
@@ -1603,8 +1528,8 @@ const DoorLock = Cluster(
       conformance: "HDSCH",
       direction: "request",
       response: "status",
-      details: "Set the holiday Schedule by specifying local start time and local end time with respect to any Lock Operating Mode.\n\u2020 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" }
+      details: "Set the holiday Schedule by specifying local start time and local end time with respect to any Lock Operating Mode.\nReturn status shall be one of the following values:",
+      xref: { document: "cluster", section: "5.2.10.20" }
     },
     Field({
       name: "HolidayIndex",
@@ -1613,7 +1538,7 @@ const DoorLock = Cluster(
       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({
       name: "LocalStartTime",
@@ -1621,7 +1546,7 @@ const DoorLock = Cluster(
       type: "epoch-s",
       conformance: "M",
       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({
       name: "LocalEndTime",
@@ -1629,7 +1554,7 @@ const DoorLock = Cluster(
       type: "epoch-s",
       conformance: "M",
       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",
@@ -1637,7 +1562,7 @@ const DoorLock = Cluster(
       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" }
     })
   ),
   Command(
@@ -1648,8 +1573,8 @@ const DoorLock = Cluster(
       conformance: "HDSCH",
       direction: "request",
       response: "GetHolidayScheduleResponse",
-      details: "Get the holiday schedule for the specified index.\n\u2020 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({
       name: "HolidayIndex",
@@ -1665,8 +1590,8 @@ const DoorLock = Cluster(
       id: 18,
       conformance: "HDSCH",
       direction: "response",
-      details: "Returns the Holiday Schedule Entry for the specified Holiday ID.\n\u2020 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",
@@ -1675,7 +1600,7 @@ const DoorLock = Cluster(
       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({
       name: "Status",
@@ -1685,7 +1610,7 @@ const DoorLock = Cluster(
       constraint: "desc",
       default: 0,
       details: "Status shall be one of the following values:\n  \u2022 FAILURE if the attribute NumberOfHolidaySchedulesSupported is zero.\n  \u2022 SUCCESS if the HolidayIndex is valid and there is a corresponding schedule entry.\n  \u2022 INVALID_COMMAND if the HolidayIndex is not within valid range\n  \u2022 NOT_FOUND if the HolidayIndex is within the valid range, however, there is not corresponding     schedule entry found.\nIf 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({
       name: "LocalStartTime",
@@ -1694,7 +1619,7 @@ const DoorLock = Cluster(
       conformance: "O",
       quality: "X",
       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({
       name: "LocalEndTime",
@@ -1703,7 +1628,7 @@ const DoorLock = Cluster(
       conformance: "O",
       quality: "X",
       details: "This field shall indicate the ending 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. 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",
@@ -1712,7 +1637,7 @@ const DoorLock = Cluster(
       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" }
     })
   ),
   Command(
@@ -1723,8 +1648,8 @@ const DoorLock = Cluster(
       conformance: "HDSCH",
       direction: "request",
       response: "status",
-      details: "Clears the holiday schedule or all holiday schedules.\n\u2020 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({
       name: "HolidayIndex",
@@ -1733,7 +1658,7 @@ const DoorLock = Cluster(
       conformance: "M",
       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" }
     })
   ),
   Command(
@@ -1745,7 +1670,7 @@ const DoorLock = Cluster(
       direction: "request",
       response: "status",
       details: "Set the user type for a specified user.\nFor user type value please refer to User Type Value.\nReturn 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",
@@ -1754,15 +1679,15 @@ const DoorLock = Cluster(
       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: 1,
       type: "UserTypeEnum",
       conformance: "M",
-      details: "This field shall indicate the user type.\nIf 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" }
     })
   ),
   Command(
@@ -1774,7 +1699,7 @@ const DoorLock = Cluster(
       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: 0, type: "uint16", conformance: "M", constraint: "desc" })
   ),
@@ -1785,7 +1710,7 @@ const DoorLock = Cluster(
       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: 0, type: "uint16", conformance: "M", constraint: "desc" }),
     Field({ name: "UserType", id: 1, type: "UserTypeEnum", conformance: "M" })
@@ -1799,7 +1724,7 @@ const DoorLock = Cluster(
       direction: "request",
       response: "status",
       details: "Set an ID for RFID access into the lock.\nReturn 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({
       name: "UserId",
@@ -1808,7 +1733,7 @@ const DoorLock = Cluster(
       conformance: "M",
       constraint: "desc",
       details: "This field shall indicate the user ID.\nThe 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({
       name: "UserStatus",
@@ -1819,7 +1744,7 @@ const DoorLock = Cluster(
       default: 1,
       quality: "X",
       details: "This field shall indicate what the status is for a specific user ID. The values are according to \u201CSet PIN\u201D while not all are supported.\nOnly 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",
@@ -1830,7 +1755,7 @@ const DoorLock = Cluster(
       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: 3, type: "octstr", conformance: "M" })
   ),
@@ -1843,7 +1768,7 @@ const DoorLock = Cluster(
       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({
       name: "UserId",
@@ -1852,7 +1777,7 @@ const DoorLock = Cluster(
       conformance: "M",
       constraint: "desc",
       details: "This field shall indicate the user ID.\nThe 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" }
     })
   ),
   Command(
@@ -1862,7 +1787,7 @@ const DoorLock = Cluster(
       conformance: "!USR & RID",
       direction: "response",
       details: "Returns the RFID code for the specified user ID.\nIf the requested User ID is valid and the Code doesn\u2019t exist, Get RFID Code Response shall have the following format:\nUser ID = requested User ID UserStatus = 0 (available) UserType = 0xFF (not supported) RFID Code = 0 (zero length)\nIf requested User ID is invalid, send Default Response with an error status. The error status 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.31" }
+      xref: { document: "cluster", section: "5.2.10.29" }
     },
     Field({ name: "UserId", id: 0, type: "uint16", conformance: "M", constraint: "desc" }),
     Field({
@@ -1885,8 +1810,8 @@ const DoorLock = Cluster(
       conformance: "!USR & RID",
       direction: "request",
       response: "status",
-      details: "Clear an RFID code or all RFID codes.\n\u2020 The User ID is an obsolete field name, use RFIDSlotIndex instead.\nFor each RFID Code cleared whose user doesn\u2019t have a PIN Code or other credential type, then the corresponding user record\u2019s 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" }
+      details: "Clear an RFID code or all RFID codes.\nFor each RFID Code cleared whose user doesn\u2019t have a PIN Code or other credential type, then the corresponding user record\u2019s 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.30" }
     },
     Field({
       name: "RfidSlotIndex",
@@ -1895,7 +1820,7 @@ const DoorLock = Cluster(
       conformance: "M",
       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" }
     })
   ),
   Command({
@@ -1906,7 +1831,7 @@ const DoorLock = Cluster(
     direction: "request",
     response: "status",
     details: 'Clear out all RFIDs on the lock. If you clear all RFID codes and this user didn\u2019t 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(
     {
@@ -1917,7 +1842,7 @@ const DoorLock = Cluster(
       direction: "request",
       response: "status",
       details: "Set user into the lock.\nFields used for different use cases:\nReturn status is a global status code or a cluster-specific status code from the Status Codes table and\nshall be one of the following values:\n  \u2022 SUCCESS, if setting User was successful.\n  \u2022 FAILURE, if some unexpected internal error occurred setting User.\n  \u2022 OCCUPIED, if OperationType is Add and UserIndex points to an occupied slot.\n  \u2022 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",
@@ -1926,7 +1851,7 @@ const DoorLock = Cluster(
       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",
@@ -1935,7 +1860,7 @@ const DoorLock = Cluster(
       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({
       name: "UserName",
@@ -1945,7 +1870,7 @@ const DoorLock = Cluster(
       constraint: "max 10",
       quality: "X",
       details: "This field shall contain a string to use as a human readable identifier for the user. If UserName is null then:\n  \u2022 If the OperationType is Add, the UserName in the resulting user record shall be set to an empty     string.\n  \u2022 If the OperationType is Modify, the UserName in the user record shall NOT be changed from the     current value.\nIf 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({
       name: "UserUniqueId",
@@ -1955,7 +1880,7 @@ const DoorLock = Cluster(
       default: 4294967295,
       quality: "X",
       details: "This field shall indicate the fabric assigned number to use for connecting this user to other users on other devices from the fabric\u2019s perspective.\nIf UserUniqueID is null then:\n  \u2022 If the OperationType is Add, the UserUniqueID in the resulting user record shall be set to     default value specified above.\n  \u2022 If the OperationType is Modify, the UserUniqueID in the user record shall NOT be changed from     the current value.\nIf 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({
       name: "UserStatus",
@@ -1966,7 +1891,7 @@ const DoorLock = Cluster(
       default: 1,
       quality: "X",
       details: "This field shall indicate the UserStatus to assign to this user when created or modified. If UserStatus is null then:\n  \u2022 If the OperationType is Add, the UserStatus in the resulting user record shall be set to     default value specified above.\n  \u2022 If the OperationType is Modify, the UserStatus in the user record shall NOT be changed from the     current value.\nIf 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({
       name: "UserType",
@@ -1977,7 +1902,7 @@ const DoorLock = Cluster(
       default: 0,
       quality: "X",
       details: "This field shall indicate the UserType to assign to this user when created or modified. If UserType is null then:\n  \u2022 If the OperationType is Add, the UserType in the resulting user record shall be set to default     value specified above.\n  \u2022 If the OperationType is Modify, the UserType in the user record shall NOT be changed from the     current value.\nIf 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({
       name: "CredentialRule",
@@ -1987,7 +1912,7 @@ const DoorLock = Cluster(
       default: 0,
       quality: "X",
       details: "This field shall indicate the CredentialRule to use for this user.\nThe valid CredentialRule enumeration values depends on the bits in the CredentialRulesBitmap map. Each bit in the map identifies a valid CredentialRule that can be used.\nIf CredentialRule is null then:\n  \u2022 If the OperationType is Add, the CredentialRule in the resulting user record shall be set to     default value specified above.\n  \u2022 If the OperationType is Modify, the CredentialRule in the user record shall NOT be changed from     the current value.\nIf 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" }
     })
   ),
   Command(
@@ -1999,7 +1924,7 @@ const DoorLock = Cluster(
       direction: "request",
       response: "GetUserResponse",
       details: "Retrieve user.\nAn InvokeResponse command shall be sent with an appropriate error\nCOMMAND, 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({
       name: "UserIndex",
@@ -2016,7 +1941,7 @@ const DoorLock = Cluster(
       conformance: "USR",
       direction: "response",
       details: "Returns the user for the specified UserIndex.\nIf 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",
@@ -2025,7 +1950,7 @@ const DoorLock = Cluster(
       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",
@@ -2035,7 +1960,7 @@ const DoorLock = Cluster(
       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",
@@ -2045,7 +1970,7 @@ const DoorLock = Cluster(
       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",
@@ -2055,7 +1980,7 @@ const DoorLock = Cluster(
       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",
@@ -2065,7 +1990,7 @@ const DoorLock = Cluster(
       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",
@@ -2076,7 +2001,7 @@ const DoorLock = Cluster(
       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(
       {
@@ -2087,7 +2012,7 @@ const DoorLock = Cluster(
         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" })
     ),
@@ -2098,7 +2023,7 @@ const DoorLock = Cluster(
       conformance: "M",
       quality: "X",
       details: "This field shall indicate the user\u2019s creator fabric index. CreatorFabricIndex shall be null if 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({
       name: "LastModifiedFabricIndex",
@@ -2107,7 +2032,7 @@ const DoorLock = Cluster(
       conformance: "M",
       quality: "X",
       details: "This field shall indicate the user\u2019s last modifier fabric index. LastModifiedFabricIndex shall be 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({
       name: "NextUserIndex",
@@ -2117,7 +2042,7 @@ const DoorLock = Cluster(
       constraint: "1 to numberOfTotalUsersSupported",
       quality: "X",
       details: "This field shall indicate the next occupied UserIndex in the database which is useful for quickly 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" }
     })
   ),
   Command(
@@ -2129,7 +2054,7 @@ const DoorLock = Cluster(
       direction: "request",
       response: "status",
       details: "Clears a user or all Users.\nFor each user to clear, all associated credentials (e.g. PIN, RFID, fingerprint, etc.) shall be cleared and the user entry values shall be reset to their default values (e.g. UserStatus shall be Available, UserType shall be UnrestrictedUser) and all associated schedules shall be cleared.\nA 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",
@@ -2138,85 +2063,7 @@ const DoorLock = Cluster(
       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: 32,
-    conformance: "[NOT]",
-    direction: "response",
-    xref: { document: "cluster", section: "5.2.10" }
-  }),
-  Command(
-    {
-      name: "ProgrammingEventNotification",
-      id: 33,
-      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.\nAs with operational events, all programming events can be turned on and off by flipping bits in the associated event mask.\nThe 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: 0,
-      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: 1, type: "ProgrammingEventCodeEnum", conformance: "M", constraint: "desc" }),
-    Field({
-      name: "UserId",
-      id: 2,
-      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: 3,
-      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: 4,
-      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: 5,
-      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: 6,
-      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: 7,
-      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" }
     })
   ),
   Command(
@@ -2228,7 +2075,7 @@ const DoorLock = Cluster(
       direction: "request",
       response: "SetCredentialResponse",
       details: "Set a credential (e.g. PIN, RFID, Fingerprint, etc.) into the lock for a new user, existing user, or ProgrammingUser.\nFields used for different use cases:",
-      xref: { document: "cluster", section: "5.2.10.40" }
+      xref: { document: "cluster", section: "5.2.10.36" }
     },
     Field({
       name: "OperationType",
@@ -2237,7 +2084,7 @@ const DoorLock = Cluster(
       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",
@@ -2245,7 +2092,7 @@ const DoorLock = Cluster(
       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({
       name: "CredentialData",
@@ -2254,7 +2101,7 @@ const DoorLock = Cluster(
       conformance: "M",
       constraint: "desc",
       details: "This field shall indicate the credential data to set for the credential being added or modified. 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({
       name: "UserIndex",
@@ -2264,7 +2111,7 @@ const DoorLock = Cluster(
       constraint: "1 to numberOfTotalUsersSupported",
       quality: "X",
       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({
       name: "UserStatus",
@@ -2275,7 +2122,7 @@ const DoorLock = Cluster(
       default: 1,
       quality: "X",
       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({
       name: "UserType",
@@ -2286,7 +2133,7 @@ const DoorLock = Cluster(
       default: 0,
       quality: "X",
       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" }
     })
   ),
   Command(
@@ -2296,7 +2143,7 @@ const DoorLock = Cluster(
       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({
       name: "Status",
@@ -2304,8 +2151,8 @@ const DoorLock = Cluster(
       type: "status",
       conformance: "M",
       constraint: "desc",
-      details: "Status comes from the Status Codes table and shall be one of the following values:\n  \u2022 SUCCESS, if setting user credential was successful.\n  \u2022 FAILURE, if some unexpected internal error occurred setting user credential.\n  \u2022 OCCUPIED, if OperationType is Add and CredentialIndex in Credential structure points to an     occupied slot.\n  \u2022 OCCUPIED, if OperationType is Modify and CredentialIndex in Credential structure does not match     the CredentialIndex that is already associated with the provided UserIndex.\n  \u2022 DUPLICATE, if CredentialData provided is a duplicate of another credential with the same     CredentialType (e.g. duplicate PIN code).\n  \u2022 RESOURCE_EXHAUSTED, if OperationType is Add and the user referred to by UserIndex already has     NumberOfCredentialsSupportedPerUser credentials associated.\n  \u2022 INVALID_COMMAND, if one or more fields violate constraints or are invalid.\n  \u2022 INVALID_COMMAND, if the CredentialIndex in the Credential provided exceeds the number of     credentials of the provided CredentialType supported by the lock.\n  \u2022 INVALID_COMMAND, if OperationType is Modify and UserIndex points to an available slot.",
-      xref: { document: "cluster", section: "5.2.10.41.1" }
+      details: "Status comes from the Status Codes table and shall be one of the following values:\n  \u2022 SUCCESS, if setting user credential was successful.\n  \u2022 FAILURE, if some unexpected internal error occurred setting user credential.\n  \u2022 OCCUPIED, if OperationType is Add and CredentialIndex in Credential structure points to an     occupied slot.\n  \u2022 OCCUPIED, if OperationType is Modify and CredentialIndex in Credential structure does not match     the CredentialIndex that is already associated with the provided UserIndex.\n  \u2022 DUPLICATE, if CredentialData provided is a duplicate of another credential with the same     CredentialType (e.g. duplicate PIN code).\n  \u2022 RESOURCE_EXHAUSTED, if OperationType is Add and the new credential cannot be added due to     resource constraints such as:\n    \u25E6 The user referred to by UserIndex already has NumberOfCredentialsSupportedPerUser credentials       associated.\n    \u25E6 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  \u2022 INVALID_COMMAND, if one or more fields violate constraints or are invalid.\n  \u2022 INVALID_COMMAND, if the CredentialIndex in the Credential provided exceeds the number of     credentials of the provided CredentialType supported by the lock.\n  \u2022 INVALID_COMMAND, if OperationType is Modify and UserIndex points to an available slot.",
+      xref: { document: "cluster", section: "5.2.10.37.1" }
     }),
     Field({
       name: "UserIndex",
@@ -2316,7 +2163,7 @@ const DoorLock = Cluster(
       default: 0,
       quality: "X",
       details: "This field shall indicate the user index that was created with the new credential. If the status being returned is not success then this shall be null. This shall be null if OperationType was 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({
       name: "NextCredentialIndex",
@@ -2326,7 +2173,7 @@ const DoorLock = Cluster(
       constraint: "desc",
       quality: "X",
       details: "This field shall indicate the next available index in the database for the credential type set, which is useful for quickly identifying available credential slots in the database. This shall NOT be null if there is at least one available entry after the requested credential index in the corresponding database and shall be null if there are no more available entries. The 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" }
     })
   ),
   Command(
@@ -2338,7 +2185,7 @@ const DoorLock = Cluster(
       direction: "request",
       response: "GetCredentialStatusResponse",
       details: "Retrieve the status of a particular credential (e.g. PIN, RFID, Fingerprint, etc.) by index.\nAn 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",
@@ -2346,7 +2193,7 @@ const DoorLock = Cluster(
       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" }
     })
   ),
   Command(
@@ -2356,7 +2203,7 @@ const DoorLock = Cluster(
       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",
@@ -2364,7 +2211,7 @@ const DoorLock = Cluster(
       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({
       name: "UserIndex",
@@ -2374,7 +2221,7 @@ const DoorLock = Cluster(
       constraint: "1 to numberOfTotalUsersSupported",
       quality: "X",
       details: "This field shall indicate the credential\u2019s corresponding user index value if the credential exists. 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({
       name: "CreatorFabricIndex",
@@ -2383,7 +2230,7 @@ const DoorLock = Cluster(
       conformance: "M",
       quality: "X",
       details: "This field shall indicate the credential\u2019s creator fabric index. CreatorFabricIndex shall be null 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({
       name: "LastModifiedFabricIndex",
@@ -2392,7 +2239,7 @@ const DoorLock = Cluster(
       conformance: "M",
       quality: "X",
       details: "This field shall indicate the credential\u2019s last modifier fabric index. LastModifiedFabricIndex 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({
       name: "NextCredentialIndex",
@@ -2401,8 +2248,18 @@ const DoorLock = Cluster(
       conformance: "O",
       constraint: "desc",
       quality: "X",
-      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.",
-      xref: { document: "cluster", section: "5.2.10.43.5" }
+      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\ndatabase 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: 5,
+      type: "octstr",
+      conformance: "[ALIRO]",
+      constraint: "desc",
+      quality: "X",
+      details: "This field shall indicate the credential data for the requested user index.\nIf the CredentialType in the GetCredentialStatus command was not AliroCredentialIssuerKey, AliroEvictableEndpointKey, or AliroNonEvictableEndpointKey, this field shall NOT be included.\nOtherwise, if CredentialExists is false this field shall be null.\nOtherwise, 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.\nNOTE\nSince 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.39.6" }
     })
   ),
   Command(
@@ -2413,8 +2270,8 @@ const DoorLock = Cluster(
       conformance: "USR",
       direction: "request",
       response: "status",
-      details: "Clear one, one type, or all credentials except ProgrammingPIN credential.\nFields used for different use cases:\nFor each credential cleared whose user doesn\u2019t 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\nthis case a LockUserChange event shall be generated for the user being cleared. Return status shall be one of the following values:",
-      xref: { document: "cluster", section: "5.2.10.44" }
+      details: "Clear one, one type, or all credentials except ProgrammingPIN credential.\nFields used for different use cases:\nFor each credential cleared whose user doesn\u2019t 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 this case a LockUserChange event shall be generated for the user being cleared.\nReturn status shall be one of the following values:",
+      xref: { document: "cluster", section: "5.2.10.40" }
     },
     Field({
       name: "Credential",
@@ -2424,7 +2281,7 @@ const DoorLock = Cluster(
       constraint: "desc",
       quality: "X",
       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" }
     })
   ),
   Command(
@@ -2436,7 +2293,7 @@ const DoorLock = Cluster(
       direction: "request",
       response: "status",
       details: "This command causes the lock device to unlock the door without pulling the latch. This command includes an optional code for the lock. The door lock may require a code depending on the value of the RequirePINForRemoteOperation attribute.\nNOTE\nIf 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",
@@ -2444,9 +2301,67 @@ const DoorLock = Cluster(
       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: 40,
+      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: 0,
+      type: "octstr",
+      conformance: "M",
+      constraint: "32",
+      details: "This field shall indicate the signing key component of the Reader\u2019s key pair.",
+      xref: { document: "cluster", section: "5.2.10.42.1" }
+    }),
+    Field({
+      name: "VerificationKey",
+      id: 1,
+      type: "octstr",
+      conformance: "M",
+      constraint: "65",
+      details: "This field shall indicate the verification key component of the Reader\u2019s 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: 2,
+      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: 3,
+      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: 41,
+    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.\nNOTE\nUsing 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",
@@ -2576,7 +2491,6 @@ 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({
@@ -2586,31 +2500,12 @@ 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: 0, conformance: "M", description: "Locking Mechanism Jammed" }),
     Field({ name: "LockFactoryReset", id: 1, conformance: "O", description: "Lock Reset to Factory Defaults" }),
@@ -2641,7 +2536,7 @@ 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",
@@ -2667,21 +2562,45 @@ 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: 0, conformance: "O", description: "Programming PIN code credential type" }),
     Field({ name: "Pin", id: 1, conformance: "PIN", description: "PIN code credential type" }),
     Field({ name: "Rfid", id: 2, conformance: "RID", description: "RFID identifier credential type" }),
     Field({ name: "Fingerprint", id: 3, conformance: "FGP", description: "Fingerprint identifier credential type" }),
     Field({ name: "FingerVein", id: 4, conformance: "FGP", description: "Finger vein identifier credential type" }),
-    Field({ name: "Face", id: 5, conformance: "FACE", description: "Face identifier credential type" })
+    Field({ name: "Face", id: 5, conformance: "FACE", description: "Face identifier credential type" }),
+    Field({
+      name: "AliroCredentialIssuerKey",
+      id: 6,
+      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.\nCredentials 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.\nWhen 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.\nWhen 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.\nIf 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.\nIf 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.\nIf the step-up process results in addition of new credentials, the corresponding LockUserChange event shall have OperationSource set to Aliro.\nIf 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: 7,
+      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: 8,
+      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: 0, conformance: "M", description: "Data is being added or was added" }),
     Field({ name: "Clear", id: 1, conformance: "M", description: "Data is being cleared or was cleared" }),
@@ -2692,7 +2611,7 @@ 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: 0, conformance: "DPS", description: "Door state is open" }),
     Field({ name: "DoorClosed", id: 1, conformance: "DPS", description: "Door state is closed" }),
@@ -2711,7 +2630,7 @@ 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",
@@ -2778,6 +2697,24 @@ const DoorLock = Cluster(
       id: 10,
       conformance: "FACE",
       description: "Lock user face information was added, cleared, or modified."
+    }),
+    Field({
+      name: "AliroCredentialIssuerKey",
+      id: 11,
+      conformance: "ALIRO",
+      description: "An Aliro credential issuer key credential was added, cleared, or modified."
+    }),
+    Field({
+      name: "AliroEvictableEndpointKey",
+      id: 12,
+      conformance: "ALIRO",
+      description: "An Aliro endpoint key credential which can be evicted credential was added, cleared, or modified."
+    }),
+    Field({
+      name: "AliroNonEvictableEndpointKey",
+      id: 13,
+      conformance: "ALIRO",
+      description: "An Aliro endpoint key credential which cannot be evicted was added, cleared, or modified."
     })
   ),
   Datatype(
@@ -2785,7 +2722,7 @@ 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: 0, conformance: "M", description: "Lock operation" }),
     Field({ name: "Unlock", id: 1, conformance: "M", description: "Unlock operation" }),
@@ -2808,7 +2745,7 @@ 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",
@@ -2846,42 +2783,42 @@ const DoorLock = Cluster(
       name: "OperatingModeEnum",
       type: "enum8",
       details: "This enumeration shall indicate the lock operating mode.\nThe table below shows the operating mode and which interfaces are enabled, if supported, for each mode.\n* Interface Operational: Yes, No or N/A\nNOTE\nFor modes that disable the remote interface, the door lock shall respond to Lock, Unlock, Toggle, and Unlock with Timeout commands with a response status Failure and not take the action requested 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: 0,
       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: 1,
       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({
       name: "Privacy",
       id: 2,
       conformance: "O",
       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({
       name: "NoRemoteLockUnlock",
       id: 3,
       conformance: "M",
       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: 4,
       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" }
     })
   ),
   Datatype(
@@ -2889,7 +2826,7 @@ 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",
@@ -2935,6 +2872,12 @@ const DoorLock = Cluster(
       id: 9,
       conformance: "[USR]",
       description: "Lock/unlock operation came from biometric source (e.g. face, fingerprint/fingervein)"
+    }),
+    Field({
+      name: "Aliro",
+      id: 10,
+      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]"
     })
   ),
   Datatype(
@@ -2942,7 +2885,7 @@ 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: 0, conformance: "M", description: "The user ID is available" }),
     Field({ name: "OccupiedEnabled", id: 1, conformance: "M", description: "The user ID is occupied and enabled" }),
@@ -2953,7 +2896,7 @@ 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({
       name: "UnrestrictedUser",
@@ -2961,23 +2904,23 @@ const DoorLock = Cluster(
       conformance: "M",
       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: 1,
       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" }
+      details: "This value shall indicate the user has the ability to open lock within a specific time period (e.g., guest).\nWhen UserType is set to YearDayScheduleUser, user access shall be restricted as follows:\n  \u2022 If no YearDaySchedules are set for the user, then access shall be denied\n  \u2022 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: 2,
       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" }
+      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).\nWhen UserType is set to WeekDayScheduleUser, user access shall be restricted as follows:\n  \u2022 If no WeekDaySchedules are set for the user, then access shall be denied\n  \u2022 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({
       name: "ProgrammingUser",
@@ -2985,7 +2928,7 @@ const DoorLock = Cluster(
       conformance: "O",
       description: "The user ID type is programming",
       details: "This value shall indicate the user has the ability to both program and operate the door lock. This 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\u2026).",
-      xref: { document: "cluster", section: "5.2.6.19.4" }
+      xref: { document: "cluster", section: "5.2.6.18.4" }
     }),
     Field({
       name: "NonAccessUser",
@@ -2993,7 +2936,7 @@ const DoorLock = Cluster(
       conformance: "O",
       description: "The user ID type is non access",
       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({
       name: "ForcedUser",
@@ -3001,7 +2944,7 @@ const DoorLock = Cluster(
       conformance: "[USR]",
       description: "The user ID type is forced",
       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({
       name: "DisposableUser",
@@ -3009,7 +2952,7 @@ const DoorLock = Cluster(
       conformance: "[USR]",
       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({
       name: "ExpiringUser",
@@ -3017,15 +2960,15 @@ const DoorLock = Cluster(
       conformance: "[USR]",
       description: "The user ID type is expiring",
       details: "This value shall indicate the user has the ability to open lock for ExpiringUserTimeout attribute minutes after the first use of the PIN code, RFID code, Fingerprint, or other credential. After 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: 8,
       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  \u2022 If no WeekDaySchedules and no YearDaySchedules are set for the user, then access shall be denied\n  \u2022 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  \u2022 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  \u2022 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({
       name: "RemoteOnlyUser",
@@ -3033,11 +2976,11 @@ const DoorLock = Cluster(
       conformance: "USR & COTA & PIN",
       description: "The user ID type is remote only",
       details: "This value shall indicate the user access and PIN code is restricted to remote lock/unlock commands 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: 0, conformance: "M", description: "Lock state is not fully locked" }),
     Field({ name: "Locked", id: 1, conformance: "M", description: "Lock state is fully locked" }),
     Field({ name: "Unlocked", id: 2, conformance: "M", description: "Lock state is fully unlocked" }),
@@ -3049,7 +2992,7 @@ 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: 0, conformance: "M", description: "Physical lock type is dead bolt" }),
     Field({ name: "Magnetic", id: 1, conformance: "M", description: "Physical lock type is magnetic" }),
     Field({ name: "Other", id: 2, conformance: "M", description: "Physical lock type is other" }),
@@ -3069,7 +3012,7 @@ const DoorLock = Cluster(
     Field({ name: "Eurocylinder", id: 11, conformance: "M", description: "Physical lock type is euro cylinder" })
   ),
   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: 0, conformance: "M", description: "Never use LED for signalization" }),
     Field({
       name: "NoLedSignalAccessAllowed",
@@ -3080,91 +3023,24 @@ const DoorLock = Cluster(
     Field({ name: "LedSignalAll", id: 2, conformance: "M", description: "Use LED signalization for all events" })
   ),
   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: 0, conformance: "M", description: "Silent Mode" }),
     Field({ name: "Low", id: 1, conformance: "M", description: "Low Volume" }),
     Field({ name: "High", id: 2, conformance: "M", description: "High Volume" }),
     Field({ name: "Medium", id: 3, conformance: "M", description: "Medium Volume" })
   ),
   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: 0, conformance: "M", description: "Event type is operation" }),
     Field({ name: "Programming", id: 1, conformance: "M", description: "Event type is programming" }),
     Field({ name: "Alarm", id: 2, conformance: "M", description: "Event type is alarm" })
   ),
-  Datatype(
-    { name: "EventSourceEnum", type: "enum8", xref: { document: "cluster", section: "5.2.6.25" } },
-    Field({ name: "Keypad", id: 0, conformance: "M", description: "Event source is keypad" }),
-    Field({ name: "Remote", id: 1, conformance: "M", description: "Event source is remote" }),
-    Field({ name: "Manual", id: 2, conformance: "M", description: "Event source is manual" }),
-    Field({ name: "Rfid", id: 3, conformance: "M", description: "Event source is RFID" }),
-    Field({ name: "Indeterminate", id: 255, 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: 0, conformance: "O", description: "Event code is unknown" }),
-    Field({ name: "Lock", id: 1, conformance: "O", description: "Event code is lock" }),
-    Field({ name: "Unlock", id: 2, conformance: "O", description: "Event code is unlock" }),
-    Field({
-      name: "LockFailureInvalidPiNorRfid",
-      id: 3,
-      conformance: "O",
-      description: "Event code is lock failure due to invalid PIN or RFID"
-    }),
-    Field({
-      name: "LockFailureInvalidSchedule",
-      id: 4,
-      conformance: "O",
-      description: "Event code is lock failure due to invalid schedule"
-    }),
-    Field({
-      name: "UnlockFailureInvalidPiNorRfid",
-      id: 5,
-      conformance: "O",
-      description: "Event code is unlock failure due to invalid PIN or RFID"
-    }),
-    Field({
-      name: "UnlockFailureInvalidSchedule",
-      id: 6,
-      conformance: "O",
-      description: "Event code is unlock failure due to invalid schedule"
-    }),
-    Field({ name: "OneTouchLock", id: 7, conformance: "O", description: "Event code is one touch lock" }),
-    Field({ name: "KeyLock", id: 8, conformance: "O", description: "Event code is key lock" }),
-    Field({ name: "KeyUnlock", id: 9, conformance: "O", description: "Event code is key unlock" }),
-    Field({ name: "AutoLock", id: 10, conformance: "O", description: "Event code is auto lock" }),
-    Field({ name: "ScheduleLock", id: 11, conformance: "WDSCH | YDSCH", description: "Event code is schedule lock" }),
-    Field({ name: "ScheduleUnlock", id: 12, conformance: "WDSCH | YDSCH", description: "Event code is schedule unlock" }),
-    Field({ name: "ManualLock", id: 13, conformance: "O", description: "Event code is manual lock (Key or Thumbturn)" }),
-    Field({
-      name: "ManualUnlock",
-      id: 14,
-      conformance: "O",
-      description: "Event code is manual unlock (Key or Thumbturn)"
-    }),
-    Field({
-      name: "NonAccessUserOperationEvent",
-      id: 15,
-      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: 0, conformance: "O", description: "Event code is unknown" }),
-    Field({ name: "ProgrammingCodeChanged", id: 1, conformance: "O", description: "Event code is code changed" }),
-    Field({ name: "PinCodeAdded", id: 2, conformance: "O", description: "Event code is PIN added" }),
-    Field({ name: "PinCodeCleared", id: 3, conformance: "O", description: "Event code is PIN cleared" }),
-    Field({ name: "PinCodeChanged", id: 4, conformance: "O", description: "Event code is PIN changed" }),
-    Field({ name: "RfidCodeAdded", id: 5, conformance: "O", description: "Event code is RFID added" }),
-    Field({ name: "RfidCodeCleared", id: 6, 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",
@@ -3172,7 +3048,7 @@ const DoorLock = Cluster(
       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({
       name: "CredentialIndex",
@@ -3181,13 +3057,13 @@ const DoorLock = Cluster(
       conformance: "M",
       default: 0,
       details: "This field shall indicate the index of the specific credential used to authorize the lock operation 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: 2, description: "Entry would cause a duplicate credential/ID." }),
-    Field({ name: "Occupied", id: 3, description: "Entry would replace an occupied slot." })
+    Field({ name: "Duplicate", id: 2, conformance: "M", description: "Entry would cause a duplicate credential/ID." }),
+    Field({ name: "Occupied", id: 3, conformance: "M", description: "Entry would replace an occupied slot." })
   )
 );
 MatterDefinition.children.push(DoorLock);