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

package/src/clusters/door-lock.ts

@@ -13,23 +13,23 @@ import {
     Event,
     EventPriority,
     FixedAttribute,
-    WritableAttribute,
     Command,
     TlvNoResponse,
+    WritableAttribute,
     OptionalCommand,
     OptionalAttribute
 } from "../cluster/Cluster.js";
-import { TlvEnum, TlvUInt32, TlvUInt16, TlvEpochS, TlvUInt8, TlvBitmap } from "../tlv/TlvNumber.js";
+import { TlvEnum, TlvUInt32, TlvUInt16, TlvUInt8, TlvBitmap, TlvEpochS } from "../tlv/TlvNumber.js";
 import { TlvNullable } from "../tlv/TlvNullable.js";
 import { AccessLevel } from "#model";
 import { TlvField, TlvObject, TlvOptionalField } from "../tlv/TlvObject.js";
 import { TypeFromSchema } from "../tlv/TlvSchema.js";
-import { TlvBoolean } from "../tlv/TlvBoolean.js";
-import { TlvByteString, TlvString } from "../tlv/TlvString.js";
 import { BitFlag, BitsFromPartial } from "../schema/BitmapSchema.js";
+import { TlvString, TlvByteString } from "../tlv/TlvString.js";
 import { TlvArray } from "../tlv/TlvArray.js";
 import { TlvFabricIndex } from "../datatype/FabricIndex.js";
 import { Status } from "../globals/Status.js";
+import { TlvBoolean } from "../tlv/TlvBoolean.js";
 import { TlvNodeId } from "../datatype/NodeId.js";
 import { TlvNoArguments } from "../tlv/TlvNoArguments.js";
 import { ClusterType } from "../cluster/ClusterType.js";
@@ -63,9 +63,8 @@ export namespace DoorLock {
          * User.
          *
          * A lock may support multiple credential types so if the User feature is supported the UserType, UserStatus
-         * and Schedules are all associated with a User index and not directly with a RFID index. A User
-         *
-         * Index may have several credentials associated with it.
+         * 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.
          *
          * @see {@link MatterSpecification.v13.Cluster} § 5.2.4.2
          */
@@ -87,27 +86,19 @@ export namespace DoorLock {
          */
         FingerCredentials = "FingerCredentials",
 
-        /**
-         * Logging (LOG)
-         *
-         * 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.
-         *
-         * @see {@link MatterSpecification.v13.Cluster} § 5.2.4.4
-         */
-        Logging = "Logging",
-
         /**
          * WeekDayAccessSchedules (WDSCH)
          *
          * If the User feature is supported then Week Day Schedules are applied to a User and not a credential.
          *
          * Week Day Schedules are used to restrict access to a specified time window on certain days of the week. The
-         * schedule is repeated each week. When a schedule is cleared this clears the access restrictions and grants
-         * unrestricted access to the user. The lock may automatically adjust the UserType when a schedule is created
-         * or cleared.
+         * schedule is repeated each week.
          *
-         * @see {@link MatterSpecification.v13.Cluster} § 5.2.4.5
+         * The lock may automatically adjust the UserType when a schedule is created or cleared.
+         *
+         * Support for WeekDayAccessSchedules requires that the lock has the capability of keeping track of local time.
+         *
+         * @see {@link MatterSpecification.v13.Cluster} § 5.2.4.4
          */
         WeekDayAccessSchedules = "WeekDayAccessSchedules",
 
@@ -117,7 +108,7 @@ export namespace DoorLock {
          * 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.
          *
-         * @see {@link MatterSpecification.v13.Cluster} § 5.2.4.6
+         * @see {@link MatterSpecification.v13.Cluster} § 5.2.4.5
          */
         DoorPositionSensor = "DoorPositionSensor",
 
@@ -132,7 +123,7 @@ export namespace DoorLock {
          * A lock may support multiple credential types so if the User feature is supported the UserType, UserStatus
          * and Schedules are all associated with a User and not directly with a credential.
          *
-         * @see {@link MatterSpecification.v13.Cluster} § 5.2.4.7
+         * @see {@link MatterSpecification.v13.Cluster} § 5.2.4.6
          */
         FaceCredentials = "FaceCredentials",
 
@@ -140,10 +131,11 @@ export namespace DoorLock {
          * CredentialOverTheAirAccess (COTA)
          *
          * 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.
          *
-         * @see {@link MatterSpecification.v13.Cluster} § 5.2.4.8
+         * @see {@link MatterSpecification.v13.Cluster} § 5.2.4.7
          */
         CredentialOverTheAirAccess = "CredentialOverTheAirAccess",
 
@@ -154,30 +146,21 @@ export namespace DoorLock {
          * 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.
          *
-         * @see {@link MatterSpecification.v13.Cluster} § 5.2.4.9
+         * @see {@link MatterSpecification.v13.Cluster} § 5.2.4.8
          */
         User = "User",
 
-        /**
-         * Notification (NOT)
-         *
-         * This is a feature used before support of events. This feature supports notification commands and masks used
-         * to filter these notifications.
-         *
-         * @see {@link MatterSpecification.v13.Cluster} § 5.2.4.10
-         */
-        Notification = "Notification",
-
         /**
          * YearDayAccessSchedules (YDSCH)
          *
-         * If the User feature is supported then Year Day Schedules are applied to a User and not a credential.
+         * 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.
          *
-         * Year Day Schedules are used to restrict access to a specified date and time window. When a schedule is
-         * cleared this clears the access restrictions and grants unrestricted access to the user. The lock may
-         * automatically adjust the UserType when a schedule is created or cleared.
+         * The lock may automatically adjust the UserType when a schedule is created or cleared.
          *
-         * @see {@link MatterSpecification.v13.Cluster} § 5.2.4.11
+         * Support for YearDayAccessSchedules requires that the lock has the capability of keeping track of local time.
+         *
+         * @see {@link MatterSpecification.v13.Cluster} § 5.2.4.9
          */
         YearDayAccessSchedules = "YearDayAccessSchedules",
 
@@ -187,7 +170,9 @@ export namespace DoorLock {
          * 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.
          *
-         * @see {@link MatterSpecification.v13.Cluster} § 5.2.4.12
+         * Support for HolidaySchedules requires that the lock has the capability of keeping track of local time.
+         *
+         * @see {@link MatterSpecification.v13.Cluster} § 5.2.4.10
          */
         HolidaySchedules = "HolidaySchedules",
 
@@ -200,15 +185,34 @@ export namespace DoorLock {
          * Locks without unbolting support don’t differentiate between unbolting and unlocking and perform the same
          * operation for both commands.
          *
+         * @see {@link MatterSpecification.v13.Cluster} § 5.2.4.11
+         */
+        Unbolting = "Unbolting",
+
+        /**
+         * AliroProvisioning (ALIRO)
+         *
+         * Locks that support this feature implement the Aliro specification as defined in [Aliro] and support Matter
+         * as a method for provisioning Aliro credentials.
+         *
+         * @see {@link MatterSpecification.v13.Cluster} § 5.2.4.12
+         */
+        AliroProvisioning = "AliroProvisioning",
+
+        /**
+         * AliroBleuwb (ALBU)
+         *
+         * Locks that support this feature implement the Bluetooth LE + UWB Access Control Flow as defined in [Aliro].
+         *
          * @see {@link MatterSpecification.v13.Cluster} § 5.2.4.13
          */
-        Unbolting = "Unbolting"
+        AliroBleuwb = "AliroBleuwb"
     }
 
     /**
      * This enumeration shall indicate the current door state.
      *
-     * @see {@link MatterSpecification.v13.Cluster} § 5.2.6.12
+     * @see {@link MatterSpecification.v13.Cluster} § 5.2.6.11
      */
     export enum DoorState {
         /**
@@ -263,142 +267,6 @@ export namespace DoorLock {
      */
     export interface DoorStateChangeEvent extends TypeFromSchema<typeof TlvDoorStateChangeEvent> {}
 
-    /**
-     * Input to the DoorLock getLogRecord command
-     *
-     * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.4
-     */
-    export const TlvGetLogRecordRequest = TlvObject({ logIndex: TlvField(0, TlvUInt16) });
-
-    /**
-     * Input to the DoorLock getLogRecord command
-     *
-     * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.4
-     */
-    export interface GetLogRecordRequest extends TypeFromSchema<typeof TlvGetLogRecordRequest> {}
-
-    /**
-     * @see {@link MatterSpecification.v13.Cluster} § 5.2.6.24
-     */
-    export enum EventType {
-        /**
-         * Event type is operation
-         */
-        Operation = 0,
-
-        /**
-         * Event type is programming
-         */
-        Programming = 1,
-
-        /**
-         * Event type is alarm
-         */
-        Alarm = 2
-    }
-
-    /**
-     * @see {@link MatterSpecification.v13.Cluster} § 5.2.6.25
-     */
-    export enum EventSource {
-        /**
-         * Event source is keypad
-         */
-        Keypad = 0,
-
-        /**
-         * Event source is remote
-         */
-        Remote = 1,
-
-        /**
-         * Event source is manual
-         */
-        Manual = 2,
-
-        /**
-         * Event source is RFID
-         */
-        Rfid = 3,
-
-        /**
-         * Event source is unknown
-         */
-        Indeterminate = 255
-    }
-
-    /**
-     * 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.
-     *
-     * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.5
-     */
-    export const TlvGetLogRecordResponse = TlvObject({
-        /**
-         * 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.
-         *
-         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.5.1
-         */
-        logEntryId: TlvField(0, TlvUInt16),
-
-        /**
-         * 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.
-         *
-         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.5.2
-         */
-        timestamp: TlvField(1, TlvEpochS),
-
-        /**
-         * This field shall indicate the type of event that took place on the door lock, as defined in EventTypeEnum.
-         *
-         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.5.3
-         */
-        eventType: TlvField(2, TlvEnum<EventType>()),
-
-        /**
-         * This field shall indicate the source value as defined in EventSourceEnum.
-         *
-         * If the EventType is 2 (Alarm) then the source SHOULD be, but does not have to be 255 (Indeterminate).
-         *
-         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.5.4
-         */
-        source: TlvField(3, TlvEnum<EventSource>()),
-
-        /**
-         * 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.
-         *
-         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.5.5
-         */
-        eventId: TlvField(4, TlvUInt8),
-
-        /**
-         * 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.
-         *
-         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.5.6
-         */
-        userId: TlvField(5, TlvUInt16),
-
-        /**
-         * 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.
-         *
-         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.5.7
-         */
-        pin: TlvField(6, TlvByteString)
-    });
-
-    /**
-     * 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.
-     *
-     * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.5
-     */
-    export interface GetLogRecordResponse extends TypeFromSchema<typeof TlvGetLogRecordResponse> {}
-
     /**
      * @see {@link MatterSpecification.v13.Cluster} § 5.2.6.2
      */
@@ -422,7 +290,7 @@ export namespace DoorLock {
     /**
      * This enumeration shall indicate the data operation performed.
      *
-     * @see {@link MatterSpecification.v13.Cluster} § 5.2.6.11
+     * @see {@link MatterSpecification.v13.Cluster} § 5.2.6.10
      */
     export enum DataOperationType {
         /**
@@ -444,7 +312,7 @@ export namespace DoorLock {
     /**
      * This enumeration shall indicate what the status is for a specific user ID.
      *
-     * @see {@link MatterSpecification.v13.Cluster} § 5.2.6.18
+     * @see {@link MatterSpecification.v13.Cluster} § 5.2.6.17
      */
     export enum UserStatus {
         /**
@@ -466,7 +334,7 @@ export namespace DoorLock {
     /**
      * This enumeration shall indicate what the type is for a specific user ID.
      *
-     * @see {@link MatterSpecification.v13.Cluster} § 5.2.6.19
+     * @see {@link MatterSpecification.v13.Cluster} § 5.2.6.18
      */
     export enum UserType {
         /**
@@ -474,7 +342,7 @@ export namespace DoorLock {
          *
          * This value shall indicate the user has access 24/7 provided proper PIN or RFID is supplied (e.g., owner).
          *
-         * @see {@link MatterSpecification.v13.Cluster} § 5.2.6.19.1
+         * @see {@link MatterSpecification.v13.Cluster} § 5.2.6.18.1
          */
         UnrestrictedUser = 0,
 
@@ -483,7 +351,15 @@ export namespace DoorLock {
          *
          * This value shall indicate the user has the ability to open lock within a specific time period (e.g., guest).
          *
-         * @see {@link MatterSpecification.v13.Cluster} § 5.2.6.19.2
+         * When UserType is set to YearDayScheduleUser, user access shall be restricted as follows:
+         *
+         *   • If no YearDaySchedules are set for the user, then access shall be denied
+         *
+         *   • 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.
+         *
+         * @see {@link MatterSpecification.v13.Cluster} § 5.2.6.18.2
          */
         YearDayScheduleUser = 1,
 
@@ -493,7 +369,15 @@ export namespace DoorLock {
          * 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).
          *
-         * @see {@link MatterSpecification.v13.Cluster} § 5.2.6.19.3
+         * When UserType is set to WeekDayScheduleUser, user access shall be restricted as follows:
+         *
+         *   • If no WeekDaySchedules are set for the user, then access shall be denied
+         *
+         *   • 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.
+         *
+         * @see {@link MatterSpecification.v13.Cluster} § 5.2.6.18.3
          */
         WeekDayScheduleUser = 2,
 
@@ -504,7 +388,7 @@ export namespace DoorLock {
          * 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…).
          *
-         * @see {@link MatterSpecification.v13.Cluster} § 5.2.6.19.4
+         * @see {@link MatterSpecification.v13.Cluster} § 5.2.6.18.4
          */
         ProgrammingUser = 3,
 
@@ -514,7 +398,7 @@ export namespace DoorLock {
          * 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.
          *
-         * @see {@link MatterSpecification.v13.Cluster} § 5.2.6.19.5
+         * @see {@link MatterSpecification.v13.Cluster} § 5.2.6.18.5
          */
         NonAccessUser = 4,
 
@@ -525,7 +409,7 @@ export namespace DoorLock {
          * ForcedUser silent alarm will be emitted to allow a notified Node to alert emergency services or contacts on
          * the user account when used.
          *
-         * @see {@link MatterSpecification.v13.Cluster} § 5.2.6.19.6
+         * @see {@link MatterSpecification.v13.Cluster} § 5.2.6.18.6
          */
         ForcedUser = 5,
 
@@ -535,7 +419,7 @@ export namespace DoorLock {
          * 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.
          *
-         * @see {@link MatterSpecification.v13.Cluster} § 5.2.6.19.7
+         * @see {@link MatterSpecification.v13.Cluster} § 5.2.6.18.7
          */
         DisposableUser = 6,
 
@@ -547,16 +431,29 @@ export namespace DoorLock {
          * 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.
          *
-         * @see {@link MatterSpecification.v13.Cluster} § 5.2.6.19.8
+         * @see {@link MatterSpecification.v13.Cluster} § 5.2.6.18.8
          */
         ExpiringUser = 7,
 
         /**
          * The user ID type is schedule restricted
          *
-         * This value shall indicate the user access is restricted by Week Day and/or Year Day schedule.
+         * 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:
+         *
+         *   • If no WeekDaySchedules and no YearDaySchedules are set for the user, then access shall be denied
          *
-         * @see {@link MatterSpecification.v13.Cluster} § 5.2.6.19.9
+         *   • 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
+         *
+         *   • 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
+         *
+         *   • 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.
+         *
+         * @see {@link MatterSpecification.v13.Cluster} § 5.2.6.18.9
          */
         ScheduleRestrictedUser = 8,
 
@@ -568,7 +465,7 @@ export namespace DoorLock {
          * 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.
          *
-         * @see {@link MatterSpecification.v13.Cluster} § 5.2.6.19.10
+         * @see {@link MatterSpecification.v13.Cluster} § 5.2.6.18.10
          */
         RemoteOnlyUser = 9
     }
@@ -576,7 +473,7 @@ export namespace DoorLock {
     /**
      * This enumeration shall indicate the credential rule that can be applied to a particular user.
      *
-     * @see {@link MatterSpecification.v13.Cluster} § 5.2.6.9
+     * @see {@link MatterSpecification.v13.Cluster} § 5.2.6.8
      */
     export enum CredentialRule {
         /**
@@ -598,20 +495,20 @@ export namespace DoorLock {
     /**
      * Input to the DoorLock setUser command
      *
-     * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.34
+     * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.32
      */
     export const TlvSetUserRequest = TlvObject({
         /**
          * This field shall indicate the type of operation.
          *
-         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.34.1
+         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.32.1
          */
         operationType: TlvField(0, TlvEnum<DataOperationType>()),
 
         /**
          * This field shall indicate the user ID.
          *
-         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.34.2
+         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.32.2
          */
         userIndex: TlvField(1, TlvUInt16.bound({ min: 1 })),
 
@@ -626,7 +523,7 @@ export namespace DoorLock {
          *
          * If UserName is not null, the UserName in the user record shall be set to the provided value.
          *
-         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.34.3
+         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.32.3
          */
         userName: TlvField(2, TlvNullable(TlvString.bound({ maxLength: 10 }))),
 
@@ -644,7 +541,7 @@ export namespace DoorLock {
          *
          * If UserUniqueID is not null, the UserUniqueID in the user record shall be set to the provided value.
          *
-         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.34.4
+         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.32.4
          */
         userUniqueId: TlvField(3, TlvNullable(TlvUInt32)),
 
@@ -660,7 +557,7 @@ export namespace DoorLock {
          *
          * If UserStatus is not null, the UserStatus in the user record shall be set to the provided value.
          *
-         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.34.5
+         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.32.5
          */
         userStatus: TlvField(4, TlvNullable(TlvEnum<UserStatus>())),
 
@@ -676,7 +573,7 @@ export namespace DoorLock {
          *
          * If UserType is not null, the UserType in the user record shall be set to the provided value.
          *
-         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.34.6
+         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.32.6
          */
         userType: TlvField(5, TlvNullable(TlvEnum<UserType>())),
 
@@ -696,7 +593,7 @@ export namespace DoorLock {
          *
          * If CredentialRule is not null, the CredentialRule in the user record shall be set to the provided value.
          *
-         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.34.7
+         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.32.7
          */
         credentialRule: TlvField(6, TlvNullable(TlvEnum<CredentialRule>()))
     });
@@ -704,28 +601,28 @@ export namespace DoorLock {
     /**
      * Input to the DoorLock setUser command
      *
-     * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.34
+     * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.32
      */
     export interface SetUserRequest extends TypeFromSchema<typeof TlvSetUserRequest> {}
 
     /**
      * Input to the DoorLock getUser command
      *
-     * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.35
+     * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.33
      */
     export const TlvGetUserRequest = TlvObject({ userIndex: TlvField(0, TlvUInt16.bound({ min: 1 })) });
 
     /**
      * Input to the DoorLock getUser command
      *
-     * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.35
+     * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.33
      */
     export interface GetUserRequest extends TypeFromSchema<typeof TlvGetUserRequest> {}
 
     /**
      * This enumeration shall indicate the credential type.
      *
-     * @see {@link MatterSpecification.v13.Cluster} § 5.2.6.10
+     * @see {@link MatterSpecification.v13.Cluster} § 5.2.6.9
      */
     export enum CredentialType {
         /**
@@ -756,20 +653,81 @@ export namespace DoorLock {
         /**
          * Face identifier credential type
          */
-        Face = 5
+        Face = 5,
+
+        /**
+         * A Credential Issuer public key as defined in [Aliro]
+         *
+         * Credentials of this type shall be 65-byte uncompressed elliptic curve public keys as defined in section
+         * 2.3.3 of SEC 1.
+         *
+         * Credentials of this type shall NOT be used to allow operating the lock. They shall be used, as defined in
+         * [Aliro], to create new credentials of type AliroEvictableEndpointKey via a step-up transaction.
+         *
+         * When performing the step-up transaction, the lock shall request the data element with identifier "matter1",
+         * and shall attempt to create a new credential of type AliroEvictableEndpointKey if and only if the data
+         * element is returned and the Access Credential can be validated using the AliroCredentialIssuerKey.
+         *
+         * When a new credential of type AliroEvictableEndpointKey is added in this manner, it shall be associated with
+         * the same user record as the AliroCredentialIssuerKey credential that allowed the new credential to be added.
+         *
+         * If there are no available credential slots to add a new AliroEvictableEndpointKey credential (i.e. either
+         * the NumberOfCredentialsSupportedPerUser or the NumberOfAliroEndpointKeysSupported limit has been reached)
+         * but there exist credentials of type AliroEvictableEndpointKey associated with the user record, the server
+         * shall remove one of those credentials using the same procedure it would follow for the ClearCredential
+         * command before adding the new credential.
+         *
+         * If there are no available credential slots to add a new AliroEvictableEndpointKey credential (i.e. either
+         * the NumberOfCredentialsSupportedPerUser or the NumberOfAliroEndpointKeysSupported limit has been reached)
+         * and there do not exist credentials of type AliroEvictableEndpointKey associated with the user record, a new
+         * AliroEvictableEndpointKey credential shall NOT be created.
+         *
+         * If the step-up process results in addition of new credentials, the corresponding LockUserChange event shall
+         * have OperationSource set to Aliro.
+         *
+         * If the step-up process results in the lock state changing (e.g. locking or unlocking), the credential
+         * associated with those changes in the LockOperation events shall be the newly provisioned
+         * AliroEvictableEndpointKey credential if one was created. If no new AliroEvictableEndpointKey credential was
+         * created, the credential associated with the changes in the LockOperation events shall be the
+         * AliroCredentialIssuerKey credential used for the step-up.
+         *
+         * @see {@link MatterSpecification.v13.Cluster} § 5.2.6.9.1
+         */
+        AliroCredentialIssuerKey = 6,
+
+        /**
+         * An Endpoint public key as defined in [Aliro] which can be evicted if space is needed for another endpoint key
+         *
+         * Credentials of this type shall be 65-byte uncompressed elliptic curve public keys as defined in section
+         * 2.3.3 of SEC 1.
+         *
+         * @see {@link MatterSpecification.v13.Cluster} § 5.2.6.9.2
+         */
+        AliroEvictableEndpointKey = 7,
+
+        /**
+         * An Endpoint public key as defined in [Aliro] which cannot be evicted if space is needed for another endpoint
+         * key
+         *
+         * Credentials of this type shall be 65-byte uncompressed elliptic curve public keys as defined in section
+         * 2.3.3 of SEC 1.
+         *
+         * @see {@link MatterSpecification.v13.Cluster} § 5.2.6.9.3
+         */
+        AliroNonEvictableEndpointKey = 8
     }
 
     /**
      * This struct shall indicate the credential types and their corresponding indices (if any) for the event or user
      * record.
      *
-     * @see {@link MatterSpecification.v13.Cluster} § 5.2.6.26
+     * @see {@link MatterSpecification.v13.Cluster} § 5.2.6.24
      */
     export const TlvCredential = TlvObject({
         /**
          * This field shall indicate the credential field used to authorize the lock operation.
          *
-         * @see {@link MatterSpecification.v13.Cluster} § 5.2.6.26.1
+         * @see {@link MatterSpecification.v13.Cluster} § 5.2.6.24.1
          */
         credentialType: TlvField(0, TlvEnum<CredentialType>()),
 
@@ -778,7 +736,7 @@ export namespace DoorLock {
          * 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.
          *
-         * @see {@link MatterSpecification.v13.Cluster} § 5.2.6.26.2
+         * @see {@link MatterSpecification.v13.Cluster} § 5.2.6.24.2
          */
         credentialIndex: TlvField(1, TlvUInt16)
     });
@@ -787,7 +745,7 @@ export namespace DoorLock {
      * This struct shall indicate the credential types and their corresponding indices (if any) for the event or user
      * record.
      *
-     * @see {@link MatterSpecification.v13.Cluster} § 5.2.6.26
+     * @see {@link MatterSpecification.v13.Cluster} § 5.2.6.24
      */
     export interface Credential extends TypeFromSchema<typeof TlvCredential> {}
 
@@ -798,55 +756,55 @@ export namespace DoorLock {
      * UserUniqueID, UserStatus, UserType, CredentialRule, Credentials, CreatorFabricIndex, and LastModifiedFabricIndex
      * shall all be null in the response.
      *
-     * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.36
+     * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.34
      */
     export const TlvGetUserResponse = TlvObject({
         /**
          * This field shall indicate the user ID.
          *
-         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.36.1
+         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.34.1
          */
         userIndex: TlvField(0, TlvUInt16.bound({ min: 1 })),
 
         /**
          * This field shall contain a string to use as a human readable identifier for the user.
          *
-         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.36.2
+         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.34.2
          */
         userName: TlvField(1, TlvNullable(TlvString.bound({ maxLength: 10 }))),
 
         /**
          * See UserUniqueID field.
          *
-         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.36.3
+         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.34.3
          */
         userUniqueId: TlvField(2, TlvNullable(TlvUInt32)),
 
         /**
          * This field shall indicate the UserStatus assigned to the user when created or modified.
          *
-         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.36.4
+         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.34.4
          */
         userStatus: TlvField(3, TlvNullable(TlvEnum<UserStatus>())),
 
         /**
          * This field shall indicate the UserType assigned to this user when created or modified.
          *
-         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.36.5
+         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.34.5
          */
         userType: TlvField(4, TlvNullable(TlvEnum<UserType>())),
 
         /**
          * This field shall indicate the CredentialRule set for this user.
          *
-         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.36.6
+         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.34.6
          */
         credentialRule: TlvField(5, TlvNullable(TlvEnum<CredentialRule>())),
 
         /**
          * This field shall contain a list of credentials for this user.
          *
-         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.36.7
+         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.34.7
          */
         credentials: TlvField(6, TlvNullable(TlvArray(TlvCredential, { minLength: 0 }))),
 
@@ -856,7 +814,7 @@ export namespace DoorLock {
          * the Interaction Model) and shall NOT be null otherwise. This value shall be set to 0 if the original creator
          * fabric was deleted.
          *
-         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.36.8
+         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.34.8
          */
         creatorFabricIndex: TlvField(7, TlvNullable(TlvFabricIndex)),
 
@@ -866,7 +824,7 @@ export namespace DoorLock {
          * 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.
          *
-         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.36.9
+         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.34.9
          */
         lastModifiedFabricIndex: TlvField(8, TlvNullable(TlvFabricIndex)),
 
@@ -876,7 +834,7 @@ export namespace DoorLock {
          * entry after the requested UserIndex in the User database and shall be null if there are no more occupied
          * entries.
          *
-         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.36.10
+         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.34.10
          */
         nextUserIndex: TlvField(9, TlvNullable(TlvUInt16.bound({ min: 1 })))
     });
@@ -888,20 +846,20 @@ export namespace DoorLock {
      * UserUniqueID, UserStatus, UserType, CredentialRule, Credentials, CreatorFabricIndex, and LastModifiedFabricIndex
      * shall all be null in the response.
      *
-     * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.36
+     * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.34
      */
     export interface GetUserResponse extends TypeFromSchema<typeof TlvGetUserResponse> {}
 
     /**
      * Input to the DoorLock clearUser command
      *
-     * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.37
+     * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.35
      */
     export const TlvClearUserRequest = TlvObject({
         /**
          * This field shall specify a valid User index or 0xFFFE to indicate all user slots shall be cleared.
          *
-         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.37.1
+         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.35.1
          */
         userIndex: TlvField(0, TlvUInt16)
     });
@@ -909,20 +867,20 @@ export namespace DoorLock {
     /**
      * Input to the DoorLock clearUser command
      *
-     * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.37
+     * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.35
      */
     export interface ClearUserRequest extends TypeFromSchema<typeof TlvClearUserRequest> {}
 
     /**
      * Input to the DoorLock setCredential command
      *
-     * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.40
+     * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.36
      */
     export const TlvSetCredentialRequest = TlvObject({
         /**
          * This field shall indicate the set credential operation type requested.
          *
-         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.40.1
+         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.36.1
          */
         operationType: TlvField(0, TlvEnum<DataOperationType>()),
 
@@ -930,7 +888,7 @@ export namespace DoorLock {
          * This field shall contain a credential structure that contains the CredentialTypeEnum and the credential
          * index (if applicable or 0 if not) to set.
          *
-         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.40.2
+         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.36.2
          */
         credential: TlvField(1, TlvCredential),
 
@@ -939,7 +897,7 @@ export namespace DoorLock {
          * 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.
          *
-         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.40.3
+         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.36.3
          */
         credentialData: TlvField(2, TlvByteString),
 
@@ -948,7 +906,7 @@ export namespace DoorLock {
          * or modified. This shall be null if OperationType is add and a new credential and user is being added at the
          * same time.
          *
-         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.40.4
+         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.36.4
          */
         userIndex: TlvField(3, TlvNullable(TlvUInt16.bound({ min: 1 }))),
 
@@ -956,7 +914,7 @@ export namespace DoorLock {
          * 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.
          *
-         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.40.5
+         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.36.5
          */
         userStatus: TlvField(4, TlvNullable(TlvEnum<UserStatus>())),
 
@@ -964,7 +922,7 @@ export namespace DoorLock {
          * 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.
          *
-         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.40.6
+         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.36.6
          */
         userType: TlvField(5, TlvNullable(TlvEnum<UserType>()))
     });
@@ -972,14 +930,14 @@ export namespace DoorLock {
     /**
      * Input to the DoorLock setCredential command
      *
-     * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.40
+     * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.36
      */
     export interface SetCredentialRequest extends TypeFromSchema<typeof TlvSetCredentialRequest> {}
 
     /**
      * Returns the status for setting the specified credential.
      *
-     * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.41
+     * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.37
      */
     export const TlvSetCredentialResponse = TlvObject({
         /**
@@ -997,8 +955,15 @@ export namespace DoorLock {
          *   • DUPLICATE, if CredentialData provided is a duplicate of another credential with the same CredentialType
          *     (e.g. duplicate PIN code).
          *
-         *   • RESOURCE_EXHAUSTED, if OperationType is Add and the user referred to by UserIndex already has
-         *     NumberOfCredentialsSupportedPerUser credentials associated.
+         *   • RESOURCE_EXHAUSTED, if OperationType is Add and the new credential cannot be added due to resource
+         *     constraints such as:
+         *
+         *     ◦ The user referred to by UserIndex already has NumberOfCredentialsSupportedPerUser credentials
+         *       associated.
+         *
+         *     ◦ 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.
          *
          *   • INVALID_COMMAND, if one or more fields violate constraints or are invalid.
          *
@@ -1007,7 +972,7 @@ export namespace DoorLock {
          *
          *   • INVALID_COMMAND, if OperationType is Modify and UserIndex points to an available slot.
          *
-         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.41.1
+         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.37.1
          */
         status: TlvField(0, TlvEnum<Status>()),
 
@@ -1018,7 +983,7 @@ export namespace DoorLock {
          * created. If the OperationType was Add and an existing User was associated with the new credential then this
          * shall be null.
          *
-         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.41.2
+         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.37.2
          */
         userIndex: TlvField(1, TlvNullable(TlvUInt16.bound({ min: 1 }))),
 
@@ -1029,7 +994,7 @@ export namespace DoorLock {
          * 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.
          *
-         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.41.3
+         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.37.3
          */
         nextCredentialIndex: TlvOptionalField(2, TlvNullable(TlvUInt16))
     });
@@ -1037,21 +1002,21 @@ export namespace DoorLock {
     /**
      * Returns the status for setting the specified credential.
      *
-     * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.41
+     * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.37
      */
     export interface SetCredentialResponse extends TypeFromSchema<typeof TlvSetCredentialResponse> {}
 
     /**
      * Input to the DoorLock getCredentialStatus command
      *
-     * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.42
+     * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.38
      */
     export const TlvGetCredentialStatusRequest = TlvObject({
         /**
          * 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.
          *
-         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.42.1
+         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.38.1
          */
         credential: TlvField(0, TlvCredential)
     });
@@ -1059,21 +1024,21 @@ export namespace DoorLock {
     /**
      * Input to the DoorLock getCredentialStatus command
      *
-     * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.42
+     * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.38
      */
     export interface GetCredentialStatusRequest extends TypeFromSchema<typeof TlvGetCredentialStatusRequest> {}
 
     /**
      * Returns the status for the specified credential.
      *
-     * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.43
+     * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.39
      */
     export const TlvGetCredentialStatusResponse = TlvObject({
         /**
          * This field shall indicate if the requested credential type and index exists and is populated for the
          * requested user index.
          *
-         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.43.1
+         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.39.1
          */
         credentialExists: TlvField(0, TlvBoolean),
 
@@ -1082,7 +1047,7 @@ export namespace DoorLock {
          * 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.
          *
-         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.43.2
+         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.39.2
          */
         userIndex: TlvField(1, TlvNullable(TlvUInt16.bound({ min: 1 }))),
 
@@ -1092,7 +1057,7 @@ export namespace DoorLock {
          * 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.
          *
-         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.43.3
+         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.39.3
          */
         creatorFabricIndex: TlvField(2, TlvNullable(TlvFabricIndex)),
 
@@ -1102,33 +1067,54 @@ export namespace DoorLock {
          * 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.
          *
-         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.43.4
+         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.39.4
          */
         lastModifiedFabricIndex: TlvField(3, TlvNullable(TlvFabricIndex)),
 
         /**
          * 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.
+         * 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.
+         *
+         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.39.5
+         */
+        nextCredentialIndex: TlvOptionalField(4, TlvNullable(TlvUInt16)),
+
+        /**
+         * This field shall indicate the credential data for the requested user index.
+         *
+         * If the CredentialType in the GetCredentialStatus command was not AliroCredentialIssuerKey,
+         * AliroEvictableEndpointKey, or AliroNonEvictableEndpointKey, this field shall NOT be included.
+         *
+         * Otherwise, if CredentialExists is false this field shall be null.
          *
-         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.43.5
+         * Otherwise, the value of this field shall be the value of the relevant credential, as a 65-byte uncompressed
+         * elliptic curve public key as defined in section 2.3.3 of SEC 1.
+         *
+         * NOTE
+         *
+         * Since the Aliro credentials are public keys, there is no security risk in allowing them to be read.
+         * Possession of the credential octet string does not allow operating the lock.
+         *
+         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.39.6
          */
-        nextCredentialIndex: TlvOptionalField(4, TlvNullable(TlvUInt16))
+        credentialData: TlvOptionalField(5, TlvNullable(TlvByteString))
     });
 
     /**
      * Returns the status for the specified credential.
      *
-     * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.43
+     * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.39
      */
     export interface GetCredentialStatusResponse extends TypeFromSchema<typeof TlvGetCredentialStatusResponse> {}
 
     /**
      * Input to the DoorLock clearCredential command
      *
-     * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.44
+     * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.40
      */
     export const TlvClearCredentialRequest = TlvObject({
         /**
@@ -1136,7 +1122,7 @@ export namespace DoorLock {
          * 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.
          *
-         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.44.1
+         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.40.1
          */
         credential: TlvField(0, TlvNullable(TlvCredential))
     });
@@ -1144,14 +1130,14 @@ export namespace DoorLock {
     /**
      * Input to the DoorLock clearCredential command
      *
-     * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.44
+     * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.40
      */
     export interface ClearCredentialRequest extends TypeFromSchema<typeof TlvClearCredentialRequest> {}
 
     /**
      * This enumeration shall indicate the data type that is being or has changed.
      *
-     * @see {@link MatterSpecification.v13.Cluster} § 5.2.6.13
+     * @see {@link MatterSpecification.v13.Cluster} § 5.2.6.12
      */
     export enum LockDataType {
         /**
@@ -1207,13 +1193,28 @@ export namespace DoorLock {
         /**
          * Lock user face information was added, cleared, or modified.
          */
-        Face = 10
+        Face = 10,
+
+        /**
+         * An Aliro credential issuer key credential was added, cleared, or modified.
+         */
+        AliroCredentialIssuerKey = 11,
+
+        /**
+         * An Aliro endpoint key credential which can be evicted credential was added, cleared, or modified.
+         */
+        AliroEvictableEndpointKey = 12,
+
+        /**
+         * An Aliro endpoint key credential which cannot be evicted was added, cleared, or modified.
+         */
+        AliroNonEvictableEndpointKey = 13
     }
 
     /**
      * This enumeration shall indicate the source of the Lock/Unlock or user change operation performed.
      *
-     * @see {@link MatterSpecification.v13.Cluster} § 5.2.6.17
+     * @see {@link MatterSpecification.v13.Cluster} § 5.2.6.16
      */
     export enum OperationSource {
         /**
@@ -1264,7 +1265,13 @@ export namespace DoorLock {
         /**
          * Lock/unlock operation came from biometric source (e.g. face, fingerprint/fingervein)
          */
-        Biometric = 9
+        Biometric = 9,
+
+        /**
+         * Lock/unlock operation came from an interaction defined in [Aliro], or user change operation was a step-up
+         * credential provisioning as defined in [Aliro]
+         */
+        Aliro = 10
     }
 
     /**
@@ -1384,36 +1391,41 @@ export namespace DoorLock {
     /**
      * Input to the DoorLock setWeekDaySchedule command
      *
-     * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.14
+     * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.12
      */
     export const TlvSetWeekDayScheduleRequest = TlvObject({
         /**
          * This field shall indicate the index of the Week Day schedule.
          *
-         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.14.1
+         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.12.1
          */
         weekDayIndex: TlvField(0, TlvUInt8.bound({ min: 1 })),
 
-        userIndexUserId: TlvField(1, TlvUInt16.bound({ min: 1 })),
+        /**
+         * This field shall indicate the user ID.
+         *
+         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.12.2
+         */
+        userIndex: TlvField(1, TlvUInt16.bound({ min: 1 })),
 
         /**
          * This field shall indicate which week days the schedule is active.
          *
-         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.14.3
+         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.12.3
          */
         daysMask: TlvField(2, TlvBitmap(TlvUInt8, DaysMask)),
 
         /**
          * This field shall indicate the starting hour for the Week Day schedule.
          *
-         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.14.4
+         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.12.4
          */
         startHour: TlvField(3, TlvUInt8.bound({ max: 23 })),
 
         /**
          * This field shall indicate the starting minute for the Week Day schedule.
          *
-         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.14.5
+         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.12.5
          */
         startMinute: TlvField(4, TlvUInt8.bound({ max: 59 })),
 
@@ -1421,7 +1433,7 @@ export namespace DoorLock {
          * This field shall indicate the ending hour for the Week Day schedule. EndHour shall be equal to or greater
          * than StartHour.
          *
-         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.14.6
+         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.12.6
          */
         endHour: TlvField(5, TlvUInt8.bound({ max: 23 })),
 
@@ -1432,7 +1444,7 @@ export namespace DoorLock {
          * If the EndHour is equal to 23 and the EndMinute is equal to 59 the Lock shall grant access to the user up
          * until 23:59:59.
          *
-         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.14.7
+         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.12.7
          */
         endMinute: TlvField(6, TlvUInt8.bound({ max: 59 }))
     });
@@ -1440,43 +1452,46 @@ export namespace DoorLock {
     /**
      * Input to the DoorLock setWeekDaySchedule command
      *
-     * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.14
+     * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.12
      */
     export interface SetWeekDayScheduleRequest extends TypeFromSchema<typeof TlvSetWeekDayScheduleRequest> {}
 
     /**
      * Input to the DoorLock getWeekDaySchedule command
      *
-     * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.15
+     * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.13
      */
     export const TlvGetWeekDayScheduleRequest = TlvObject({
         weekDayIndex: TlvField(0, TlvUInt8.bound({ min: 1 })),
-        userIndexUserId: TlvField(1, TlvUInt16.bound({ min: 1 }))
+        userIndex: TlvField(1, TlvUInt16.bound({ min: 1 }))
     });
 
     /**
      * Input to the DoorLock getWeekDaySchedule command
      *
-     * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.15
+     * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.13
      */
     export interface GetWeekDayScheduleRequest extends TypeFromSchema<typeof TlvGetWeekDayScheduleRequest> {}
 
     /**
      * Returns the weekly repeating schedule data for the specified schedule index.
      *
-     * † The Schedule ID and User ID are obsolete field names, use WeekDayIndex and UserIndex instead, respectively.
-     *
-     * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.16
+     * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.14
      */
     export const TlvGetWeekDayScheduleResponse = TlvObject({
         /**
          * This field shall indicate the index of the Week Day schedule.
          *
-         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.16.1
+         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.14.1
          */
         weekDayIndex: TlvField(0, TlvUInt8.bound({ min: 1 })),
 
-        userIndexUserId: TlvField(1, TlvUInt16.bound({ min: 1 })),
+        /**
+         * This field shall indicate the user ID.
+         *
+         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.14.2
+         */
+        userIndex: TlvField(1, TlvUInt16.bound({ min: 1 })),
 
         /**
          * Status shall be one of the following values:
@@ -1492,7 +1507,7 @@ export namespace DoorLock {
          * If this field is SUCCESS, the optional fields for this command shall be present. For other (error) status
          * values, only the fields up to the status field shall be present.
          *
-         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.16.3
+         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.14.3
          */
         status: TlvField(2, TlvEnum<Status>()),
 
@@ -1501,14 +1516,14 @@ export namespace DoorLock {
         /**
          * This field shall indicate the starting hour for the Week Day schedule.
          *
-         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.16.4
+         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.14.4
          */
         startHour: TlvOptionalField(4, TlvUInt8.bound({ max: 23 })),
 
         /**
          * This field shall indicate the starting minute for the Week Day schedule.
          *
-         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.16.5
+         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.14.5
          */
         startMinute: TlvOptionalField(5, TlvUInt8.bound({ max: 59 })),
 
@@ -1516,7 +1531,7 @@ export namespace DoorLock {
          * This field shall indicate the ending hour for the Week Day schedule. EndHour shall be equal to or greater
          * than StartHour.
          *
-         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.16.6
+         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.14.6
          */
         endHour: TlvOptionalField(6, TlvUInt8.bound({ max: 23 })),
 
@@ -1524,7 +1539,7 @@ export namespace DoorLock {
          * 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.
          *
-         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.16.7
+         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.14.7
          */
         endMinute: TlvOptionalField(7, TlvUInt8.bound({ max: 59 }))
     });
@@ -1532,56 +1547,64 @@ export namespace DoorLock {
     /**
      * Returns the weekly repeating schedule data for the specified schedule index.
      *
-     * † The Schedule ID and User ID are obsolete field names, use WeekDayIndex and UserIndex instead, respectively.
-     *
-     * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.16
+     * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.14
      */
     export interface GetWeekDayScheduleResponse extends TypeFromSchema<typeof TlvGetWeekDayScheduleResponse> {}
 
     /**
      * Input to the DoorLock clearWeekDaySchedule command
      *
-     * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.17
+     * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.15
      */
     export const TlvClearWeekDayScheduleRequest = TlvObject({
         /**
          * This field shall indicate the Week Day schedule index to clear or 0xFE to clear all Week Day schedules for
          * the specified user.
          *
-         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.17.1
+         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.15.1
          */
         weekDayIndex: TlvField(0, TlvUInt8),
 
-        userIndexUserId: TlvField(1, TlvUInt16.bound({ min: 1 }))
+        /**
+         * This field shall indicate the user ID.
+         *
+         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.15.2
+         */
+        userIndex: TlvField(1, TlvUInt16.bound({ min: 1 }))
     });
 
     /**
      * Input to the DoorLock clearWeekDaySchedule command
      *
-     * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.17
+     * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.15
      */
     export interface ClearWeekDayScheduleRequest extends TypeFromSchema<typeof TlvClearWeekDayScheduleRequest> {}
 
     /**
      * Input to the DoorLock setYearDaySchedule command
      *
-     * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.18
+     * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.16
      */
     export const TlvSetYearDayScheduleRequest = TlvObject({
         /**
          * This field shall indicate the index of the Year Day schedule.
          *
-         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.18.1
+         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.16.1
          */
         yearDayIndex: TlvField(0, TlvUInt8.bound({ min: 1 })),
 
-        userIndexUserId: TlvField(1, TlvUInt16.bound({ min: 1 })),
+        /**
+         * This field shall indicate the user ID.
+         *
+         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.16.2
+         */
+        userIndex: TlvField(1, TlvUInt16.bound({ min: 1 })),
 
         /**
          * 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.
          *
-         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.18.3
+         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.16.3
          */
         localStartTime: TlvField(2, TlvEpochS),
 
@@ -1590,7 +1613,7 @@ export namespace DoorLock {
          * offset based on the local timezone and DST offset on the day represented by the value. LocalEndTime shall be
          * greater than LocalStartTime.
          *
-         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.18.4
+         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.16.4
          */
         localEndTime: TlvField(3, TlvEpochS)
     });
@@ -1598,43 +1621,46 @@ export namespace DoorLock {
     /**
      * Input to the DoorLock setYearDaySchedule command
      *
-     * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.18
+     * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.16
      */
     export interface SetYearDayScheduleRequest extends TypeFromSchema<typeof TlvSetYearDayScheduleRequest> {}
 
     /**
      * Input to the DoorLock getYearDaySchedule command
      *
-     * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.19
+     * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.17
      */
     export const TlvGetYearDayScheduleRequest = TlvObject({
         yearDayIndex: TlvField(0, TlvUInt8.bound({ min: 1 })),
-        userIndexUserId: TlvField(1, TlvUInt16.bound({ min: 1 }))
+        userIndex: TlvField(1, TlvUInt16.bound({ min: 1 }))
     });
 
     /**
      * Input to the DoorLock getYearDaySchedule command
      *
-     * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.19
+     * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.17
      */
     export interface GetYearDayScheduleRequest extends TypeFromSchema<typeof TlvGetYearDayScheduleRequest> {}
 
     /**
      * Returns the year day schedule data for the specified schedule and user indexes.
      *
-     * † The Schedule ID and User ID are obsolete field names, use YearDayIndex and UserIndex instead, respectively.
-     *
-     * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.20
+     * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.18
      */
     export const TlvGetYearDayScheduleResponse = TlvObject({
         /**
          * This field shall indicate the index of the Year Day schedule.
          *
-         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.20.1
+         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.18.1
          */
         yearDayIndex: TlvField(0, TlvUInt8.bound({ min: 1 })),
 
-        userIndexUserId: TlvField(1, TlvUInt16.bound({ min: 1 })),
+        /**
+         * This field shall indicate the user ID.
+         *
+         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.18.2
+         */
+        userIndex: TlvField(1, TlvUInt16.bound({ min: 1 })),
 
         /**
          * Status shall be one of the following values:
@@ -1650,7 +1676,7 @@ export namespace DoorLock {
          * If this field is SUCCESS, the optional fields for this command shall be present. For other (error) status
          * values, only the fields up to the status field shall be present.
          *
-         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.20.3
+         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.18.3
          */
         status: TlvField(2, TlvEnum<Status>()),
 
@@ -1659,7 +1685,7 @@ export namespace DoorLock {
          * 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.
          *
-         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.20.4
+         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.18.4
          */
         localStartTime: TlvOptionalField(2, TlvEpochS),
 
@@ -1669,7 +1695,7 @@ export namespace DoorLock {
          * greater than LocalStartTime. This shall be null if the schedule is not set for the YearDayIndex and
          * UserIndex provided.
          *
-         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.20.5
+         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.18.5
          */
         localEndTime: TlvOptionalField(3, TlvEpochS)
     });
@@ -1677,33 +1703,36 @@ export namespace DoorLock {
     /**
      * Returns the year day schedule data for the specified schedule and user indexes.
      *
-     * † The Schedule ID and User ID are obsolete field names, use YearDayIndex and UserIndex instead, respectively.
-     *
-     * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.20
+     * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.18
      */
     export interface GetYearDayScheduleResponse extends TypeFromSchema<typeof TlvGetYearDayScheduleResponse> {}
 
     /**
      * Input to the DoorLock clearYearDaySchedule command
      *
-     * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.21
+     * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.19
      */
     export const TlvClearYearDayScheduleRequest = TlvObject({
         /**
          * This field shall indicate the Year Day schedule index to clear or 0xFE to clear all Year Day schedules for
          * the specified user.
          *
-         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.21.1
+         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.19.1
          */
         yearDayIndex: TlvField(0, TlvUInt8),
 
-        userIndexUserId: TlvField(1, TlvUInt16.bound({ min: 1 }))
+        /**
+         * This field shall indicate the user ID.
+         *
+         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.19.2
+         */
+        userIndex: TlvField(1, TlvUInt16.bound({ min: 1 }))
     });
 
     /**
      * Input to the DoorLock clearYearDaySchedule command
      *
-     * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.21
+     * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.19
      */
     export interface ClearYearDayScheduleRequest extends TypeFromSchema<typeof TlvClearYearDayScheduleRequest> {}
 
@@ -1721,20 +1750,20 @@ export namespace DoorLock {
      * door lock shall NOT disable the radio or otherwise unbind or leave the network. It shall still respond to all
      * other commands and requests.
      *
-     * @see {@link MatterSpecification.v13.Cluster} § 5.2.6.16
+     * @see {@link MatterSpecification.v13.Cluster} § 5.2.6.15
      */
     export enum OperatingMode {
         /**
          * The lock operates normally. All interfaces are enabled.
          *
-         * @see {@link MatterSpecification.v13.Cluster} § 5.2.6.16.1
+         * @see {@link MatterSpecification.v13.Cluster} § 5.2.6.15.1
          */
         Normal = 0,
 
         /**
          * Only remote interaction is enabled. The keypad shall only be operable by the master user.
          *
-         * @see {@link MatterSpecification.v13.Cluster} § 5.2.6.16.2
+         * @see {@link MatterSpecification.v13.Cluster} § 5.2.6.15.2
          */
         Vacation = 1,
 
@@ -1743,7 +1772,7 @@ export namespace DoorLock {
          * 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.
          *
-         * @see {@link MatterSpecification.v13.Cluster} § 5.2.6.16.3
+         * @see {@link MatterSpecification.v13.Cluster} § 5.2.6.15.3
          */
         Privacy = 2,
 
@@ -1752,7 +1781,7 @@ export namespace DoorLock {
          * means of communication. It specifically applies to the Lock, Unlock, Toggle, and Unlock with Timeout
          * Commands.
          *
-         * @see {@link MatterSpecification.v13.Cluster} § 5.2.6.16.4
+         * @see {@link MatterSpecification.v13.Cluster} § 5.2.6.15.4
          */
         NoRemoteLockUnlock = 3,
 
@@ -1760,7 +1789,7 @@ export namespace DoorLock {
          * 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).
          *
-         * @see {@link MatterSpecification.v13.Cluster} § 5.2.6.16.5
+         * @see {@link MatterSpecification.v13.Cluster} § 5.2.6.15.5
          */
         Passage = 4
     }
@@ -1768,13 +1797,13 @@ export namespace DoorLock {
     /**
      * Input to the DoorLock setHolidaySchedule command
      *
-     * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.22
+     * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.20
      */
     export const TlvSetHolidayScheduleRequest = TlvObject({
         /**
          * This field shall indicate the index of the Holiday schedule.
          *
-         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.22.1
+         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.20.1
          */
         holidayIndex: TlvField(0, TlvUInt8.bound({ min: 1 })),
 
@@ -1782,7 +1811,7 @@ export namespace DoorLock {
          * 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.
          *
-         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.22.2
+         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.20.2
          */
         localStartTime: TlvField(1, TlvEpochS),
 
@@ -1791,14 +1820,14 @@ export namespace DoorLock {
          * time offset based on the local timezone and DST offset on the day represented by the value. LocalEndTime
          * shall be greater than LocalStartTime.
          *
-         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.22.3
+         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.20.3
          */
         localEndTime: TlvField(2, TlvEpochS),
 
         /**
          * This field shall indicate the operating mode to use during this Holiday schedule start/end time.
          *
-         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.22.4
+         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.20.4
          */
         operatingMode: TlvField(3, TlvEnum<OperatingMode>())
     });
@@ -1806,36 +1835,34 @@ export namespace DoorLock {
     /**
      * Input to the DoorLock setHolidaySchedule command
      *
-     * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.22
+     * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.20
      */
     export interface SetHolidayScheduleRequest extends TypeFromSchema<typeof TlvSetHolidayScheduleRequest> {}
 
     /**
      * Input to the DoorLock getHolidaySchedule command
      *
-     * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.23
+     * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.21
      */
     export const TlvGetHolidayScheduleRequest = TlvObject({ holidayIndex: TlvField(0, TlvUInt8.bound({ min: 1 })) });
 
     /**
      * Input to the DoorLock getHolidaySchedule command
      *
-     * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.23
+     * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.21
      */
     export interface GetHolidayScheduleRequest extends TypeFromSchema<typeof TlvGetHolidayScheduleRequest> {}
 
     /**
      * Returns the Holiday Schedule Entry for the specified Holiday ID.
      *
-     * † The Holiday Schedule ID is an obsolete field name, use HolidayIndex instead.
-     *
-     * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.24
+     * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.22
      */
     export const TlvGetHolidayScheduleResponse = TlvObject({
         /**
          * This field shall indicate the index of the Holiday schedule.
          *
-         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.24.1
+         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.22.1
          */
         holidayIndex: TlvField(0, TlvUInt8.bound({ min: 1 })),
 
@@ -1854,7 +1881,7 @@ export namespace DoorLock {
          * If this field is SUCCESS, the optional fields for this command shall be present. For other (error) status
          * values, only the fields up to the status field shall be present.
          *
-         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.24.2
+         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.22.2
          */
         status: TlvField(1, TlvEnum<Status>()),
 
@@ -1863,7 +1890,7 @@ export namespace DoorLock {
          * 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.
          *
-         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.24.3
+         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.22.3
          */
         localStartTime: TlvOptionalField(2, TlvNullable(TlvEpochS)),
 
@@ -1872,7 +1899,7 @@ export namespace DoorLock {
          * 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.
          *
-         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.24.4
+         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.22.4
          */
         localEndTime: TlvOptionalField(3, TlvNullable(TlvEpochS)),
 
@@ -1880,7 +1907,7 @@ export namespace DoorLock {
          * 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.
          *
-         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.24.5
+         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.22.5
          */
         operatingMode: TlvOptionalField(4, TlvNullable(TlvEnum<OperatingMode>()))
     });
@@ -1888,22 +1915,20 @@ export namespace DoorLock {
     /**
      * Returns the Holiday Schedule Entry for the specified Holiday ID.
      *
-     * † The Holiday Schedule ID is an obsolete field name, use HolidayIndex instead.
-     *
-     * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.24
+     * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.22
      */
     export interface GetHolidayScheduleResponse extends TypeFromSchema<typeof TlvGetHolidayScheduleResponse> {}
 
     /**
      * Input to the DoorLock clearHolidaySchedule command
      *
-     * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.25
+     * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.23
      */
     export const TlvClearHolidayScheduleRequest = TlvObject({
         /**
          * This field shall indicate the Holiday schedule index to clear or 0xFE to clear all Holiday schedules.
          *
-         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.25.1
+         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.23.1
          */
         holidayIndex: TlvField(0, TlvUInt8)
     });
@@ -1911,21 +1936,21 @@ export namespace DoorLock {
     /**
      * Input to the DoorLock clearHolidaySchedule command
      *
-     * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.25
+     * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.23
      */
     export interface ClearHolidayScheduleRequest extends TypeFromSchema<typeof TlvClearHolidayScheduleRequest> {}
 
     /**
      * Input to the DoorLock setPinCode command
      *
-     * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.6
+     * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.4
      */
     export const TlvSetPinCodeRequest = TlvObject({
         /**
          * This field shall indicate the user ID. The value of the UserID field shall be between 0 and the value of the
          * NumberOfPINUsersSupported attribute.
          *
-         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.6.1
+         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.4.1
          */
         userId: TlvField(0, TlvUInt16),
 
@@ -1933,7 +1958,7 @@ export namespace DoorLock {
          * This field shall indicate the user status. Only the values 1 (Occupied/Enabled) and 3 (Occupied/Disabled)
          * are allowed for UserStatus.
          *
-         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.6.2
+         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.4.2
          */
         userStatus: TlvField(1, TlvNullable(TlvEnum<UserStatus>())),
 
@@ -1944,21 +1969,21 @@ export namespace DoorLock {
     /**
      * Input to the DoorLock setPinCode command
      *
-     * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.6
+     * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.4
      */
     export interface SetPinCodeRequest extends TypeFromSchema<typeof TlvSetPinCodeRequest> {}
 
     /**
      * Input to the DoorLock getPinCode command
      *
-     * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.7
+     * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.5
      */
     export const TlvGetPinCodeRequest = TlvObject({
         /**
          * This field shall indicate the user ID. The value of the UserID field shall be between 0 and the value of the
          * NumberOfPINUsersSupported attribute.
          *
-         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.7.1
+         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.5.1
          */
         userId: TlvField(0, TlvUInt16)
     });
@@ -1966,7 +1991,7 @@ export namespace DoorLock {
     /**
      * Input to the DoorLock getPinCode command
      *
-     * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.7
+     * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.5
      */
     export interface GetPinCodeRequest extends TypeFromSchema<typeof TlvGetPinCodeRequest> {}
 
@@ -1982,427 +2007,107 @@ export namespace DoorLock {
      * 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.
      *
-     * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.8
+     * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.6
      */
     export const TlvGetPinCodeResponse = TlvObject({
-        userId: TlvField(0, TlvUInt16),
-        userStatus: TlvField(1, TlvNullable(TlvEnum<UserStatus>())),
-        userType: TlvField(2, TlvNullable(TlvEnum<UserType>())),
-        pinCode: TlvField(3, TlvNullable(TlvByteString))
-    });
-
-    /**
-     * Returns the PIN for the specified user ID.
-     *
-     * If the requested UserID is valid and the Code doesn’t exist, Get RFID Code Response shall have the following
-     * format:
-     *
-     * UserID = requested User ID UserStatus = 0 (Available) UserType = Null (Not supported) PINCode = 0 (zero length)
-     *
-     * If 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.
-     *
-     * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.8
-     */
-    export interface GetPinCodeResponse extends TypeFromSchema<typeof TlvGetPinCodeResponse> {}
-
-    /**
-     * Input to the DoorLock clearPinCode command
-     *
-     * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.9
-     */
-    export const TlvClearPinCodeRequest = TlvObject({
-        /**
-         * This field shall specify a valid PIN code slot index or 0xFFFE to indicate all PIN code slots shall be
-         * cleared.
-         *
-         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.9.1
-         */
-        pinSlotIndex: TlvField(0, TlvUInt16)
-    });
-
-    /**
-     * Input to the DoorLock clearPinCode command
-     *
-     * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.9
-     */
-    export interface ClearPinCodeRequest extends TypeFromSchema<typeof TlvClearPinCodeRequest> {}
-
-    /**
-     * @see {@link MatterSpecification.v13.Cluster} § 5.2.6.7
-     */
-    export const EventMask = {
-        /**
-         * State of bit 0
-         */
-        bit0: BitFlag(0),
-
-        /**
-         * State of bit 1
-         */
-        bit1: BitFlag(1),
-
-        /**
-         * State of bit 2
-         */
-        bit2: BitFlag(2),
-
-        /**
-         * State of bit 3
-         */
-        bit3: BitFlag(3),
-
-        /**
-         * State of bit 4
-         */
-        bit4: BitFlag(4),
-
-        /**
-         * State of bit 5
-         */
-        bit5: BitFlag(5),
-
-        /**
-         * State of bit 6
-         */
-        bit6: BitFlag(6),
-
-        /**
-         * State of bit 7
-         */
-        bit7: BitFlag(7),
-
-        /**
-         * State of bit 8
-         */
-        bit8: BitFlag(8),
-
-        /**
-         * State of bit 9
-         */
-        bit9: BitFlag(9),
-
-        /**
-         * State of bit 10
-         */
-        bit10: BitFlag(10),
-
-        /**
-         * State of bit 11
-         */
-        bit11: BitFlag(11),
-
-        /**
-         * State of bit 12
-         */
-        bit12: BitFlag(12),
-
-        /**
-         * State of bit 13
-         */
-        bit13: BitFlag(13),
-
-        /**
-         * State of bit 14
-         */
-        bit14: BitFlag(14),
-
-        /**
-         * State of bit 15
-         */
-        bit15: BitFlag(15)
-    };
-
-    /**
-     * The value of the DoorLock keypadProgrammingEventMask attribute
-     *
-     * @see {@link MatterSpecification.v13.Cluster} § 5.2.9.45
-     */
-    export const KeypadProgrammingEventMask = {
-        unknown: BitFlag(0),
-        pinCodeChanged: BitFlag(1),
-        pinAdded: BitFlag(2),
-        pinCleared: BitFlag(3),
-        pinChanged: BitFlag(4),
-
-        /**
-         * State of bit 0
-         */
-        bit0: BitFlag(0),
-
-        /**
-         * State of bit 1
-         */
-        bit1: BitFlag(1),
-
-        /**
-         * State of bit 2
-         */
-        bit2: BitFlag(2),
-
-        /**
-         * State of bit 3
-         */
-        bit3: BitFlag(3),
-
-        /**
-         * State of bit 4
-         */
-        bit4: BitFlag(4),
-
-        /**
-         * State of bit 5
-         */
-        bit5: BitFlag(5),
-
-        /**
-         * State of bit 6
-         */
-        bit6: BitFlag(6),
-
-        /**
-         * State of bit 7
-         */
-        bit7: BitFlag(7),
-
-        /**
-         * State of bit 8
-         */
-        bit8: BitFlag(8),
-
-        /**
-         * State of bit 9
-         */
-        bit9: BitFlag(9),
-
-        /**
-         * State of bit 10
-         */
-        bit10: BitFlag(10),
-
-        /**
-         * State of bit 11
-         */
-        bit11: BitFlag(11),
-
-        /**
-         * State of bit 12
-         */
-        bit12: BitFlag(12),
-
-        /**
-         * State of bit 13
-         */
-        bit13: BitFlag(13),
-
-        /**
-         * State of bit 14
-         */
-        bit14: BitFlag(14),
-
-        /**
-         * State of bit 15
-         */
-        bit15: BitFlag(15)
-    };
-
-    /**
-     * The value of the DoorLock remoteProgrammingEventMask attribute
-     *
-     * @see {@link MatterSpecification.v13.Cluster} § 5.2.9.46
-     */
-    export const RemoteProgrammingEventMask = {
-        unknown: BitFlag(0),
-        pinAdded: BitFlag(2),
-        pinCleared: BitFlag(3),
-        pinChanged: BitFlag(4),
-        rfidCodeAdded: BitFlag(5),
-        rfidCodeCleared: BitFlag(6),
-
-        /**
-         * State of bit 0
-         */
-        bit0: BitFlag(0),
-
-        /**
-         * State of bit 1
-         */
-        bit1: BitFlag(1),
-
-        /**
-         * State of bit 2
-         */
-        bit2: BitFlag(2),
-
-        /**
-         * State of bit 3
-         */
-        bit3: BitFlag(3),
-
-        /**
-         * State of bit 4
-         */
-        bit4: BitFlag(4),
-
-        /**
-         * State of bit 5
-         */
-        bit5: BitFlag(5),
-
-        /**
-         * State of bit 6
-         */
-        bit6: BitFlag(6),
-
-        /**
-         * State of bit 7
-         */
-        bit7: BitFlag(7),
-
-        /**
-         * State of bit 8
-         */
-        bit8: BitFlag(8),
-
-        /**
-         * State of bit 9
-         */
-        bit9: BitFlag(9),
-
-        /**
-         * State of bit 10
-         */
-        bit10: BitFlag(10),
-
-        /**
-         * State of bit 11
-         */
-        bit11: BitFlag(11),
-
-        /**
-         * State of bit 12
-         */
-        bit12: BitFlag(12),
-
-        /**
-         * State of bit 13
-         */
-        bit13: BitFlag(13),
-
-        /**
-         * State of bit 14
-         */
-        bit14: BitFlag(14),
-
-        /**
-         * State of bit 15
-         */
-        bit15: BitFlag(15)
-    };
+        userId: TlvField(0, TlvUInt16),
+        userStatus: TlvField(1, TlvNullable(TlvEnum<UserStatus>())),
+        userType: TlvField(2, TlvNullable(TlvEnum<UserType>())),
+        pinCode: TlvField(3, TlvNullable(TlvByteString))
+    });
 
     /**
-     * The value of the DoorLock rfidProgrammingEventMask attribute
+     * Returns the PIN for the specified user ID.
+     *
+     * If the requested UserID is valid and the Code doesn’t exist, Get RFID Code Response shall have the following
+     * format:
+     *
+     * UserID = requested User ID UserStatus = 0 (Available) UserType = Null (Not supported) PINCode = 0 (zero length)
+     *
+     * If 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.
      *
-     * @see {@link MatterSpecification.v13.Cluster} § 5.2.9.47
+     * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.6
      */
-    export const RfidProgrammingEventMask = {
-        unknown: BitFlag(0),
-        idAdded: BitFlag(5),
-        idCleared: BitFlag(6),
-
-        /**
-         * State of bit 0
-         */
-        bit0: BitFlag(0),
-
-        /**
-         * State of bit 1
-         */
-        bit1: BitFlag(1),
-
-        /**
-         * State of bit 2
-         */
-        bit2: BitFlag(2),
-
-        /**
-         * State of bit 3
-         */
-        bit3: BitFlag(3),
-
-        /**
-         * State of bit 4
-         */
-        bit4: BitFlag(4),
-
-        /**
-         * State of bit 5
-         */
-        bit5: BitFlag(5),
-
-        /**
-         * State of bit 6
-         */
-        bit6: BitFlag(6),
-
-        /**
-         * State of bit 7
-         */
-        bit7: BitFlag(7),
-
-        /**
-         * State of bit 8
-         */
-        bit8: BitFlag(8),
+    export interface GetPinCodeResponse extends TypeFromSchema<typeof TlvGetPinCodeResponse> {}
 
+    /**
+     * Input to the DoorLock clearPinCode command
+     *
+     * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.7
+     */
+    export const TlvClearPinCodeRequest = TlvObject({
         /**
-         * State of bit 9
+         * This field shall specify a valid PIN code slot index or 0xFFFE to indicate all PIN code slots shall be
+         * cleared.
+         *
+         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.7.1
          */
-        bit9: BitFlag(9),
+        pinSlotIndex: TlvField(0, TlvUInt16)
+    });
 
-        /**
-         * State of bit 10
-         */
-        bit10: BitFlag(10),
+    /**
+     * Input to the DoorLock clearPinCode command
+     *
+     * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.7
+     */
+    export interface ClearPinCodeRequest extends TypeFromSchema<typeof TlvClearPinCodeRequest> {}
 
+    /**
+     * Input to the DoorLock setAliroReaderConfig command
+     *
+     * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.42
+     */
+    export const TlvSetAliroReaderConfigRequest = TlvObject({
         /**
-         * State of bit 11
+         * This field shall indicate the signing key component of the Reader’s key pair.
+         *
+         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.42.1
          */
-        bit11: BitFlag(11),
+        signingKey: TlvField(0, TlvByteString.bound({ length: 32 })),
 
         /**
-         * State of bit 12
+         * This field shall indicate the verification key component of the Reader’s key pair. This shall be an
+         * uncompressed elliptic curve public key as defined in section 2.3.3 of SEC 1.
+         *
+         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.42.2
          */
-        bit12: BitFlag(12),
+        verificationKey: TlvField(1, TlvByteString.bound({ length: 65 })),
 
         /**
-         * State of bit 13
+         * This field shall indicate the reader group identifier for the lock.
+         *
+         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.42.3
          */
-        bit13: BitFlag(13),
+        groupIdentifier: TlvField(2, TlvByteString.bound({ length: 16 })),
 
         /**
-         * State of bit 14
+         * This field shall indicate the group resolving key for the lock.
+         *
+         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.42.4
          */
-        bit14: BitFlag(14),
+        groupResolvingKey: TlvOptionalField(3, TlvByteString.bound({ length: 16 }))
+    });
 
-        /**
-         * State of bit 15
-         */
-        bit15: BitFlag(15)
-    };
+    /**
+     * Input to the DoorLock setAliroReaderConfig command
+     *
+     * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.42
+     */
+    export interface SetAliroReaderConfigRequest extends TypeFromSchema<typeof TlvSetAliroReaderConfigRequest> {}
 
     /**
      * Input to the DoorLock setUserStatus command
      *
-     * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.11
+     * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.9
      */
     export const TlvSetUserStatusRequest = TlvObject({
         /**
          * This field shall indicate the user ID. The value of the UserID field shall be between 0 and the value of the
          * NumberOfPINUsersSupported attribute.
          *
-         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.11.1
+         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.9.1
          */
         userId: TlvField(0, TlvUInt16),
 
@@ -2410,7 +2115,7 @@ export namespace DoorLock {
          * 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.
          *
-         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.11.2
+         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.9.2
          */
         userStatus: TlvField(1, TlvEnum<UserStatus>())
     });
@@ -2418,21 +2123,21 @@ export namespace DoorLock {
     /**
      * Input to the DoorLock setUserStatus command
      *
-     * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.11
+     * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.9
      */
     export interface SetUserStatusRequest extends TypeFromSchema<typeof TlvSetUserStatusRequest> {}
 
     /**
      * Input to the DoorLock getUserStatus command
      *
-     * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.12
+     * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.10
      */
     export const TlvGetUserStatusRequest = TlvObject({
         /**
          * This field shall indicate the user ID. The value of the UserID field shall be between 0 and the value of the
          * NumberOfPINUsersSupported attribute.
          *
-         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.12.1
+         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.10.1
          */
         userId: TlvField(0, TlvUInt16)
     });
@@ -2440,27 +2145,27 @@ export namespace DoorLock {
     /**
      * Input to the DoorLock getUserStatus command
      *
-     * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.12
+     * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.10
      */
     export interface GetUserStatusRequest extends TypeFromSchema<typeof TlvGetUserStatusRequest> {}
 
     /**
      * Returns the user status for the specified user ID.
      *
-     * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.13
+     * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.11
      */
     export const TlvGetUserStatusResponse = TlvObject({
         /**
          * This field shall indicate the user ID provided in the request.
          *
-         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.13.1
+         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.11.1
          */
         userId: TlvField(0, TlvUInt16),
 
         /**
          * This field shall indicate the current status of the requested user ID.
          *
-         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.13.2
+         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.11.2
          */
         userStatus: TlvField(1, TlvEnum<UserStatus>())
     });
@@ -2468,33 +2173,27 @@ export namespace DoorLock {
     /**
      * Returns the user status for the specified user ID.
      *
-     * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.13
+     * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.11
      */
     export interface GetUserStatusResponse extends TypeFromSchema<typeof TlvGetUserStatusResponse> {}
 
     /**
      * Input to the DoorLock setUserType command
      *
-     * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.26
+     * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.24
      */
     export const TlvSetUserTypeRequest = TlvObject({
         /**
          * This field shall indicate the user ID.
          *
-         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.26.1
+         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.24.1
          */
         userId: TlvField(0, TlvUInt16),
 
         /**
          * This field shall indicate the user type.
          *
-         * If UserType is currently YearDayScheduleUser, WeekDayScheduleUser, or ScheduleRestrictedUser and the new
-         * UserType is UnrestrictedUser then all existing Year Day and/or Week Day schedules shall be ignored or
-         * disabled (if this transition is supported by the door lock). If UserType is ScheduleRestrictedUser and the
-         * new UserType is ScheduleRestrictedUser then all existing Year Day and/or Week Day schedules shall be applied
-         * or enabled.
-         *
-         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.26.2
+         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.24.2
          */
         userType: TlvField(1, TlvEnum<UserType>())
     });
@@ -2502,21 +2201,21 @@ export namespace DoorLock {
     /**
      * Input to the DoorLock setUserType command
      *
-     * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.26
+     * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.24
      */
     export interface SetUserTypeRequest extends TypeFromSchema<typeof TlvSetUserTypeRequest> {}
 
     /**
      * Input to the DoorLock getUserType command
      *
-     * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.27
+     * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.25
      */
     export const TlvGetUserTypeRequest = TlvObject({ userId: TlvField(0, TlvUInt16) });
 
     /**
      * Input to the DoorLock getUserType command
      *
-     * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.27
+     * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.25
      */
     export interface GetUserTypeRequest extends TypeFromSchema<typeof TlvGetUserTypeRequest> {}
 
@@ -2524,7 +2223,7 @@ export namespace DoorLock {
      * 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.
      *
-     * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.28
+     * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.26
      */
     export const TlvGetUserTypeResponse = TlvObject({
         userId: TlvField(0, TlvUInt16),
@@ -2535,14 +2234,14 @@ export namespace DoorLock {
      * 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.
      *
-     * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.28
+     * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.26
      */
     export interface GetUserTypeResponse extends TypeFromSchema<typeof TlvGetUserTypeResponse> {}
 
     /**
      * Input to the DoorLock setRfidCode command
      *
-     * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.29
+     * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.27
      */
     export const TlvSetRfidCodeRequest = TlvObject({
         /**
@@ -2550,7 +2249,7 @@ export namespace DoorLock {
          *
          * The value of the UserID field shall be between 0 and the value of the NumberOfRFIDUsersSupported attribute.
          *
-         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.29.1
+         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.27.1
          */
         userId: TlvField(0, TlvUInt16),
 
@@ -2560,14 +2259,14 @@ export namespace DoorLock {
          *
          * Only the values 1 (Occupied/Enabled) and 3 (Occupied/Disabled) are allowed for UserStatus.
          *
-         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.29.2
+         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.27.2
          */
         userStatus: TlvField(1, TlvNullable(TlvEnum<UserStatus>())),
 
         /**
          * The values are the same as used for SetPINCode command.
          *
-         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.29.3
+         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.27.3
          */
         userType: TlvField(2, TlvNullable(TlvEnum<UserType>())),
 
@@ -2577,14 +2276,14 @@ export namespace DoorLock {
     /**
      * Input to the DoorLock setRfidCode command
      *
-     * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.29
+     * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.27
      */
     export interface SetRfidCodeRequest extends TypeFromSchema<typeof TlvSetRfidCodeRequest> {}
 
     /**
      * Input to the DoorLock getRfidCode command
      *
-     * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.30
+     * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.28
      */
     export const TlvGetRfidCodeRequest = TlvObject({
         /**
@@ -2592,7 +2291,7 @@ export namespace DoorLock {
          *
          * The value of the UserID field shall be between 0 and the value of the NumberOfRFIDUsersSupported attribute.
          *
-         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.30.1
+         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.28.1
          */
         userId: TlvField(0, TlvUInt16)
     });
@@ -2600,7 +2299,7 @@ export namespace DoorLock {
     /**
      * Input to the DoorLock getRfidCode command
      *
-     * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.30
+     * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.28
      */
     export interface GetRfidCodeRequest extends TypeFromSchema<typeof TlvGetRfidCodeRequest> {}
 
@@ -2617,7 +2316,7 @@ export namespace DoorLock {
      * 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.
      *
-     * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.31
+     * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.29
      */
     export const TlvGetRfidCodeResponse = TlvObject({
         userId: TlvField(0, TlvUInt16),
@@ -2639,21 +2338,21 @@ export namespace DoorLock {
      * 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.
      *
-     * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.31
+     * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.29
      */
     export interface GetRfidCodeResponse extends TypeFromSchema<typeof TlvGetRfidCodeResponse> {}
 
     /**
      * Input to the DoorLock clearRfidCode command
      *
-     * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.32
+     * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.30
      */
     export const TlvClearRfidCodeRequest = TlvObject({
         /**
          * This field shall indicate a valid RFID code slot index or 0xFFFE to indicate all RFID code slots shall be
          * cleared.
          *
-         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.32.1
+         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.30.1
          */
         rfidSlotIndex: TlvField(0, TlvUInt16)
     });
@@ -2661,20 +2360,20 @@ export namespace DoorLock {
     /**
      * Input to the DoorLock clearRfidCode command
      *
-     * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.32
+     * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.30
      */
     export interface ClearRfidCodeRequest extends TypeFromSchema<typeof TlvClearRfidCodeRequest> {}
 
     /**
      * Input to the DoorLock unboltDoor command
      *
-     * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.45
+     * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.41
      */
     export const TlvUnboltDoorRequest = TlvObject({
         /**
          * See PINCode field.
          *
-         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.45.1
+         * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.41.1
          */
         pinCode: TlvOptionalField(0, TlvByteString)
     });
@@ -2682,12 +2381,12 @@ export namespace DoorLock {
     /**
      * Input to the DoorLock unboltDoor command
      *
-     * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.45
+     * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.41
      */
     export interface UnboltDoorRequest extends TypeFromSchema<typeof TlvUnboltDoorRequest> {}
 
     /**
-     * @see {@link MatterSpecification.v13.Cluster} § 5.2.6.20
+     * @see {@link MatterSpecification.v13.Cluster} § 5.2.6.19
      */
     export enum LockState {
         /**
@@ -2712,7 +2411,7 @@ export namespace DoorLock {
     }
 
     /**
-     * @see {@link MatterSpecification.v13.Cluster} § 5.2.6.21
+     * @see {@link MatterSpecification.v13.Cluster} § 5.2.6.20
      */
     export enum LockType {
         /**
@@ -2777,7 +2476,7 @@ export namespace DoorLock {
     }
 
     /**
-     * @see {@link MatterSpecification.v13.Cluster} § 5.2.6.22
+     * @see {@link MatterSpecification.v13.Cluster} § 5.2.6.21
      */
     export enum LedSetting {
         /**
@@ -2797,7 +2496,7 @@ export namespace DoorLock {
     }
 
     /**
-     * @see {@link MatterSpecification.v13.Cluster} § 5.2.6.23
+     * @see {@link MatterSpecification.v13.Cluster} § 5.2.6.22
      */
     export enum SoundVolume {
         /**
@@ -3005,11 +2704,6 @@ export namespace DoorLock {
          */
         lockFactoryReset: BitFlag(1),
 
-        /**
-         * Reserved
-         */
-        na: BitFlag(2),
-
         /**
          * RF Module Power Cycled
          */
@@ -3113,7 +2807,7 @@ export namespace DoorLock {
     /**
      * This enumeration shall indicate the alarm type.
      *
-     * @see {@link MatterSpecification.v13.Cluster} § 5.2.6.8
+     * @see {@link MatterSpecification.v13.Cluster} § 5.2.6.7
      */
     export enum AlarmCode {
         /**
@@ -3181,7 +2875,7 @@ export namespace DoorLock {
     /**
      * This enumeration shall indicate the type of Lock operation performed.
      *
-     * @see {@link MatterSpecification.v13.Cluster} § 5.2.6.14
+     * @see {@link MatterSpecification.v13.Cluster} § 5.2.6.13
      */
     export enum LockOperationType {
         /**
@@ -3276,7 +2970,7 @@ export namespace DoorLock {
     /**
      * This enumeration shall indicate the error cause of the Lock/Unlock operation performed.
      *
-     * @see {@link MatterSpecification.v13.Cluster} § 5.2.6.15
+     * @see {@link MatterSpecification.v13.Cluster} § 5.2.6.14
      */
     export enum OperationError {
         /**
@@ -3375,128 +3069,23 @@ export namespace DoorLock {
     export interface LockOperationErrorEvent extends TypeFromSchema<typeof TlvLockOperationErrorEvent> {}
 
     /**
-     * @see {@link MatterSpecification.v13.Cluster} § 5.2.6.25.1
-     */
-    export enum OperationEventCode {
-        /**
-         * Event code is unknown
-         */
-        UnknownOrMfgSpecific = 0,
-
-        /**
-         * Event code is lock
-         */
-        Lock = 1,
-
-        /**
-         * Event code is unlock
-         */
-        Unlock = 2,
-
-        /**
-         * Event code is lock failure due to invalid PIN or RFID
-         */
-        LockFailureInvalidPiNorRfid = 3,
-
-        /**
-         * Event code is lock failure due to invalid schedule
-         */
-        LockFailureInvalidSchedule = 4,
-
-        /**
-         * Event code is unlock failure due to invalid PIN or RFID
-         */
-        UnlockFailureInvalidPiNorRfid = 5,
-
-        /**
-         * Event code is unlock failure due to invalid schedule
-         */
-        UnlockFailureInvalidSchedule = 6,
-
-        /**
-         * Event code is one touch lock
-         */
-        OneTouchLock = 7,
-
-        /**
-         * Event code is key lock
-         */
-        KeyLock = 8,
-
-        /**
-         * Event code is key unlock
-         */
-        KeyUnlock = 9,
-
-        /**
-         * Event code is auto lock
-         */
-        AutoLock = 10,
-
-        /**
-         * Event code is schedule lock
-         */
-        ScheduleLock = 11,
-
-        /**
-         * Event code is schedule unlock
-         */
-        ScheduleUnlock = 12,
-
-        /**
-         * Event code is manual lock (Key or Thumbturn)
-         */
-        ManualLock = 13,
-
-        /**
-         * Event code is manual unlock (Key or Thumbturn)
-         */
-        ManualUnlock = 14,
-
-        /**
-         * Event code is non access user operation
-         */
-        NonAccessUserOperationEvent = 15
-    }
-
-    /**
-     * @see {@link MatterSpecification.v13.Cluster} § 5.2.6.25.2
+     * @see {@link MatterSpecification.v13.Cluster} § 5.2.6.23
      */
-    export enum ProgrammingEventCode {
-        /**
-         * Event code is unknown
-         */
-        UnknownOrMfgSpecific = 0,
-
-        /**
-         * Event code is code changed
-         */
-        ProgrammingCodeChanged = 1,
-
-        /**
-         * Event code is PIN added
-         */
-        PinCodeAdded = 2,
-
-        /**
-         * Event code is PIN cleared
-         */
-        PinCodeCleared = 3,
-
+    export enum EventType {
         /**
-         * Event code is PIN changed
+         * Event type is operation
          */
-        PinCodeChanged = 4,
+        Operation = 0,
 
         /**
-         * Event code is RFID added
+         * Event type is programming
          */
-        RfidCodeAdded = 5,
+        Programming = 1,
 
         /**
-         * Event code is RFID cleared
+         * Event type is alarm
          */
-        RfidCodeCleared = 6
+        Alarm = 2
     }
 
     /**
@@ -3524,21 +3113,21 @@ export namespace DoorLock {
              *
              * Null only if an internal error prevents the retrieval of the current door state.
              *
-             * @see {@link MatterSpecification.v13.Cluster} § 5.2.9.5
+             * @see {@link MatterSpecification.v13.Cluster} § 5.2.9.4
              */
             doorState: Attribute(0x3, TlvNullable(TlvEnum<DoorState>())),
 
             /**
              * This attribute shall hold the number of door open events that have occurred since it was last zeroed.
              *
-             * @see {@link MatterSpecification.v13.Cluster} § 5.2.9.6
+             * @see {@link MatterSpecification.v13.Cluster} § 5.2.9.5
              */
             doorOpenEvents: OptionalWritableAttribute(0x4, TlvUInt32, { writeAcl: AccessLevel.Manage }),
 
             /**
              * This attribute shall hold the number of door closed events that have occurred since it was last zeroed.
              *
-             * @see {@link MatterSpecification.v13.Cluster} § 5.2.9.7
+             * @see {@link MatterSpecification.v13.Cluster} § 5.2.9.6
              */
             doorClosedEvents: OptionalWritableAttribute(0x5, TlvUInt32, { writeAcl: AccessLevel.Manage }),
 
@@ -3546,7 +3135,7 @@ export namespace DoorLock {
              * This attribute shall hold the number of minutes the door has been open since the last time it
              * transitioned from closed to open.
              *
-             * @see {@link MatterSpecification.v13.Cluster} § 5.2.9.8
+             * @see {@link MatterSpecification.v13.Cluster} § 5.2.9.7
              */
             openPeriod: OptionalWritableAttribute(0x6, TlvUInt16, { writeAcl: AccessLevel.Manage })
         },
@@ -3561,51 +3150,6 @@ export namespace DoorLock {
         }
     });
 
-    /**
-     * A DoorLockCluster supports these elements if it supports feature Logging.
-     */
-    export const LoggingComponent = MutableCluster.Component({
-        attributes: {
-            /**
-             * Indicates the number of available log records.
-             *
-             * @see {@link MatterSpecification.v13.Cluster} § 5.2.9.9
-             */
-            numberOfLogRecordsSupported: FixedAttribute(0x10, TlvUInt16, { default: 0 }),
-
-            /**
-             * This attribute shall enable/disable event logging.
-             *
-             * When event logging is enabled, all event messages are stored on the lock for retrieval. Logging events
-             * can be, but are not limited to, Tamper Alarm, Lock, Unlock, AutoRelock, User Code Added, User Code
-             * Cleared, Schedule Added, and Schedule Cleared. For a full detail of all the possible alarms and events,
-             * please refer to the full list in the Alarm and Event Masks Attribute Set.
-             *
-             * @see {@link MatterSpecification.v13.Cluster} § 5.2.9.22
-             */
-            enableLogging: WritableAttribute(0x20, TlvBoolean, { default: true, writeAcl: AccessLevel.Administer })
-        },
-
-        commands: {
-            /**
-             * Request a log record. Log number is between 1 – [Number of Log Records Supported attribute]. If log
-             * number 0 is requested then the most recent log entry is returned.
-             *
-             * Log record format: The log record format is defined in the description of the GetLogRecordResponse
-             * command.
-             *
-             * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.4
-             */
-            getLogRecord: Command(
-                0x4,
-                TlvGetLogRecordRequest,
-                0x4,
-                TlvGetLogRecordResponse,
-                { invokeAcl: AccessLevel.Manage }
-            )
-        }
-    });
-
     /**
      * A DoorLockCluster supports these elements if it supports feature User.
      */
@@ -3614,7 +3158,7 @@ export namespace DoorLock {
             /**
              * Indicates the number of total users supported by the lock.
              *
-             * @see {@link MatterSpecification.v13.Cluster} § 5.2.9.10
+             * @see {@link MatterSpecification.v13.Cluster} § 5.2.9.8
              */
             numberOfTotalUsersSupported: FixedAttribute(0x11, TlvUInt16, { default: 0 }),
 
@@ -3622,7 +3166,7 @@ export namespace DoorLock {
              * This attribute shall contain a bitmap with the bits set for the values of CredentialRuleEnum supported
              * on this device.
              *
-             * @see {@link MatterSpecification.v13.Cluster} § 5.2.9.20
+             * @see {@link MatterSpecification.v13.Cluster} § 5.2.9.18
              */
             credentialRulesSupport: FixedAttribute(
                 0x1b,
@@ -3641,7 +3185,7 @@ export namespace DoorLock {
              * 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.
              *
-             * @see {@link MatterSpecification.v13.Cluster} § 5.2.9.21
+             * @see {@link MatterSpecification.v13.Cluster} § 5.2.9.19
              */
             numberOfCredentialsSupportedPerUser: FixedAttribute(0x1c, TlvUInt8, { default: 0 }),
 
@@ -3650,7 +3194,7 @@ export namespace DoorLock {
              * 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.
              *
-             * @see {@link MatterSpecification.v13.Cluster} § 5.2.9.39
+             * @see {@link MatterSpecification.v13.Cluster} § 5.2.9.36
              */
             expiringUserTimeout: OptionalWritableAttribute(
                 0x35,
@@ -3678,7 +3222,7 @@ export namespace DoorLock {
              *   • INVALID_COMMAND, if one or more fields violate constraints or are invalid or if OperationType is
              *     Modify and UserIndex points to an available slot.
              *
-             * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.34
+             * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.32
              */
             setUser: Command(
                 0x1a,
@@ -3696,7 +3240,7 @@ export namespace DoorLock {
              * COMMAND, etc.) as needed otherwise the GetUserResponse Command shall be sent implying a status of
              * SUCCESS.
              *
-             * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.35
+             * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.33
              */
             getUser: Command(0x1b, TlvGetUserRequest, 0x1c, TlvGetUserResponse, { invokeAcl: AccessLevel.Administer }),
 
@@ -3709,7 +3253,7 @@ export namespace DoorLock {
              *
              * A LockUserChange event with the provided UserIndex shall be generated after successfully clearing users.
              *
-             * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.37
+             * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.35
              */
             clearUser: Command(
                 0x1d,
@@ -3725,7 +3269,7 @@ export namespace DoorLock {
              *
              * Fields used for different use cases:
              *
-             * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.40
+             * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.36
              */
             setCredential: Command(
                 0x22,
@@ -3741,7 +3285,7 @@ export namespace DoorLock {
              * An InvokeResponse command shall be sent with an appropriate error (e.g. FAILURE, INVALID_COMMAND, etc.)
              * as needed otherwise the GetCredentialStatusResponse command shall be sent implying a status of SUCCESS.
              *
-             * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.42
+             * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.38
              */
             getCredentialStatus: Command(
                 0x24,
@@ -3758,12 +3302,12 @@ export namespace DoorLock {
              *
              * For each credential cleared whose user doesn’t have another valid credential, the corresponding user
              * record shall be reset back to default values and its UserStatus value shall be set to Available and
-             * UserType value shall be set to UnrestrictedUser and all schedules shall be cleared. In
+             * 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.
              *
-             * this case a LockUserChange event shall be generated for the user being cleared. Return status shall be
-             * one of the following values:
+             * Return status shall be one of the following values:
              *
-             * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.44
+             * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.40
              */
             clearCredential: Command(
                 0x26,
@@ -3793,21 +3337,21 @@ export namespace DoorLock {
             /**
              * Indicates the number of PIN users supported.
              *
-             * @see {@link MatterSpecification.v13.Cluster} § 5.2.9.11
+             * @see {@link MatterSpecification.v13.Cluster} § 5.2.9.9
              */
             numberOfPinUsersSupported: FixedAttribute(0x12, TlvUInt16, { default: 0 }),
 
             /**
              * Indicates the maximum length in bytes of a PIN Code on this device.
              *
-             * @see {@link MatterSpecification.v13.Cluster} § 5.2.9.16
+             * @see {@link MatterSpecification.v13.Cluster} § 5.2.9.14
              */
             maxPinCodeLength: FixedAttribute(0x17, TlvUInt8),
 
             /**
              * Indicates the minimum length in bytes of a PIN Code on this device.
              *
-             * @see {@link MatterSpecification.v13.Cluster} § 5.2.9.17
+             * @see {@link MatterSpecification.v13.Cluster} § 5.2.9.15
              */
             minPinCodeLength: FixedAttribute(0x18, TlvUInt8)
         }
@@ -3821,7 +3365,7 @@ export namespace DoorLock {
             /**
              * Indicates the number of RFID users supported.
              *
-             * @see {@link MatterSpecification.v13.Cluster} § 5.2.9.12
+             * @see {@link MatterSpecification.v13.Cluster} § 5.2.9.10
              */
             numberOfRfidUsersSupported: FixedAttribute(0x13, TlvUInt16, { default: 0 }),
 
@@ -3830,7 +3374,7 @@ export namespace DoorLock {
              * 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.
              *
-             * @see {@link MatterSpecification.v13.Cluster} § 5.2.9.18
+             * @see {@link MatterSpecification.v13.Cluster} § 5.2.9.16
              */
             maxRfidCodeLength: FixedAttribute(0x19, TlvUInt8),
 
@@ -3839,7 +3383,7 @@ export namespace DoorLock {
              * 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.
              *
-             * @see {@link MatterSpecification.v13.Cluster} § 5.2.9.19
+             * @see {@link MatterSpecification.v13.Cluster} § 5.2.9.17
              */
             minRfidCodeLength: FixedAttribute(0x1a, TlvUInt8)
         }
@@ -3853,24 +3397,25 @@ export namespace DoorLock {
             /**
              * Indicates the number of configurable week day schedule supported per user.
              *
-             * @see {@link MatterSpecification.v13.Cluster} § 5.2.9.13
+             * @see {@link MatterSpecification.v13.Cluster} § 5.2.9.11
              */
-            numberOfWeekDaySchedulesSupportedPerUser: FixedAttribute(0x14, TlvUInt8, { default: 0 })
+            numberOfWeekDaySchedulesSupportedPerUser: FixedAttribute(
+                0x14,
+                TlvUInt8.bound({ max: 253 }),
+                { default: 0 }
+            )
         },
 
         commands: {
             /**
              * Set a weekly repeating schedule for a specified user.
              *
-             * † The Schedule ID and User ID are obsolete field names, use WeekDayIndex and UserIndex instead,
-             * respectively.
-             *
              * The associated UserType may be changed to ScheduleRestrictedUser by the lock when a Week Day schedule is
              * set.
              *
              * Return status shall be one of the following values:
              *
-             * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.14
+             * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.12
              */
             setWeekDaySchedule: Command(
                 0xb,
@@ -3883,10 +3428,7 @@ export namespace DoorLock {
             /**
              * Retrieve the specific weekly schedule for the specific user.
              *
-             * † The Schedule ID and User ID are obsolete field names, use WeekDayIndex and UserIndex instead,
-             * respectively.
-             *
-             * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.15
+             * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.13
              */
             getWeekDaySchedule: Command(
                 0xc,
@@ -3899,12 +3441,9 @@ export namespace DoorLock {
             /**
              * Clear the specific weekly schedule or all weekly schedules for the specific user.
              *
-             * † The Schedule ID and User ID are obsolete field names, use WeekDayIndex and UserIndex instead,
-             * respectively.
-             *
              * Return status shall be one of the following values:
              *
-             * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.17
+             * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.15
              */
             clearWeekDaySchedule: Command(
                 0xd,
@@ -3924,24 +3463,25 @@ export namespace DoorLock {
             /**
              * Indicates the number of configurable year day schedule supported per user.
              *
-             * @see {@link MatterSpecification.v13.Cluster} § 5.2.9.14
+             * @see {@link MatterSpecification.v13.Cluster} § 5.2.9.12
              */
-            numberOfYearDaySchedulesSupportedPerUser: FixedAttribute(0x15, TlvUInt8, { default: 0 })
+            numberOfYearDaySchedulesSupportedPerUser: FixedAttribute(
+                0x15,
+                TlvUInt8.bound({ max: 253 }),
+                { default: 0 }
+            )
         },
 
         commands: {
             /**
              * Set a time-specific schedule ID for a specified user.
              *
-             * † The Schedule ID and User ID are obsolete field names, use YearDayIndex and UserIndex instead,
-             * respectively.
-             *
              * The associated UserType may be changed to ScheduleRestrictedUser by the lock when a Year Day schedule is
              * set.
              *
              * Return status shall be one of the following values:
              *
-             * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.18
+             * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.16
              */
             setYearDaySchedule: Command(
                 0xe,
@@ -3954,10 +3494,7 @@ export namespace DoorLock {
             /**
              * Retrieve the specific year day schedule for the specific schedule and user indexes.
              *
-             * † The Schedule ID and User ID are obsolete field names, use YearDayIndex and UserIndex instead,
-             * respectively.
-             *
-             * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.19
+             * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.17
              */
             getYearDaySchedule: Command(
                 0xf,
@@ -3970,12 +3507,9 @@ export namespace DoorLock {
             /**
              * Clears the specific year day schedule or all year day schedules for the specific user.
              *
-             * † The Schedule ID and User ID are obsolete field names, use YearDayIndex and UserIndex instead,
-             * respectively.
-             *
              * Return status shall be one of the following values:
              *
-             * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.21
+             * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.19
              */
             clearYearDaySchedule: Command(
                 0x10,
@@ -3995,9 +3529,9 @@ export namespace DoorLock {
             /**
              * Indicates the number of holiday schedules supported for the entire door lock device.
              *
-             * @see {@link MatterSpecification.v13.Cluster} § 5.2.9.15
+             * @see {@link MatterSpecification.v13.Cluster} § 5.2.9.13
              */
-            numberOfHolidaySchedulesSupported: FixedAttribute(0x16, TlvUInt8, { default: 0 })
+            numberOfHolidaySchedulesSupported: FixedAttribute(0x16, TlvUInt8.bound({ max: 253 }), { default: 0 })
         },
 
         commands: {
@@ -4005,10 +3539,9 @@ export namespace DoorLock {
              * Set the holiday Schedule by specifying local start time and local end time with respect to any Lock
              * Operating Mode.
              *
-             * † The Holiday Schedule ID is an obsolete field name, use HolidayIndex instead. Return status shall be
-             * one of the following values:
+             * Return status shall be one of the following values:
              *
-             * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.22
+             * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.20
              */
             setHolidaySchedule: Command(
                 0x11,
@@ -4021,9 +3554,7 @@ export namespace DoorLock {
             /**
              * Get the holiday schedule for the specified index.
              *
-             * † The Holiday Schedule ID is an obsolete field name, use HolidayIndex instead.
-             *
-             * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.23
+             * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.21
              */
             getHolidaySchedule: Command(
                 0x12,
@@ -4036,9 +3567,7 @@ export namespace DoorLock {
             /**
              * Clears the holiday schedule or all holiday schedules.
              *
-             * † The Holiday Schedule ID is an obsolete field name, use HolidayIndex instead.
-             *
-             * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.25
+             * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.23
              */
             clearHolidaySchedule: Command(
                 0x13,
@@ -4067,7 +3596,7 @@ export namespace DoorLock {
              * logic, environmental events, or other reasons. The lock shall reset the counter if a valid credential is
              * presented.
              *
-             * @see {@link MatterSpecification.v13.Cluster} § 5.2.9.35
+             * @see {@link MatterSpecification.v13.Cluster} § 5.2.9.32
              */
             wrongCodeEntryLimit: WritableAttribute(
                 0x30,
@@ -4081,7 +3610,7 @@ export namespace DoorLock {
              * 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.
              *
-             * @see {@link MatterSpecification.v13.Cluster} § 5.2.9.36
+             * @see {@link MatterSpecification.v13.Cluster} § 5.2.9.33
              */
             userCodeTemporaryDisableTime: WritableAttribute(
                 0x31,
@@ -4102,12 +3631,13 @@ export namespace DoorLock {
              * door lock server to send PINs over the air. This attribute determines the behavior of the server’s TX
              * operation. If it is false, then it is not ok for the device to send PIN in any messages over the air.
              *
-             * The PIN field within any door lock cluster message shall keep the first octet unchanged and masks the
-             * actual code by replacing with 0xFF. For example (PIN "1234" ): If the attribute value is True, 0x04 0x31
-             * 0x32 0x33 0x34 shall be used in the PIN field in any door lock cluster message payload. If the attribute
-             * value is False, 0x04 0xFF 0xFF 0xFF 0xFF shall be used.
+             * The PIN field within any door lock cluster message shall keep the first octet unchanged and
              *
-             * @see {@link MatterSpecification.v13.Cluster} § 5.2.9.37
+             * 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.
+             *
+             * @see {@link MatterSpecification.v13.Cluster} § 5.2.9.34
              */
             sendPinOverTheAir: OptionalWritableAttribute(
                 0x32,
@@ -4123,7 +3653,7 @@ export namespace DoorLock {
              * Return status is a global status code or a cluster-specific status code from the Status Codes table and
              * shall be one of the following values:
              *
-             * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.6
+             * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.4
              */
             setPinCode: Command(
                 0x5,
@@ -4136,7 +3666,7 @@ export namespace DoorLock {
             /**
              * Retrieve a PIN Code.
              *
-             * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.7
+             * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.5
              */
             getPinCode: Command(
                 0x6,
@@ -4149,13 +3679,11 @@ export namespace DoorLock {
             /**
              * Clear a PIN code or all PIN codes.
              *
-             * † The User ID is an obsolete field name, use PINSlotIndex instead.
-             *
              * For each PIN Code cleared whose user doesn’t have a RFID Code or other credential type, then
              * corresponding user record’s UserStatus value shall be set to Available, and UserType value shall be set
              * to UnrestrictedUser and all schedules shall be cleared.
              *
-             * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.9
+             * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.7
              */
             clearPinCode: Command(
                 0x7,
@@ -4173,7 +3701,7 @@ export namespace DoorLock {
              * On the server, the clear all PIN codes command SHOULD have the same effect as the ClearPINCode command
              * with respect to the setting of user status, user type and schedules.
              *
-             * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.10
+             * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.8
              */
             clearAllPinCodes: Command(
                 0x8,
@@ -4195,7 +3723,7 @@ export namespace DoorLock {
              * 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.
              *
-             * @see {@link MatterSpecification.v13.Cluster} § 5.2.9.38
+             * @see {@link MatterSpecification.v13.Cluster} § 5.2.9.35
              */
             requirePinForRemoteOperation: WritableAttribute(
                 0x33,
@@ -4206,145 +3734,159 @@ export namespace DoorLock {
     });
 
     /**
-     * A DoorLockCluster supports these elements if it supports features Notification and PinCredential.
+     * A DoorLockCluster supports these elements if it supports feature AliroProvisioning.
      */
-    export const NotificationAndPinCredentialComponent = MutableCluster.Component({
+    export const AliroProvisioningComponent = MutableCluster.Component({
         attributes: {
             /**
-             * 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.
+             * Indicates the verification key component of the Reader’s key pair as defined in [Aliro]. The value, if
+             * not null, shall be an uncompressed elliptic curve public key as defined in section 2.3.3 of SEC 1.
              *
-             * This mask DOES NOT apply to the Events mechanism of this cluster.
+             * Null if no Reader key pair has been configured on the lock. See SetAliroReaderConfig.
              *
-             * @see {@link MatterSpecification.v13.Cluster} § 5.2.9.41
+             * @see {@link MatterSpecification.v13.Cluster} § 5.2.9.38
              */
-            keypadOperationEventMask: OptionalWritableAttribute(
-                0x41,
-                TlvBitmap(TlvUInt16, EventMask),
-                {
-                    default: BitsFromPartial(EventMask, { bit0: true, bit1: true, bit2: true, bit3: true, bit4: true, bit5: true, bit6: true, bit7: true, bit8: true, bit9: true, bit10: true, bit11: true, bit12: true, bit13: true, bit14: true, bit15: true }),
-                    writeAcl: AccessLevel.Administer
-                }
+            aliroReaderVerificationKey: Attribute(
+                0x80,
+                TlvNullable(TlvByteString.bound({ length: 65 })),
+                { default: null, readAcl: AccessLevel.Administer, writeAcl: AccessLevel.Administer }
             ),
 
             /**
-             * 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.
+             * Indicates the reader_group_identifier as defined in [Aliro].
              *
-             * This mask DOES NOT apply to the Events mechanism of this cluster.
+             * Null if no reader_group_identifier has been configured on the lock. See SetAliroReaderConfig.
              *
-             * @see {@link MatterSpecification.v13.Cluster} § 5.2.9.45
+             * @see {@link MatterSpecification.v13.Cluster} § 5.2.9.39
              */
-            keypadProgrammingEventMask: OptionalWritableAttribute(
-                0x45,
-                TlvBitmap(TlvUInt16, KeypadProgrammingEventMask),
-                {
-                    default: BitsFromPartial(KeypadProgrammingEventMask, { unknown: true, pinCodeChanged: true, pinAdded: true, pinCleared: true, pinChanged: true, bit5: true, bit6: true, bit7: true, bit8: true, bit9: true, bit10: true, bit11: true, bit12: true, bit13: true, bit14: true, bit15: true }),
-                    writeAcl: AccessLevel.Administer
-                }
-            )
-        }
-    });
+            aliroReaderGroupIdentifier: Attribute(
+                0x81,
+                TlvNullable(TlvByteString.bound({ length: 16 })),
+                { default: null, readAcl: AccessLevel.Administer, writeAcl: AccessLevel.Administer }
+            ),
 
-    /**
-     * A DoorLockCluster supports these elements if it supports feature Notification.
-     */
-    export const NotificationComponent = MutableCluster.Component({
-        attributes: {
             /**
-             * 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.
+             * Indicates the reader_group_sub_identifier as defined in [Aliro].
              *
-             * This mask DOES NOT apply to the Events mechanism of this cluster.
+             * @see {@link MatterSpecification.v13.Cluster} § 5.2.9.40
+             */
+            aliroReaderGroupSubIdentifier: FixedAttribute(
+                0x82,
+                TlvByteString.bound({ length: 16 }),
+                { readAcl: AccessLevel.Administer, writeAcl: AccessLevel.Administer }
+            ),
+
+            /**
+             * Indicates the list of protocol versions supported for expedited transactions as defined in [Aliro].
              *
-             * @see {@link MatterSpecification.v13.Cluster} § 5.2.9.42
+             * @see {@link MatterSpecification.v13.Cluster} § 5.2.9.41
              */
-            remoteOperationEventMask: OptionalWritableAttribute(
-                0x42,
-                TlvBitmap(TlvUInt16, EventMask),
-                {
-                    default: BitsFromPartial(EventMask, { bit0: true, bit1: true, bit2: true, bit3: true, bit4: true, bit5: true, bit6: true, bit7: true, bit8: true, bit9: true, bit10: true, bit11: true, bit12: true, bit13: true, bit14: true, bit15: true }),
-                    writeAcl: AccessLevel.Administer
-                }
+            aliroExpeditedTransactionSupportedProtocolVersions: FixedAttribute(
+                0x83,
+                TlvArray(TlvByteString, { maxLength: 16 }),
+                { default: [], readAcl: AccessLevel.Administer, writeAcl: AccessLevel.Administer }
             ),
 
             /**
-             * 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.
+             * Indicates the maximum number of AliroCredentialIssuerKey credentials that can be stored on the lock.
              *
-             * This mask DOES NOT apply to the Events mechanism of this cluster.
+             * @see {@link MatterSpecification.v13.Cluster} § 5.2.9.45
+             */
+            numberOfAliroCredentialIssuerKeysSupported: FixedAttribute(0x87, TlvUInt16, { default: 0 }),
+
+            /**
+             * 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.
              *
-             * @see {@link MatterSpecification.v13.Cluster} § 5.2.9.43
+             * NOTE
+             *
+             * The credential indices used for these two credential types are independent of each other, similar to all
+             * other credential types. As long as NumberOfAliroEndpointKeysSupported is at least 2 a client could add a
+             * credential of type AliroEvictableEndpointKey at any index from 1 to NumberOfAliroEndpointKeysSupported
+             * and also add a credential of type AliroNonEvictableEndpointKey at the same index, and both credentials
+             * would exist on the server.
+             *
+             * @see {@link MatterSpecification.v13.Cluster} § 5.2.9.46
              */
-            manualOperationEventMask: OptionalWritableAttribute(
-                0x43,
-                TlvBitmap(TlvUInt16, EventMask),
-                {
-                    default: BitsFromPartial(EventMask, { bit0: true, bit1: true, bit2: true, bit3: true, bit4: true, bit5: true, bit6: true, bit7: true, bit8: true, bit9: true, bit10: true, bit11: true, bit12: true, bit13: true, bit14: true, bit15: true }),
-                    writeAcl: AccessLevel.Administer
-                }
+            numberOfAliroEndpointKeysSupported: FixedAttribute(0x88, TlvUInt16, { default: 0 })
+        },
+
+        commands: {
+            /**
+             * This command allows communicating an Aliro Reader configuration, as defined in [Aliro], to the lock.
+             *
+             * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.42
+             */
+            setAliroReaderConfig: Command(
+                0x28,
+                TlvSetAliroReaderConfigRequest,
+                0x28,
+                TlvNoResponse,
+                { invokeAcl: AccessLevel.Administer, timed: true }
             ),
 
             /**
-             * 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.
+             * This command allows clearing an existing Aliro Reader configuration for the lock. Administrators shall
+             * NOT clear an Aliro Reader configuration without explicit user permission.
              *
-             * This mask DOES NOT apply to the Events mechanism of this cluster.
+             * NOTE
              *
-             * @see {@link MatterSpecification.v13.Cluster} § 5.2.9.46
+             * Using this command will revoke the ability of all existing Aliro user devices that have the old
+             * verification key to interact with the lock. This effect is not restricted to a single fabric or
+             * otherwise scoped in any way.
+             *
+             * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.43
              */
-            remoteProgrammingEventMask: OptionalWritableAttribute(
-                0x46,
-                TlvBitmap(TlvUInt16, RemoteProgrammingEventMask),
-                {
-                    default: BitsFromPartial(RemoteProgrammingEventMask, { unknown: true, bit1: true, pinAdded: true, pinCleared: true, pinChanged: true, rfidCodeAdded: true, rfidCodeCleared: true, bit7: true, bit8: true, bit9: true, bit10: true, bit11: true, bit12: true, bit13: true, bit14: true, bit15: true }),
-                    writeAcl: AccessLevel.Administer
-                }
+            clearAliroReaderConfig: Command(
+                0x29,
+                TlvNoArguments,
+                0x29,
+                TlvNoResponse,
+                { invokeAcl: AccessLevel.Administer, timed: true }
             )
         }
     });
 
     /**
-     * A DoorLockCluster supports these elements if it supports features Notification and RfidCredential.
+     * A DoorLockCluster supports these elements if it supports feature AliroBleuwb.
      */
-    export const NotificationAndRfidCredentialComponent = MutableCluster.Component({
+    export const AliroBleuwbComponent = MutableCluster.Component({
         attributes: {
             /**
-             * 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.
+             * Indicates the Group Resolving Key as defined in [Aliro].
              *
-             * This mask DOES NOT apply to the Events mechanism of this cluster.
+             * Null if no group resolving key has been configured on the lock. See SetAliroReaderConfig.
              *
-             * @see {@link MatterSpecification.v13.Cluster} § 5.2.9.44
+             * @see {@link MatterSpecification.v13.Cluster} § 5.2.9.42
              */
-            rfidOperationEventMask: OptionalWritableAttribute(
-                0x44,
-                TlvBitmap(TlvUInt16, EventMask),
-                {
-                    default: BitsFromPartial(EventMask, { bit0: true, bit1: true, bit2: true, bit3: true, bit4: true, bit5: true, bit6: true, bit7: true, bit8: true, bit9: true, bit10: true, bit11: true, bit12: true, bit13: true, bit14: true, bit15: true }),
-                    writeAcl: AccessLevel.Administer
-                }
+            aliroGroupResolvingKey: Attribute(
+                0x84,
+                TlvNullable(TlvByteString.bound({ length: 16 })),
+                { default: null, readAcl: AccessLevel.Administer, writeAcl: AccessLevel.Administer }
             ),
 
             /**
-             * 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.
-             *
-             * This mask DOES NOT apply to the Events mechanism of this cluster.
+             * Indicates the list of protocol versions supported for the Bluetooth LE + UWB Access Control Flow as
+             * defined in [Aliro].
              *
-             * This mask DOES NOT apply to the Events mechanism of this cluster.
+             * @see {@link MatterSpecification.v13.Cluster} § 5.2.9.43
+             */
+            aliroSupportedBleuwbProtocolVersions: FixedAttribute(
+                0x85,
+                TlvArray(TlvByteString, { maxLength: 16 }),
+                { default: [], readAcl: AccessLevel.Administer, writeAcl: AccessLevel.Administer }
+            ),
+
+            /**
+             * Indicates the version of the Bluetooth LE advertisement as defined in [Aliro].
              *
-             * @see {@link MatterSpecification.v13.Cluster} § 5.2.9.47
+             * @see {@link MatterSpecification.v13.Cluster} § 5.2.9.44
              */
-            rfidProgrammingEventMask: OptionalWritableAttribute(
-                0x47,
-                TlvBitmap(TlvUInt16, RfidProgrammingEventMask),
-                {
-                    default: BitsFromPartial(RfidProgrammingEventMask, { unknown: true, bit1: true, bit2: true, bit3: true, bit4: true, idAdded: true, idCleared: true, bit7: true, bit8: true, bit9: true, bit10: true, bit11: true, bit12: true, bit13: true, bit14: true, bit15: true }),
-                    writeAcl: AccessLevel.Administer
-                }
+            aliroBleAdvertisingVersion: FixedAttribute(
+                0x86,
+                TlvUInt8,
+                { default: 0, readAcl: AccessLevel.Administer, writeAcl: AccessLevel.Administer }
             )
         }
     });
@@ -4358,7 +3900,7 @@ export namespace DoorLock {
             /**
              * Set the status of a user ID.
              *
-             * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.11
+             * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.9
              */
             setUserStatus: OptionalCommand(
                 0x9,
@@ -4371,7 +3913,7 @@ export namespace DoorLock {
             /**
              * Get the status of a user.
              *
-             * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.12
+             * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.10
              */
             getUserStatus: OptionalCommand(
                 0xa,
@@ -4388,7 +3930,7 @@ export namespace DoorLock {
              *
              * Return status shall be one of the following values:
              *
-             * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.26
+             * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.24
              */
             setUserType: OptionalCommand(
                 0x14,
@@ -4401,7 +3943,7 @@ export namespace DoorLock {
             /**
              * Retrieve the user type for a specific user.
              *
-             * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.27
+             * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.25
              */
             getUserType: OptionalCommand(
                 0x15,
@@ -4430,7 +3972,7 @@ export namespace DoorLock {
              * Return status is a global status code or a cluster-specific status code from the Status Codes table and
              * shall be one of the following values:
              *
-             * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.29
+             * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.27
              */
             setRfidCode: Command(
                 0x16,
@@ -4443,7 +3985,7 @@ export namespace DoorLock {
             /**
              * Retrieve an RFID code.
              *
-             * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.30
+             * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.28
              */
             getRfidCode: Command(
                 0x17,
@@ -4456,13 +3998,11 @@ export namespace DoorLock {
             /**
              * Clear an RFID code or all RFID codes.
              *
-             * † The User ID is an obsolete field name, use RFIDSlotIndex instead.
-             *
              * For each RFID Code cleared whose user doesn’t have a PIN Code or other credential type, then the
              * corresponding user record’s UserStatus value shall be set to Available, and UserType value shall be set
              * to UnrestrictedUser and all schedules shall be cleared.
              *
-             * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.32
+             * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.30
              */
             clearRfidCode: Command(
                 0x18,
@@ -4477,7 +4017,7 @@ export namespace DoorLock {
              * 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.
              *
-             * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.33
+             * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.31
              */
             clearAllRfidCodes: Command(
                 0x19,
@@ -4504,7 +4044,7 @@ export namespace DoorLock {
              * If the attribute AutoRelockTime is supported, the lock will transition to the locked state when the auto
              * relock time has expired.
              *
-             * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.45
+             * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.41
              */
             unboltDoor: Command(0x27, TlvUnboltDoorRequest, 0x27, TlvNoResponse, { timed: true })
         }
@@ -4516,7 +4056,7 @@ export namespace DoorLock {
     export const Base = MutableCluster.Component({
         id: 0x101,
         name: "DoorLock",
-        revision: 7,
+        revision: 8,
 
         features: {
             /**
@@ -4541,7 +4081,6 @@ export namespace DoorLock {
              *
              * A lock may support multiple credential types so if the User feature is supported the UserType,
              * UserStatus and Schedules are all associated with a User index and not directly with a RFID index. A User
-             *
              * Index may have several credentials associated with it.
              *
              * @see {@link MatterSpecification.v13.Cluster} § 5.2.4.2
@@ -4564,27 +4103,20 @@ export namespace DoorLock {
              */
             fingerCredentials: BitFlag(2),
 
-            /**
-             * Logging
-             *
-             * 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.
-             *
-             * @see {@link MatterSpecification.v13.Cluster} § 5.2.4.4
-             */
-            logging: BitFlag(3),
-
             /**
              * WeekDayAccessSchedules
              *
              * If the User feature is supported then Week Day Schedules are applied to a User and not a credential.
              *
              * Week Day Schedules are used to restrict access to a specified time window on certain days of the week.
-             * The schedule is repeated each week. When a schedule is cleared this clears the access restrictions and
-             * grants unrestricted access to the user. The lock may automatically adjust the UserType when a schedule
-             * is created or cleared.
+             * The schedule is repeated each week.
              *
-             * @see {@link MatterSpecification.v13.Cluster} § 5.2.4.5
+             * The lock may automatically adjust the UserType when a schedule is created or cleared.
+             *
+             * Support for WeekDayAccessSchedules requires that the lock has the capability of keeping track of local
+             * time.
+             *
+             * @see {@link MatterSpecification.v13.Cluster} § 5.2.4.4
              */
             weekDayAccessSchedules: BitFlag(4),
 
@@ -4594,7 +4126,7 @@ export namespace DoorLock {
              * 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.
              *
-             * @see {@link MatterSpecification.v13.Cluster} § 5.2.4.6
+             * @see {@link MatterSpecification.v13.Cluster} § 5.2.4.5
              */
             doorPositionSensor: BitFlag(5),
 
@@ -4610,7 +4142,7 @@ export namespace DoorLock {
              * A lock may support multiple credential types so if the User feature is supported the UserType,
              * UserStatus and Schedules are all associated with a User and not directly with a credential.
              *
-             * @see {@link MatterSpecification.v13.Cluster} § 5.2.4.7
+             * @see {@link MatterSpecification.v13.Cluster} § 5.2.4.6
              */
             faceCredentials: BitFlag(6),
 
@@ -4618,10 +4150,11 @@ export namespace DoorLock {
              * CredentialOverTheAirAccess
              *
              * 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.
              *
-             * @see {@link MatterSpecification.v13.Cluster} § 5.2.4.8
+             * @see {@link MatterSpecification.v13.Cluster} § 5.2.4.7
              */
             credentialOverTheAirAccess: BitFlag(7),
 
@@ -4632,30 +4165,22 @@ export namespace DoorLock {
              * 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.
              *
-             * @see {@link MatterSpecification.v13.Cluster} § 5.2.4.9
+             * @see {@link MatterSpecification.v13.Cluster} § 5.2.4.8
              */
             user: BitFlag(8),
 
-            /**
-             * Notification
-             *
-             * This is a feature used before support of events. This feature supports notification commands and masks
-             * used to filter these notifications.
-             *
-             * @see {@link MatterSpecification.v13.Cluster} § 5.2.4.10
-             */
-            notification: BitFlag(9),
-
             /**
              * YearDayAccessSchedules
              *
              * 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.
              *
-             * Year Day Schedules are used to restrict access to a specified date and time window. When a schedule is
-             * cleared this clears the access restrictions and grants unrestricted access to the user. The lock may
-             * automatically adjust the UserType when a schedule is created or cleared.
+             * The lock may automatically adjust the UserType when a schedule is created or cleared.
              *
-             * @see {@link MatterSpecification.v13.Cluster} § 5.2.4.11
+             * Support for YearDayAccessSchedules requires that the lock has the capability of keeping track of local
+             * time.
+             *
+             * @see {@link MatterSpecification.v13.Cluster} § 5.2.4.9
              */
             yearDayAccessSchedules: BitFlag(10),
 
@@ -4665,7 +4190,9 @@ export namespace DoorLock {
              * 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.
              *
-             * @see {@link MatterSpecification.v13.Cluster} § 5.2.4.12
+             * Support for HolidaySchedules requires that the lock has the capability of keeping track of local time.
+             *
+             * @see {@link MatterSpecification.v13.Cluster} § 5.2.4.10
              */
             holidaySchedules: BitFlag(11),
 
@@ -4678,9 +4205,29 @@ export namespace DoorLock {
              * Unlatched. Locks without unbolting support don’t differentiate between unbolting and unlocking and
              * perform the same operation for both commands.
              *
+             * @see {@link MatterSpecification.v13.Cluster} § 5.2.4.11
+             */
+            unbolting: BitFlag(12),
+
+            /**
+             * AliroProvisioning
+             *
+             * Locks that support this feature implement the Aliro specification as defined in [Aliro] and support
+             * Matter as a method for provisioning Aliro credentials.
+             *
+             * @see {@link MatterSpecification.v13.Cluster} § 5.2.4.12
+             */
+            aliroProvisioning: BitFlag(13),
+
+            /**
+             * AliroBleuwb
+             *
+             * Locks that support this feature implement the Bluetooth LE + UWB Access Control Flow as defined in
+             * [Aliro].
+             *
              * @see {@link MatterSpecification.v13.Cluster} § 5.2.4.13
              */
-            unbolting: BitFlag(12)
+            aliroBleuwb: BitFlag(14)
         },
 
         attributes: {
@@ -4693,14 +4240,14 @@ export namespace DoorLock {
              * Locked and Unlocked so it is only partially secured. For example, a deadbolt could be partially extended
              * and not in a dead latched state.
              *
-             * @see {@link MatterSpecification.v13.Cluster} § 5.2.9.2
+             * @see {@link MatterSpecification.v13.Cluster} § 5.2.9.1
              */
-            lockState: Attribute(0x0, TlvNullable(TlvEnum<LockState>()), { scene: true }),
+            lockState: Attribute(0x0, TlvNullable(TlvEnum<LockState>())),
 
             /**
              * Indicates the type of door lock as defined in LockTypeEnum.
              *
-             * @see {@link MatterSpecification.v13.Cluster} § 5.2.9.3
+             * @see {@link MatterSpecification.v13.Cluster} § 5.2.9.2
              */
             lockType: Attribute(0x1, TlvEnum<LockType>()),
 
@@ -4708,7 +4255,7 @@ export namespace DoorLock {
              * Indicates if the lock is currently able to (Enabled) or not able to (Disabled) process remote Lock,
              * Unlock, or Unlock with Timeout commands.
              *
-             * @see {@link MatterSpecification.v13.Cluster} § 5.2.9.4
+             * @see {@link MatterSpecification.v13.Cluster} § 5.2.9.3
              */
             actuatorEnabled: Attribute(0x2, TlvBoolean),
 
@@ -4716,7 +4263,7 @@ export namespace DoorLock {
              * Indicates the language for the on-screen or audible user interface using a 2- byte language code from
              * ISO-639-1.
              *
-             * @see {@link MatterSpecification.v13.Cluster} § 5.2.9.23
+             * @see {@link MatterSpecification.v13.Cluster} § 5.2.9.20
              */
             language: OptionalWritableAttribute(
                 0x21,
@@ -4727,7 +4274,7 @@ export namespace DoorLock {
             /**
              * Indicates the settings for the LED support, as defined by LEDSettingEnum.
              *
-             * @see {@link MatterSpecification.v13.Cluster} § 5.2.9.24
+             * @see {@link MatterSpecification.v13.Cluster} § 5.2.9.21
              */
             ledSettings: OptionalWritableAttribute(
                 0x22,
@@ -4740,14 +4287,14 @@ export namespace DoorLock {
              * 0=disabled. If set, unlock operations from any source will be timed. For one time unlock with timeout
              * use the specific command.
              *
-             * @see {@link MatterSpecification.v13.Cluster} § 5.2.9.25
+             * @see {@link MatterSpecification.v13.Cluster} § 5.2.9.22
              */
             autoRelockTime: OptionalWritableAttribute(0x23, TlvUInt32, { writeAcl: AccessLevel.Manage }),
 
             /**
              * Indicates the sound volume on a door lock as defined by SoundVolumeEnum.
              *
-             * @see {@link MatterSpecification.v13.Cluster} § 5.2.9.26
+             * @see {@link MatterSpecification.v13.Cluster} § 5.2.9.23
              */
             soundVolume: OptionalWritableAttribute(
                 0x24,
@@ -4758,7 +4305,7 @@ export namespace DoorLock {
             /**
              * Indicates the current operating mode of the lock as defined in OperatingModeEnum.
              *
-             * @see {@link MatterSpecification.v13.Cluster} § 5.2.9.27
+             * @see {@link MatterSpecification.v13.Cluster} § 5.2.9.24
              */
             operatingMode: WritableAttribute(
                 0x25,
@@ -4771,7 +4318,7 @@ export namespace DoorLock {
              * 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.
              *
-             * @see {@link MatterSpecification.v13.Cluster} § 5.2.9.28
+             * @see {@link MatterSpecification.v13.Cluster} § 5.2.9.25
              */
             supportedOperatingModes: FixedAttribute(
                 0x26,
@@ -4781,8 +4328,10 @@ export namespace DoorLock {
 
             /**
              * Indicates the default configurations as they are physically set on the device (example: hardware dip
-             * switch setting, etc…) and represents the default setting for some of the attributes within this cluster
-             * (for example: LED, Auto Lock, Sound Volume, and Operating Mode attributes).
+             * switch setting, etc…) and represents the default setting for some of the
+             *
+             * attributes within this cluster (for example: LED, Auto Lock, Sound Volume, and Operating Mode
+             * attributes).
              *
              * This is a read-only attribute and is intended to allow clients to determine what changes may need to be
              * made without having to query all the included attributes. It may be beneficial for the clients to know
@@ -4796,7 +4345,7 @@ export namespace DoorLock {
              * 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.
              *
-             * @see {@link MatterSpecification.v13.Cluster} § 5.2.9.29
+             * @see {@link MatterSpecification.v13.Cluster} § 5.2.9.26
              */
             defaultConfigurationRegister: OptionalAttribute(0x27, TlvBitmap(TlvUInt16, ConfigurationRegister)),
 
@@ -4807,7 +4356,7 @@ export namespace DoorLock {
              * lock for those features whose bit is set to 0 in the LocalProgrammingFeatures attribute. Local
              * programming shall be enabled by default.
              *
-             * @see {@link MatterSpecification.v13.Cluster} § 5.2.9.30
+             * @see {@link MatterSpecification.v13.Cluster} § 5.2.9.27
              */
             enableLocalProgramming: OptionalWritableAttribute(
                 0x28,
@@ -4819,7 +4368,7 @@ export namespace DoorLock {
              * This attribute shall enable/disable the ability to lock the door lock with a single touch on the door
              * lock.
              *
-             * @see {@link MatterSpecification.v13.Cluster} § 5.2.9.31
+             * @see {@link MatterSpecification.v13.Cluster} § 5.2.9.28
              */
             enableOneTouchLocking: OptionalWritableAttribute(
                 0x29,
@@ -4831,7 +4380,7 @@ export namespace DoorLock {
              * This attribute shall enable/disable an inside LED that allows the user to see at a glance if the door is
              * locked.
              *
-             * @see {@link MatterSpecification.v13.Cluster} § 5.2.9.32
+             * @see {@link MatterSpecification.v13.Cluster} § 5.2.9.29
              */
             enableInsideStatusLed: OptionalWritableAttribute(
                 0x2a,
@@ -4843,7 +4392,7 @@ export namespace DoorLock {
              * 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.
              *
-             * @see {@link MatterSpecification.v13.Cluster} § 5.2.9.33
+             * @see {@link MatterSpecification.v13.Cluster} § 5.2.9.30
              */
             enablePrivacyModeButton: OptionalWritableAttribute(
                 0x2b,
@@ -4860,7 +4409,7 @@ export namespace DoorLock {
              *
              * The features that can be disabled from local programming are defined in LocalProgrammingFeaturesBitmap.
              *
-             * @see {@link MatterSpecification.v13.Cluster} § 5.2.9.34
+             * @see {@link MatterSpecification.v13.Cluster} § 5.2.9.31
              */
             localProgrammingFeatures: OptionalWritableAttribute(
                 0x2c,
@@ -4876,13 +4425,13 @@ export namespace DoorLock {
              *
              * This mask DOES NOT apply to the Events mechanism of this cluster.
              *
-             * @see {@link MatterSpecification.v13.Cluster} § 5.2.9.40
+             * @see {@link MatterSpecification.v13.Cluster} § 5.2.9.37
              */
             alarmMask: OptionalWritableAttribute(
                 0x40,
                 TlvBitmap(TlvUInt16, AlarmMask),
                 {
-                    default: BitsFromPartial(AlarmMask, { lockJammed: true, lockFactoryReset: true, na: true, lockRadioPowerCycled: true, wrongCodeEntryLimit: true, frontEscutcheonRemoved: true, doorForcedOpen: true }),
+                    default: BitsFromPartial(AlarmMask, { lockJammed: true, lockFactoryReset: true, lockRadioPowerCycled: true, wrongCodeEntryLimit: true, frontEscutcheonRemoved: true, doorForcedOpen: true }),
                     writeAcl: AccessLevel.Administer
                 }
             )
@@ -4894,8 +4443,6 @@ export namespace DoorLock {
              * lock. The door lock may require a PIN depending on the value of the RequirePINForRemoteOperation
              * attribute.
              *
-             * † The PIN/RFID Code is an obsolete field name, use PINCode instead.
-             *
              * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.1
              */
             lockDoor: Command(0x0, TlvLockDoorRequest, 0x0, TlvNoResponse, { timed: true }),
@@ -4910,8 +4457,6 @@ export namespace DoorLock {
              * If the attribute AutoRelockTime is supported the lock will transition to the locked state when the auto
              * relock time has expired.
              *
-             * † The PIN/RFID Code is an obsolete field name, use PINCode instead.
-             *
              * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.2
              */
             unlockDoor: Command(0x1, TlvUnlockDoorRequest, 0x1, TlvNoResponse, { timed: true }),
@@ -4919,12 +4464,9 @@ export namespace DoorLock {
             /**
              * 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.
-             *
-             * † The PIN/RFID Code is an obsolete field name, use PINCode instead.
+             * 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.
              *
              * @see {@link MatterSpecification.v13.Cluster} § 5.2.10.3
              */
@@ -4964,8 +4506,9 @@ export namespace DoorLock {
              *     ◦ shall generate a LockOperation event of LockOperationType Unlatch when it is actuated from the
              *       outside.
              *
-             *     ◦ may generate a LockOperation event of LockOperationType Unlatch when it is actuated from the
-             *       inside.
+             *     ◦ may generate a LockOperation event of LockOperationType Unlatch when it is actuated
+             *
+             * from the inside.
              *
              * @see {@link MatterSpecification.v13.Cluster} § 5.2.11.3
              */
@@ -4985,7 +4528,6 @@ export namespace DoorLock {
          */
         extensions: MutableCluster.Extensions(
             { flags: { doorPositionSensor: true }, component: DoorPositionSensorComponent },
-            { flags: { logging: true }, component: LoggingComponent },
             { flags: { user: true }, component: UserComponent },
             { flags: { pinCredential: true }, component: PinCredentialComponent },
             { flags: { rfidCredential: true }, component: RfidCredentialComponent },
@@ -4999,9 +4541,8 @@ export namespace DoorLock {
                 flags: { credentialOverTheAirAccess: true, pinCredential: true },
                 component: CredentialOverTheAirAccessAndPinCredentialComponent
             },
-            { flags: { notification: true, pinCredential: true }, component: NotificationAndPinCredentialComponent },
-            { flags: { notification: true }, component: NotificationComponent },
-            { flags: { notification: true, rfidCredential: true }, component: NotificationAndRfidCredentialComponent },
+            { flags: { aliroProvisioning: true }, component: AliroProvisioningComponent },
+            { flags: { aliroBleuwb: true }, component: AliroBleuwbComponent },
             {
                 flags: { pinCredential: true, rfidCredential: true, fingerCredentials: true, user: false },
                 component: PinCredentialAndRfidCredentialAndFingerCredentialsNotUserComponent
@@ -5009,6 +4550,7 @@ export namespace DoorLock {
             { flags: { user: false }, component: NotUserComponent },
             { flags: { rfidCredential: true, user: false }, component: RfidCredentialNotUserComponent },
             { flags: { unbolting: true }, component: UnboltingComponent },
+            { flags: { aliroProvisioning: true, user: false }, component: false },
 
             {
                 flags: {
@@ -5020,7 +4562,9 @@ export namespace DoorLock {
                 },
 
                 component: false
-            }
+            },
+
+            { flags: { aliroBleuwb: true, aliroProvisioning: false }, component: false }
         )
     });
 
@@ -5034,6 +4578,8 @@ export namespace DoorLock {
      * 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.
      *
+     * Figure 16. Typical Usage of the Door Lock Cluster
+     *
      * DoorLockCluster supports optional features that you can enable with the DoorLockCluster.with() factory method.
      *
      * @see {@link MatterSpecification.v13.Cluster} § 5.2
@@ -5042,7 +4588,6 @@ export namespace DoorLock {
 
     export const Cluster: Cluster = ClusterInstance;
     const DPS = { doorPositionSensor: true };
-    const LOG = { logging: true };
     const USR = { user: true };
     const PIN = { pinCredential: true };
     const RID = { rfidCredential: true };
@@ -5051,9 +4596,8 @@ export namespace DoorLock {
     const HDSCH = { holidaySchedules: true };
     const PIN_NOT_USR = { pinCredential: true, user: false };
     const COTA_PIN = { credentialOverTheAirAccess: true, pinCredential: true };
-    const NOT_PIN = { notification: true, pinCredential: true };
-    const NOT = { notification: true };
-    const NOT_RID = { notification: true, rfidCredential: true };
+    const ALIRO = { aliroProvisioning: true };
+    const ALBU = { aliroBleuwb: true };
     const PIN_RID_FGP_NOT_USR = { pinCredential: true, rfidCredential: true, fingerCredentials: true, user: false };
     const RID_NOT_USR = { rfidCredential: true, user: false };
     const UBOLT = { unbolting: true };
@@ -5085,10 +4629,6 @@ export namespace DoorLock {
                 DoorPositionSensorComponent.attributes.openPeriod,
                 { optionalIf: [DPS] }
             ),
-            numberOfLogRecordsSupported: MutableCluster.AsConditional(
-                LoggingComponent.attributes.numberOfLogRecordsSupported,
-                { mandatoryIf: [LOG] }
-            ),
             numberOfTotalUsersSupported: MutableCluster.AsConditional(
                 UserComponent.attributes.numberOfTotalUsersSupported,
                 { mandatoryIf: [USR] }
@@ -5137,10 +4677,6 @@ export namespace DoorLock {
                 UserComponent.attributes.numberOfCredentialsSupportedPerUser,
                 { mandatoryIf: [USR] }
             ),
-            enableLogging: MutableCluster.AsConditional(
-                LoggingComponent.attributes.enableLogging,
-                { mandatoryIf: [LOG] }
-            ),
             wrongCodeEntryLimit: MutableCluster.AsConditional(
                 PinCredentialOrRfidCredentialComponent.attributes.wrongCodeEntryLimit,
                 { mandatoryIf: [PIN, RID] }
@@ -5161,39 +4697,46 @@ export namespace DoorLock {
                 UserComponent.attributes.expiringUserTimeout,
                 { optionalIf: [USR] }
             ),
-            keypadOperationEventMask: MutableCluster.AsConditional(
-                NotificationAndPinCredentialComponent.attributes.keypadOperationEventMask,
-                { optionalIf: [NOT_PIN] }
+            aliroReaderVerificationKey: MutableCluster.AsConditional(
+                AliroProvisioningComponent.attributes.aliroReaderVerificationKey,
+                { mandatoryIf: [ALIRO] }
             ),
-            remoteOperationEventMask: MutableCluster.AsConditional(
-                NotificationComponent.attributes.remoteOperationEventMask,
-                { optionalIf: [NOT] }
+            aliroReaderGroupIdentifier: MutableCluster.AsConditional(
+                AliroProvisioningComponent.attributes.aliroReaderGroupIdentifier,
+                { mandatoryIf: [ALIRO] }
             ),
-            manualOperationEventMask: MutableCluster.AsConditional(
-                NotificationComponent.attributes.manualOperationEventMask,
-                { optionalIf: [NOT] }
+            aliroReaderGroupSubIdentifier: MutableCluster.AsConditional(
+                AliroProvisioningComponent.attributes.aliroReaderGroupSubIdentifier,
+                { mandatoryIf: [ALIRO] }
             ),
-            rfidOperationEventMask: MutableCluster.AsConditional(
-                NotificationAndRfidCredentialComponent.attributes.rfidOperationEventMask,
-                { optionalIf: [NOT_RID] }
+            aliroExpeditedTransactionSupportedProtocolVersions: MutableCluster.AsConditional(
+                AliroProvisioningComponent.attributes.aliroExpeditedTransactionSupportedProtocolVersions,
+                { mandatoryIf: [ALIRO] }
             ),
-            keypadProgrammingEventMask: MutableCluster.AsConditional(
-                NotificationAndPinCredentialComponent.attributes.keypadProgrammingEventMask,
-                { optionalIf: [NOT_PIN] }
+            aliroGroupResolvingKey: MutableCluster.AsConditional(
+                AliroBleuwbComponent.attributes.aliroGroupResolvingKey,
+                { mandatoryIf: [ALBU] }
             ),
-            remoteProgrammingEventMask: MutableCluster.AsConditional(
-                NotificationComponent.attributes.remoteProgrammingEventMask,
-                { optionalIf: [NOT] }
+            aliroSupportedBleuwbProtocolVersions: MutableCluster.AsConditional(
+                AliroBleuwbComponent.attributes.aliroSupportedBleuwbProtocolVersions,
+                { mandatoryIf: [ALBU] }
             ),
-            rfidProgrammingEventMask: MutableCluster.AsConditional(
-                NotificationAndRfidCredentialComponent.attributes.rfidProgrammingEventMask,
-                { optionalIf: [NOT_RID] }
+            aliroBleAdvertisingVersion: MutableCluster.AsConditional(
+                AliroBleuwbComponent.attributes.aliroBleAdvertisingVersion,
+                { mandatoryIf: [ALBU] }
+            ),
+            numberOfAliroCredentialIssuerKeysSupported: MutableCluster.AsConditional(
+                AliroProvisioningComponent.attributes.numberOfAliroCredentialIssuerKeysSupported,
+                { mandatoryIf: [ALIRO] }
+            ),
+            numberOfAliroEndpointKeysSupported: MutableCluster.AsConditional(
+                AliroProvisioningComponent.attributes.numberOfAliroEndpointKeysSupported,
+                { mandatoryIf: [ALIRO] }
             )
         },
 
         commands: {
             ...Cluster.commands,
-            getLogRecord: MutableCluster.AsConditional(LoggingComponent.commands.getLogRecord, { mandatoryIf: [LOG] }),
             setPinCode: MutableCluster.AsConditional(
                 PinCredentialNotUserComponent.commands.setPinCode,
                 { mandatoryIf: [PIN_NOT_USR] }
@@ -5290,7 +4833,15 @@ export namespace DoorLock {
                 UserComponent.commands.clearCredential,
                 { mandatoryIf: [USR] }
             ),
-            unboltDoor: MutableCluster.AsConditional(UnboltingComponent.commands.unboltDoor, { mandatoryIf: [UBOLT] })
+            unboltDoor: MutableCluster.AsConditional(UnboltingComponent.commands.unboltDoor, { mandatoryIf: [UBOLT] }),
+            setAliroReaderConfig: MutableCluster.AsConditional(
+                AliroProvisioningComponent.commands.setAliroReaderConfig,
+                { mandatoryIf: [ALIRO] }
+            ),
+            clearAliroReaderConfig: MutableCluster.AsConditional(
+                AliroProvisioningComponent.commands.clearAliroReaderConfig,
+                { mandatoryIf: [ALIRO] }
+            )
         },
 
         events: {