@matter/types 0.17.4 → 0.17.5-alpha.0-20260702-a2cd6f764

package/dist/cjs/clusters/joint-fabric-datastore.d.ts

@@ -44,11 +44,7 @@ import type { SubjectId } from "../datatype/SubjectId.js";
  * The Admin level of access to the Joint Fabric Datastore cluster server shall be limited to JF Administrator Nodes
  * identified using the Administrator CAT.
  *
- * > [!NOTE]
- *
- * > NOTE: Support for Joint Fabric Datastore cluster is provisional.
- *
- * @see {@link MatterSpecification.v151.Core} § 11.24
+ * @see {@link MatterSpecification.v16.Core} § 11.24
  */
 export declare namespace JointFabricDatastore {
     /**
@@ -62,7 +58,7 @@ export declare namespace JointFabricDatastore {
     export const name: "JointFabricDatastore";
 
     /**
-     * The cluster revision assigned by {@link MatterSpecification.v151.Cluster}.
+     * The cluster revision assigned by {@link MatterSpecification.v16.Cluster}.
      */
     export const revision: 1;
 
@@ -81,28 +77,28 @@ export declare namespace JointFabricDatastore {
          * This shall indicate the Anchor Root CA used to sign all NOC Issuers in the Joint Fabric for the accessing
          * fabric. A null value indicates that the Joint Fabric is not yet formed.
          *
-         * @see {@link MatterSpecification.v151.Core} § 11.24.6.1
+         * @see {@link MatterSpecification.v16.Core} § 11.24.6.1
          */
         anchorRootCa: Bytes;
 
         /**
          * This shall indicate the Node identifier of the Joint Fabric Anchor Root CA for the accessing fabric.
          *
-         * @see {@link MatterSpecification.v151.Core} § 11.24.6.2
+         * @see {@link MatterSpecification.v16.Core} § 11.24.6.2
          */
         anchorNodeId: NodeId;
 
         /**
          * This shall indicate the Vendor identifier of the Joint Fabric Anchor Root CA for the accessing fabric.
          *
-         * @see {@link MatterSpecification.v151.Core} § 11.24.6.3
+         * @see {@link MatterSpecification.v16.Core} § 11.24.6.3
          */
         anchorVendorId: VendorId;
 
         /**
-         * Friendly name for the accessing fabric which can be propagated to nodes.
+         * Friendly name for the accessing fabric.
          *
-         * @see {@link MatterSpecification.v151.Core} § 11.24.6.4
+         * @see {@link MatterSpecification.v16.Core} § 11.24.6.4
          */
         friendlyName: string;
 
@@ -111,24 +107,24 @@ export declare namespace JointFabricDatastore {
          *
          * This attribute shall contain at least one entry, the IPK, which has GroupKeySetID of 0.
          *
-         * @see {@link MatterSpecification.v151.Core} § 11.24.6.5
+         * @see {@link MatterSpecification.v16.Core} § 11.24.6.5
          */
         groupKeySetList: DatastoreGroupKeySet[];
 
         /**
          * This shall indicate the list of groups in the Joint Fabric for the accessing fabric.
          *
-         * This list must include, at a minimum, one group with GroupCAT value set to Administrator CAT and one group
+         * This list shall include, at a minimum, one group with GroupCAT value set to Administrator CAT and one group
          * with GroupCAT value set to Anchor CAT.
          *
-         * @see {@link MatterSpecification.v151.Core} § 11.24.6.6
+         * @see {@link MatterSpecification.v16.Core} § 11.24.6.6
          */
         groupList: DatastoreGroupInformationEntry[];
 
         /**
          * This shall indicate the list of nodes in the Joint Fabric for the accessing fabric.
          *
-         * @see {@link MatterSpecification.v151.Core} § 11.24.6.7
+         * @see {@link MatterSpecification.v16.Core} § 11.24.6.7
          */
         nodeList: DatastoreNodeInformationEntry[];
 
@@ -138,70 +134,60 @@ export declare namespace JointFabricDatastore {
          * Only one Administrator may serve as the Anchor Root CA and Anchor Fabric Administrator and shall have index
          * value 0. All other Joint Fabric Administrators shall be referenced at index 1 or greater.
          *
-         * A null value or empty list indicates that the Joint Fabric is not yet formed.
+         * An empty list indicates that the Joint Fabric is not yet formed.
          *
-         * @see {@link MatterSpecification.v151.Core} § 11.24.6.8
+         * @see {@link MatterSpecification.v16.Core} § 11.24.6.8
          */
         adminList: DatastoreAdministratorInformationEntry[];
 
         /**
          * This shall indicate the current state of the Joint Fabric Datastore Cluster for the accessing fabric.
          *
-         * The Committed status indicates the DataStore is ready for use. The Pending status indicates that the
-         * DataStore is not yet ready for use. The DeletePending status indicates that the DataStore is in the process
-         * of being transferred to another Joint Fabric Anchor Administrator.
+         * The value shall be one of the following states:
+         *
+         *   - Committed - indicates the DataStore is ready for use.
+         *
+         *   - Pending - indicates that the DataStore is not yet ready for use.
          *
-         * @see {@link MatterSpecification.v151.Core} § 11.24.6.9
+         *   - DeletePending - indicates that the DataStore is in the process of being transferred to another Joint
+         *     Fabric Anchor Administrator.
+         *
+         * @see {@link MatterSpecification.v16.Core} § 11.24.6.9
          */
         status: DatastoreStatusEntry;
 
         /**
          * This shall indicate the group membership of endpoints in the accessing fabric.
          *
-         * Any changes to this List (add/remove entry) must follow the pending->committed workflow with current state
-         * reflected in the Status Entry.
-         *
-         * @see {@link MatterSpecification.v151.Core} § 11.24.6.10
+         * @see {@link MatterSpecification.v16.Core} § 11.24.6.10
          */
         endpointGroupIdList: DatastoreEndpointGroupIdEntry[];
 
         /**
          * This shall indicate the binding list for endpoints in the accessing fabric.
          *
-         * Any changes to this List (add/remove entry) must follow the pending->committed workflow with current state
-         * reflected in the Status Entry.
-         *
-         * @see {@link MatterSpecification.v151.Core} § 11.24.6.11
+         * @see {@link MatterSpecification.v16.Core} § 11.24.6.11
          */
         endpointBindingList: DatastoreEndpointBindingEntry[];
 
         /**
          * This shall indicate the KeySet entries for nodes in the accessing fabric.
          *
-         * Any changes to this List (add/remove entry) must follow the pending->committed workflow with current state
-         * reflected in the Status Entry.
-         *
-         * @see {@link MatterSpecification.v151.Core} § 11.24.6.12
+         * @see {@link MatterSpecification.v16.Core} § 11.24.6.12
          */
         nodeKeySetList: DatastoreNodeKeySetEntry[];
 
         /**
          * This shall indicate the ACL entries for nodes in the accessing fabric.
          *
-         * Any changes to this List (add/remove entry) must follow the pending->committed workflow with current state
-         * reflected in the Status Entry.
-         *
-         * @see {@link MatterSpecification.v151.Core} § 11.24.6.13
+         * @see {@link MatterSpecification.v16.Core} § 11.24.6.13
          */
         nodeAclList: DatastoreAclEntry[];
 
         /**
          * This shall indicate the Endpoint entries for nodes in the accessing fabric.
          *
-         * Any changes to this List (add/remove entry) must follow the pending->committed workflow with current state
-         * reflected in the Status Entry.
-         *
-         * @see {@link MatterSpecification.v151.Core} § 11.24.6.14
+         * @see {@link MatterSpecification.v16.Core} § 11.24.6.14
          */
         nodeEndpointList: DatastoreEndpointEntry[];
     }
@@ -214,28 +200,28 @@ export declare namespace JointFabricDatastore {
          * This shall indicate the Anchor Root CA used to sign all NOC Issuers in the Joint Fabric for the accessing
          * fabric. A null value indicates that the Joint Fabric is not yet formed.
          *
-         * @see {@link MatterSpecification.v151.Core} § 11.24.6.1
+         * @see {@link MatterSpecification.v16.Core} § 11.24.6.1
          */
         anchorRootCa: Bytes;
 
         /**
          * This shall indicate the Node identifier of the Joint Fabric Anchor Root CA for the accessing fabric.
          *
-         * @see {@link MatterSpecification.v151.Core} § 11.24.6.2
+         * @see {@link MatterSpecification.v16.Core} § 11.24.6.2
          */
         anchorNodeId: NodeId;
 
         /**
          * This shall indicate the Vendor identifier of the Joint Fabric Anchor Root CA for the accessing fabric.
          *
-         * @see {@link MatterSpecification.v151.Core} § 11.24.6.3
+         * @see {@link MatterSpecification.v16.Core} § 11.24.6.3
          */
         anchorVendorId: VendorId;
 
         /**
-         * Friendly name for the accessing fabric which can be propagated to nodes.
+         * Friendly name for the accessing fabric.
          *
-         * @see {@link MatterSpecification.v151.Core} § 11.24.6.4
+         * @see {@link MatterSpecification.v16.Core} § 11.24.6.4
          */
         friendlyName: string;
 
@@ -244,24 +230,24 @@ export declare namespace JointFabricDatastore {
          *
          * This attribute shall contain at least one entry, the IPK, which has GroupKeySetID of 0.
          *
-         * @see {@link MatterSpecification.v151.Core} § 11.24.6.5
+         * @see {@link MatterSpecification.v16.Core} § 11.24.6.5
          */
         groupKeySetList: DatastoreGroupKeySet[];
 
         /**
          * This shall indicate the list of groups in the Joint Fabric for the accessing fabric.
          *
-         * This list must include, at a minimum, one group with GroupCAT value set to Administrator CAT and one group
+         * This list shall include, at a minimum, one group with GroupCAT value set to Administrator CAT and one group
          * with GroupCAT value set to Anchor CAT.
          *
-         * @see {@link MatterSpecification.v151.Core} § 11.24.6.6
+         * @see {@link MatterSpecification.v16.Core} § 11.24.6.6
          */
         groupList: DatastoreGroupInformationEntry[];
 
         /**
          * This shall indicate the list of nodes in the Joint Fabric for the accessing fabric.
          *
-         * @see {@link MatterSpecification.v151.Core} § 11.24.6.7
+         * @see {@link MatterSpecification.v16.Core} § 11.24.6.7
          */
         nodeList: DatastoreNodeInformationEntry[];
 
@@ -271,70 +257,60 @@ export declare namespace JointFabricDatastore {
          * Only one Administrator may serve as the Anchor Root CA and Anchor Fabric Administrator and shall have index
          * value 0. All other Joint Fabric Administrators shall be referenced at index 1 or greater.
          *
-         * A null value or empty list indicates that the Joint Fabric is not yet formed.
+         * An empty list indicates that the Joint Fabric is not yet formed.
          *
-         * @see {@link MatterSpecification.v151.Core} § 11.24.6.8
+         * @see {@link MatterSpecification.v16.Core} § 11.24.6.8
          */
         adminList: DatastoreAdministratorInformationEntry[];
 
         /**
          * This shall indicate the current state of the Joint Fabric Datastore Cluster for the accessing fabric.
          *
-         * The Committed status indicates the DataStore is ready for use. The Pending status indicates that the
-         * DataStore is not yet ready for use. The DeletePending status indicates that the DataStore is in the process
-         * of being transferred to another Joint Fabric Anchor Administrator.
+         * The value shall be one of the following states:
+         *
+         *   - Committed - indicates the DataStore is ready for use.
+         *
+         *   - Pending - indicates that the DataStore is not yet ready for use.
          *
-         * @see {@link MatterSpecification.v151.Core} § 11.24.6.9
+         *   - DeletePending - indicates that the DataStore is in the process of being transferred to another Joint
+         *     Fabric Anchor Administrator.
+         *
+         * @see {@link MatterSpecification.v16.Core} § 11.24.6.9
          */
         status: DatastoreStatusEntry;
 
         /**
          * This shall indicate the group membership of endpoints in the accessing fabric.
          *
-         * Any changes to this List (add/remove entry) must follow the pending->committed workflow with current state
-         * reflected in the Status Entry.
-         *
-         * @see {@link MatterSpecification.v151.Core} § 11.24.6.10
+         * @see {@link MatterSpecification.v16.Core} § 11.24.6.10
          */
         endpointGroupIdList: DatastoreEndpointGroupIdEntry[];
 
         /**
          * This shall indicate the binding list for endpoints in the accessing fabric.
          *
-         * Any changes to this List (add/remove entry) must follow the pending->committed workflow with current state
-         * reflected in the Status Entry.
-         *
-         * @see {@link MatterSpecification.v151.Core} § 11.24.6.11
+         * @see {@link MatterSpecification.v16.Core} § 11.24.6.11
          */
         endpointBindingList: DatastoreEndpointBindingEntry[];
 
         /**
          * This shall indicate the KeySet entries for nodes in the accessing fabric.
          *
-         * Any changes to this List (add/remove entry) must follow the pending->committed workflow with current state
-         * reflected in the Status Entry.
-         *
-         * @see {@link MatterSpecification.v151.Core} § 11.24.6.12
+         * @see {@link MatterSpecification.v16.Core} § 11.24.6.12
          */
         nodeKeySetList: DatastoreNodeKeySetEntry[];
 
         /**
          * This shall indicate the ACL entries for nodes in the accessing fabric.
          *
-         * Any changes to this List (add/remove entry) must follow the pending->committed workflow with current state
-         * reflected in the Status Entry.
-         *
-         * @see {@link MatterSpecification.v151.Core} § 11.24.6.13
+         * @see {@link MatterSpecification.v16.Core} § 11.24.6.13
          */
         nodeAclList: DatastoreAclEntry[];
 
         /**
          * This shall indicate the Endpoint entries for nodes in the accessing fabric.
          *
-         * Any changes to this List (add/remove entry) must follow the pending->committed workflow with current state
-         * reflected in the Status Entry.
-         *
-         * @see {@link MatterSpecification.v151.Core} § 11.24.6.14
+         * @see {@link MatterSpecification.v16.Core} § 11.24.6.14
          */
         nodeEndpointList: DatastoreEndpointEntry[];
     }
@@ -344,629 +320,150 @@ export declare namespace JointFabricDatastore {
      */
     export interface BaseCommands {
         /**
-         * This command shall be used to add a KeySet to the Joint Fabric Datastore Cluster of the accessing fabric.
-         *
-         * GroupKeySet represents the KeySet to be added to the Joint Fabric Datastore Cluster.
-         *
-         * Upon receipt of this command, the Datastore shall:
-         *
-         *   1. Ensure there are no KeySets in the KeySetList attribute with the given GroupKeySetID.
-         *
-         *   2. If a match is found, then this command shall fail with a CONSTRAINT_ERROR status code.
+         * Upon receipt, this shall add a KeySet to the Joint Fabric Datastore Cluster of the accessing fabric.
          *
-         *   3. Add the Epoch Key Entry for the KeySet to the KeySetList attribute.
-         *
-         * @see {@link MatterSpecification.v151.Core} § 11.24.7.1
+         * @see {@link MatterSpecification.v16.Core} § 11.24.7.1
          */
         addKeySet(request: AddKeySetRequest): MaybePromise;
 
         /**
-         * This command shall be used to update a KeySet in the Joint Fabric Datastore Cluster of the accessing fabric.
-         *
-         * GroupKeySet represents the KeySet to be updated in the Joint Fabric Datastore Cluster.
-         *
-         * Upon receipt of this command, the Datastore shall:
-         *
-         *   1. Find the Epoch Key Entry for the KeySet in the KeySetList attribute with the given GroupKeySetID, and
-         *      update any changed fields.
-         *
-         *   2. If entry is not found, then this command shall fail with a NOT_FOUND status code.
-         *
-         *   3. If any fields are changed as a result of this command:
-         *
-         *   1. Iterate through each Node Information Entry:
-         *
-         *   1. If the NodeKeySetList contains an entry with the given GroupKeySetID:
-         *
-         *   1. Update the Status on the given DatastoreNodeKeySetEntryStruct tp Pending.
-         *
-         *   2. Update the GroupKeySet on the given Node with the new values.
-         *
-         *   1. If successful, update the Status on this DatastoreNodeKeySetEntryStruct to Committed.
-         *
-         *   2. If not successful, update the State field of the StatusEntry on this DatastoreNodeKeySetEntryStruct to
-         *      CommitFailed and FailureCode code to the returned error. The pending change shall be applied in a
-         *      subsequent Node Refresh.
+         * Upon receipt, this shall update a KeySet in the Joint Fabric Datastore Cluster of the accessing fabric.
          *
-         * @see {@link MatterSpecification.v151.Core} § 11.24.7.2
+         * @see {@link MatterSpecification.v16.Core} § 11.24.7.2
          */
         updateKeySet(request: UpdateKeySetRequest): MaybePromise;
 
         /**
-         * This command shall be used to remove a KeySet from the Joint Fabric Datastore Cluster of the accessing
-         * fabric.
-         *
-         * GroupKeySetID represents the unique identifier for the KeySet to be removed from the Joint Fabric Datastore
-         * Cluster.
-         *
-         * Attempt to remove the IPK, which has GroupKeySetID of 0, shall fail with response CONSTRAINT_ERROR.
-         *
-         * Upon receipt of this command, the Datastore shall:
-         *
-         *   1. If entry is not found, then this command shall fail with a NOT_FOUND status code.
-         *
-         *   2. Ensure there are no Nodes using this KeySet. To do this:
-         *
-         *   1. Iterate through each Node Information Entry:
-         *
-         *   1. If the NodeKeySetList list contains an entry with the given GroupKeySetID, and the entry does NOT have
-         *      Status DeletePending, then this command shall fail with a CONSTRAINT_ERROR status code.
-         *
-         *   3. Remove the DatastoreGroupKeySetStruct for the given GroupKeySetID from the GroupKeySetList attribute.
+         * Upon receipt, this shall remove a KeySet from the Joint Fabric Datastore Cluster of the accessing fabric.
          *
-         * @see {@link MatterSpecification.v151.Core} § 11.24.7.3
+         * @see {@link MatterSpecification.v16.Core} § 11.24.7.3
          */
         removeKeySet(request: RemoveKeySetRequest): MaybePromise;
 
         /**
-         * This command shall be used to add a group to the Joint Fabric Datastore Cluster of the accessing fabric.
+         * Upon receipt, this shall add a group to the Joint Fabric Datastore Cluster of the accessing fabric.
          *
-         * GroupInformationEntry represents the group to be added to the Joint Fabric Datastore Cluster.
-         *
-         * GroupCAT values shall fall within the range 1 to 65534. Attempts to add a group with a GroupCAT value of
-         * Administrator CAT or Anchor CAT shall fail with CONSTRAINT_ERROR.
-         *
-         * Upon receipt of this command, the Datastore shall:
-         *
-         *   1. Ensure there are no Groups in the GroupList attribute with the given GroupID. If a match is found, then
-         *      this command shall fail with a CONSTRAINT_ERROR status code.
-         *
-         *   2. Add the DatastoreGroupInformationEntryStruct for the Group with the given GroupID to the GroupList
-         *      attribute.
-         *
-         * @see {@link MatterSpecification.v151.Core} § 11.24.7.4
+         * @see {@link MatterSpecification.v16.Core} § 11.24.7.4
          */
         addGroup(request: AddGroupRequest): MaybePromise;
 
         /**
-         * This command shall be used to update a group in the Joint Fabric Datastore Cluster of the accessing fabric.
-         *
-         * GroupID represents the group to be updated in the Joint Fabric Datastore Cluster. NULL values for the
-         * additional parameters will be ignored (not updated).
-         *
-         * GroupCAT values shall fall within the range 1 to 65534. Attempts to update the GroupCAT on an existing group
-         * which has a GroupCAT value of Administrator CAT or Anchor CAT shall fail with CONSTRAINT_ERROR.
-         *
-         * Attempts to set the GroupCAT to Administrator CAT or Anchor CAT shall fail with CONSTRAINT_ERROR.
-         *
-         * Upon receipt of this command, the Datastore shall:
-         *
-         *   1. If entry is not found, then this command shall fail with a NOT_FOUND status code.
-         *
-         *   2. Update the DatastoreGroupInformationEntryStruct for the Group with the given GroupID to match the
-         *      non-NULL fields passed in.
-         *
-         *   3. If any fields are changed as a result of this command:
-         *
-         *   1. Iterate through each Node Information Entry:
-         *
-         *   1. If the GroupKeySetID changed:
-         *
-         *   1. Add a DatastoreNodeKeySetEntryStruct with the new GroupKeySetID, and Status set to Pending.
-         *
-         *   2. Add this KeySet to the Node.
-         *
-         *   1. If successful, Set the Status to Committed for this entry in the NodeKeySetList.
-         *
-         *   2. If not successful, Set the Status to CommitFailed and the FailureCode to the returned error. The pending
-         *      change shall be applied in a subsequent Node Refresh.
-         *
-         *   1. If the NodeKeySetList list contains an entry with the previous GroupKeySetID:
-         *
-         *   3. Set the Status set to DeletePending.
-         *
-         *   4. Remove this KeySet from the Node.
-         *
-         *   1. If successful, Remove this entry from the NodeKeySetList.
-         *
-         *   2. If not successful, the pending change shall be applied in a subsequent Node Refresh.
-         *
-         *   2. If the GroupCAT, GroupCATVersion or GroupPermission changed:
-         *
-         *   1. If the ACLList contains an entry for this Group, update the ACL List Entry in the Datastore with the new
-         *      values and Status Pending, update the ACL attribute on the given Node with the new values. If the update
-         *      succeeds, set the Status to Committed on the ACLList Entry in the Datastore.
-         *
-         *   3. If the FriendlyName changed:
-         *
-         *   1. Iterate through each Endpoint Information Entry:
-         *
-         *   1. If the GroupIDList contains an entry with the given GroupID:
-         *
-         *   1. Update the GroupIDList Entry in the Datastore with the new values and Status Pending
-         *
-         *   2. Update the Groups on the given Node with the new values.
-         *
-         *   1. If the update succeeds, set the Status to Committed on the GroupIDList Entry in the Datastore.
-         *
-         *   2. If not successful, the pending change shall be applied in a subsequent Node Refresh.
+         * Upon receipt, this shall update a group in the Joint Fabric Datastore Cluster of the accessing fabric.
          *
-         * @see {@link MatterSpecification.v151.Core} § 11.24.7.5
+         * @see {@link MatterSpecification.v16.Core} § 11.24.7.5
          */
         updateGroup(request: UpdateGroupRequest): MaybePromise;
 
         /**
-         * This command shall be used to remove a group from the Joint Fabric Datastore Cluster of the accessing fabric.
+         * Upon receipt, this shall remove a group from the Joint Fabric Datastore Cluster of the accessing fabric.
          *
-         * GroupID represents the unique identifier for the group to be removed from the Joint Fabric Datastore Cluster.
-         *
-         * Attempts to remove a group with GroupCAT value set to Administrator CAT or Anchor CAT shall fail with
-         * CONSTRAINT_ERROR.
-         *
-         * Upon receipt of this command, the Datastore shall:
-         *
-         *   1. If entry is not found, then this command shall fail with a NOT_FOUND status code.
-         *
-         *   2. Ensure there are no Nodes in this group. To do this:
-         *
-         *   1. Iterate through each Node Information Entry:
-         *
-         *   1. If the GroupIDList contains an entry with the given GroupID, and the entry does NOT have Status
-         *      DeletePending, then this command shall fail with a CONSTRAINT_ERROR status code.
-         *
-         *   3. Remove the DatastoreGroupInformationEntryStruct for the Group with the given GroupID from the GroupList
-         *      attribute.
-         *
-         * @see {@link MatterSpecification.v151.Core} § 11.24.7.6
+         * @see {@link MatterSpecification.v16.Core} § 11.24.7.6
          */
         removeGroup(request: RemoveGroupRequest): MaybePromise;
 
         /**
-         * This command shall be used to add an admin to the Joint Fabric Datastore Cluster of the accessing fabric.
+         * Upon receipt, this shall add an admin to the Joint Fabric Datastore Cluster of the accessing fabric.
          *
-         * NodeID, FriendlyName, VendorID and ICAC represent the admin to be added to the Joint Fabric Datastore
-         * Cluster.
-         *
-         * @see {@link MatterSpecification.v151.Core} § 11.24.7.7
+         * @see {@link MatterSpecification.v16.Core} § 11.24.7.7
          */
         addAdmin(request: AddAdminRequest): MaybePromise;
 
         /**
-         * This command shall be used to update an admin in the Joint Fabric Datastore Cluster of the accessing fabric.
-         *
-         * NodeID represents the admin to be updated in the Joint Fabric Datastore Cluster. NULL values for the
-         * additional parameters will be ignored (not updated).
-         *
-         * If entry is not found, then this command shall fail with a NOT_FOUND status code.
+         * Upon receipt, this shall update an admin entry in the AdminList attribute.
          *
-         * @see {@link MatterSpecification.v151.Core} § 11.24.7.8
+         * @see {@link MatterSpecification.v16.Core} § 11.24.7.8
          */
         updateAdmin(request: UpdateAdminRequest): MaybePromise;
 
         /**
-         * This command shall be used to remove an admin from the Joint Fabric Datastore Cluster of the accessing
-         * fabric.
-         *
-         * NodeID represents the unique identifier for the admin to be removed from the Joint Fabric Datastore Cluster.
+         * Upon receipt, this shall remove an admin from the Joint Fabric Datastore Cluster of the accessing fabric.
          *
-         * If entry is not found, then this command shall fail with a NOT_FOUND status code.
-         *
-         * @see {@link MatterSpecification.v151.Core} § 11.24.7.9
+         * @see {@link MatterSpecification.v16.Core} § 11.24.7.9
          */
         removeAdmin(request: RemoveAdminRequest): MaybePromise;
 
         /**
-         * The command shall be used to add a node to the Joint Fabric Datastore Cluster of the accessing fabric.
-         *
-         * NodeID represents the node to be added to the Joint Fabric Datastore Cluster.
+         * Upon receipt, this shall add a node to the Joint Fabric Datastore Cluster of the accessing fabric.
          *
-         * Upon receipt of this command, the Datastore shall:
-         *
-         *   1. Update CommissioningStatusEntry of the Node Information Entry with the given NodeID to Pending.
-         *
-         * If a Node Information Entry exists for the given NodeID, then this command shall fail with a
-         * INVALID_CONSTRAINT status code.
-         *
-         * @see {@link MatterSpecification.v151.Core} § 11.24.7.10
+         * @see {@link MatterSpecification.v16.Core} § 11.24.7.10
          */
         addPendingNode(request: AddPendingNodeRequest): MaybePromise;
 
         /**
-         * The command shall be used to request that Datastore information relating to a Node of the accessing fabric is
+         * Upon receipt, this shall request that Datastore information relating to a Node of the accessing fabric is
          * refreshed.
          *
-         * Upon receipt of this command, the Datastore shall:
-         *
-         *   1. Confirm that a Node Information Entry exists for the given NodeID, and if not, then this command shall
-         *      fail with a NOT_FOUND status code.
-         *
-         *   2. Update the CommissioningStatusEntry for the Node Information Entry to Pending.
-         *
-         *   3. Ensure the Endpoint List for the Node Information Entry with the given NodeID matches Endpoint list on
-         *      the given Node. This involves the following steps:
-         *
-         *   1. Read the PartsList of the Descriptor cluster from the Node.
-         *
-         *   2. For each Endpoint Information Entry in the Endpoint List of the Node Information Entry that does not
-         *      match an Endpoint ID in the PartsList, remove the Endpoint Information Entry.
-         *
-         *   3. For each Endpoint Information Entry in the Endpoint List of the Node Information Entry that matches an
-         *      Endpoint ID in the PartsList:
-         *
-         *   1. Check that each entry in Node's Group List occurs in the GroupIDList of the Endpoint Information Entry.
-         *
-         *   1. Add any missing entries to the GroupIDList of the Endpoint Information Entry.
-         *
-         *   2. For any entries in the GroupIDList with Status of Pending:
-         *
-         *   1. Add the corresponding change to the Node's Group List.
-         *
-         *   1. If successful, mark the Status to Committed.
-         *
-         *   2. If not successful, update the Status to CommitFailed and the FailureCode to the returned error. The
-         *      error shall be handled in a subsequent Node Refresh.
-         *
-         *   3. For any entries in the GroupIDList with Status of DeletePending:
-         *
-         *   1. If successful, remove the corresponding entry from the Node's Group List.
-         *
-         *   2. If not successful, update the Status to CommitFailed and the FailureCode to the returned error. The
-         *      error shall be handled in a subsequent Node Refresh.
-         *
-         *   4. For any entries in the GroupIDList with Status of CommitFailure:
-         *
-         *   1. A CommitFailure with an unrecoverable FailureCode shall be handled by removing the entry from the
-         *      GroupIDList.
-         *
-         *   2. A CommitFailure with a recoverable FailureCode (i.e. TIMEOUT, BUSY) shall be handle in a subsequent Node
-         *      Refresh.
-         *
-         *   2. Check that each entry in Node's Binding List occurs in the BindingList of the Endpoint Information
-         *      Entry.
-         *
-         *   1. Add any missing entries to the BindingList of the Endpoint Information Entry.
-         *
-         *   2. For any entries in the BindingList with Status of Pending:
-         *
-         *   1. Add the corresponding change to the Node's Binding List.
-         *
-         *   1. If successful, mark the Status to Committed.
-         *
-         *   2. If not successful, update the Status to CommitFailed and the FailureCode to the returned error. The
-         *      error shall be handled in a subsequent Node Refresh.
-         *
-         *   3. For any entries in the BindingList with Status of DeletePending:
-         *
-         *   1. If successful, remove the corresponding entry from the Node's BindingList.
-         *
-         *   2. If not successful, update the Status to CommitFailed and the FailureCode to the returned error. The
-         *      error shall be handled in a subsequent Node Refresh.
-         *
-         *   4. For any entries in the BindingList with Status of CommitFailure:
-         *
-         *   1. A CommitFailure with an unrecoverable FailureCode shall be handled by removing the entry from the
-         *      BindingList.
-         *
-         *   2. A CommitFailure with a recoverable FailureCode (i.e. TIMEOUT, BUSY) shall be handle in a subsequent Node
-         *      Refresh.
-         *
-         *   4. Ensure the GroupKeySetList for the Node Information Entry with the given NodeID matches the Group Keys
-         *      on the given Node. This involves the following steps:
-         *
-         *   1. Read the Group Keys from the Node.
-         *
-         *   2. For each GroupKeySetEntry in the GroupKeySetList of the Node Information Entry with a Pending Status:
-         *
-         *   1. Add the corresponding DatastoreGroupKeySetStruct to the Node's Group Key list.
-         *
-         *   1. If successful, mark the Status to Committed.
-         *
-         *   2. If not successful, update the Status to CommitFailed and the FailureCode to the returned error. The
-         *      error shall be handled in a subsequent Node Refresh.
-         *
-         *   3. For each GroupKeySetEntry in the GroupKeySetList of the Node Information Entry with a CommitFailure
-         *      Status:
-         *
-         *   1. A CommitFailure with an unrecoverable FailureCode shall be handled by removing the entry from the
-         *      GroupKeySetList.
-         *
-         *   2. A CommitFailure with a recoverable FailureCode (i.e. TIMEOUT, BUSY) shall be handle in a subsequent Node
-         *      Refresh.
-         *
-         *   4. All remaining entries in the GroupKeySetList should be replaced by the remaining entries on the Node.
-         *
-         *   5. Ensure the ACLList for the Node Information Entry with the given NodeID matches the ACL attribute on the
-         *      given Node. This involves the following steps:
-         *
-         *   1. Read the ACL attribute on the Node.
-         *
-         *   2. For each DatastoreACLEntryStruct in the ACLList of the Node Information Entry with a Pending Status:
-         *
-         *   1. Add the corresponding DatastoreACLEntryStruct to the Node's ACL attribute.
-         *
-         *   1. If successful, mark the Status to Committed.
-         *
-         *   2. If not successful, update the Status to CommitFailed and the FailureCode to the returned error. The
-         *      error shall be handled in a subsequent Node Refresh.
-         *
-         *   3. For each DatastoreACLEntryStruct in the ACLList of the Node Information Entry with a CommitFailure
-         *      Status:
-         *
-         *   1. A CommitFailure with an unrecoverable FailureCode (i.e. RESOURCE_EXHAUSTED, CONSTRAINT_ERROR) shall be
-         *      handled by removing the entry from the ACLList.
-         *
-         *   2. A CommitFailure with a recoverable FailureCode (i.e. TIMEOUT, BUSY) shall be handle in a subsequent Node
-         *      Refresh.
-         *
-         *   4. All remaining entries in the ACLList should be replaced by the remaining entries on the Node.
-         *
-         *   6. Update the CommissioningStatusEntry for the Node Information Entry to Committed.
-         *
-         * @see {@link MatterSpecification.v151.Core} § 11.24.7.11
+         * @see {@link MatterSpecification.v16.Core} § 11.24.7.11
          */
         refreshNode(request: RefreshNodeRequest): MaybePromise;
 
         /**
-         * The command shall be used to update the friendly name for a node in the Joint Fabric Datastore Cluster of the
+         * Upon receipt, this shall update the friendly name for a node in the Joint Fabric Datastore Cluster of the
          * accessing fabric.
          *
-         * NodeID represents the node to be updated in the Joint Fabric Datastore Cluster.
-         *
-         * If a Node Information Entry does not exist for the given NodeID, then this command shall fail with a
-         * NOT_FOUND status code.
-         *
-         * @see {@link MatterSpecification.v151.Core} § 11.24.7.12
+         * @see {@link MatterSpecification.v16.Core} § 11.24.7.12
          */
         updateNode(request: UpdateNodeRequest): MaybePromise;
 
         /**
-         * This command shall be used to remove a node from the Joint Fabric Datastore Cluster of the accessing fabric.
-         *
-         * NodeID represents the unique identifier for the node to be removed from the Joint Fabric Datastore Cluster.
-         *
-         * If a Node Information Entry does not exist for the given NodeID, then this command shall fail with a
-         * NOT_FOUND status code.
+         * Upon receipt, this shall remove a node from the Joint Fabric Datastore Cluster of the accessing fabric.
          *
-         * @see {@link MatterSpecification.v151.Core} § 11.24.7.13
+         * @see {@link MatterSpecification.v16.Core} § 11.24.7.13
          */
         removeNode(request: RemoveNodeRequest): MaybePromise;
 
         /**
-         * This command shall be used to update the state of an endpoint for a node in the Joint Fabric Datastore
-         * Cluster of the accessing fabric.
+         * Upon receipt, this shall update the state of an endpoint for a node in the Joint Fabric Datastore Cluster of
+         * the accessing fabric.
          *
-         * EndpointID represents the unique identifier for the endpoint to be updated in the Joint Fabric Datastore
-         * Cluster.
-         *
-         * NodeID represents the unique identifier for the node to which the endpoint belongs.
-         *
-         * If an Endpoint Information Entry does not exist for the given NodeID and EndpointID, then this command shall
-         * fail with a NOT_FOUND status code.
-         *
-         * @see {@link MatterSpecification.v151.Core} § 11.24.7.14
+         * @see {@link MatterSpecification.v16.Core} § 11.24.7.14
          */
         updateEndpointForNode(request: UpdateEndpointForNodeRequest): MaybePromise;
 
         /**
-         * This command shall be used to add a Group ID to an endpoint for a node in the Joint Fabric Datastore Cluster
-         * of the accessing fabric.
-         *
-         * GroupID represents the unique identifier for the group to be added to the endpoint.
-         *
-         * EndpointID represents the unique identifier for the endpoint to be updated in the Joint Fabric Datastore
-         * Cluster.
-         *
-         * NodeID represents the unique identifier for the node to which the endpoint belongs.
-         *
-         * Upon receipt of this command, the Datastore shall:
-         *
-         *   1. Confirm that an Endpoint Information Entry exists for the given NodeID and EndpointID, and if not, then
-         *      this command shall fail with a NOT_FOUND status code.
-         *
-         *   2. Ensure the Group Key List for the Node Information Entry with the given NodeID includes the KeySet for
-         *      the given Group ID. If it does not:
-         *
-         *   1. Add an entry for the KeySet of the given Group ID to the Group Key List for the Node. The new entry's
-         *      status shall be set to Pending.
-         *
-         *   2. Add a Group Key Entry for this KeySet to the given Node ID.
-         *
-         *   1. If this succeeds, update the new KeySet entry in the Datastore to Committed.
-         *
-         *   2. If not successful, the pending change shall be applied in a subsequent Node Refresh.
-         *
-         *   3. Ensure the Group List for the Endpoint Information Entry with the given NodeID and EndpointID includes
-         *      an entry for the given Group. If it does not:
-         *
-         *   1. Add a Group entry for the given Group ID to the Group List for the Endpoint and Node. The new entry's
-         *      status shall be set to Pending.
-         *
-         *   2. Add this Group entry to the given Endpoint ID on the given Node ID.
-         *
-         *   1. If this succeeds, update the new Group entry in the Datastore to Committed.
-         *
-         *   2. If not successful, update the Status to CommitFailed and the FailureCode to the returned error. The
-         *      error shall be handled in a subsequent Node Refresh.
+         * Upon receipt, this shall add a Group ID to an endpoint for a node in the Joint Fabric Datastore Cluster of
+         * the accessing fabric.
          *
-         * @see {@link MatterSpecification.v151.Core} § 11.24.7.15
+         * @see {@link MatterSpecification.v16.Core} § 11.24.7.15
          */
         addGroupIdToEndpointForNode(request: AddGroupIdToEndpointForNodeRequest): MaybePromise;
 
         /**
-         * This command shall be used to remove a Group ID from an endpoint for a node in the Joint Fabric Datastore
-         * Cluster of the accessing fabric.
-         *
-         * GroupID represents the unique identifier for the group to be removed from the endpoint.
-         *
-         * EndpointID represents the unique identifier for the endpoint to be updated in the Joint Fabric Datastore
-         * Cluster.
-         *
-         * NodeID represents the unique identifier for the node to which the endpoint belongs.
-         *
-         * Upon receipt of this command, the Datastore shall:
-         *
-         *   1. Confirm that an Endpoint Information Entry exists for the given NodeID and EndpointID, and if not, then
-         *      this command shall fail with a NOT_FOUND status code.
-         *
-         *   2. Ensure the Group List for the Endpoint Information Entry with the given NodeID and EndpointID does not
-         *      include an entry for the given Group. If it does:
-         *
-         *   1. Update the status to DeletePending of the Group entry for the given Group ID in the Group List.
-         *
-         *   2. Remove this Group entry for the given Endpoint ID on the given Node ID.
-         *
-         *   1. If this succeeds, remove the Group entry for the given Group ID in the Group List for this NodeID and
-         *      EndpointID in the Datastore.
-         *
-         *   2. If not successful, the pending change shall be applied in a subsequent Node Refresh.
-         *
-         *   3. Ensure the Group Key List for the Node Information Entry with the given NodeID does not include the
-         *      KeySet for the given Group ID. If it does:
-         *
-         *   1. Update the status to DeletePending for the entry for the KeySet of the given Group ID in the Node Group
-         *      Key List.
-         *
-         *   2. Remove the Group Key Entry for this KeySet from the given Node ID.
-         *
-         *   1. If this succeeds, remove the KeySet entry for the given Node ID.
-         *
-         *   2. If not successful, update the Status to CommitFailed and the FailureCode to the returned error. The
-         *      error shall be handled in a subsequent Node Refresh.
+         * Upon receipt, this shall remove a Group ID from an endpoint for a node in the Joint Fabric Datastore Cluster
+         * of the accessing fabric.
          *
-         * @see {@link MatterSpecification.v151.Core} § 11.24.7.16
+         * @see {@link MatterSpecification.v16.Core} § 11.24.7.16
          */
         removeGroupIdFromEndpointForNode(request: RemoveGroupIdFromEndpointForNodeRequest): MaybePromise;
 
         /**
-         * This command shall be used to add a binding to an endpoint for a node in the Joint Fabric Datastore Cluster
-         * of the accessing fabric.
-         *
-         * Binding represents the binding to be added to the endpoint.
-         *
-         * EndpointID represents the unique identifier for the endpoint to be updated in the Joint Fabric Datastore
-         * Cluster.
-         *
-         * NodeID represents the unique identifier for the node to which the endpoint belongs.
-         *
-         * Upon receipt of this command, the Datastore shall:
-         *
-         *   1. Confirm that an Endpoint Information Entry exists for the given NodeID and EndpointID, and if not, then
-         *      this command shall fail with a NOT_FOUND status code.
-         *
-         *   2. Ensure the Binding List for the Node Information Entry with the given NodeID includes the given Binding.
-         *      If it does not:
-         *
-         *   1. Add the Binding to the Binding List for the Node Information Entry for the given NodeID. The new entry's
-         *      status shall be set to Pending.
-         *
-         *   2. Add this Binding to the given Node ID.
-         *
-         *   1. If this succeeds, update the new Binding in the Datastore to Committed.
-         *
-         *   2. If not successful, update the Status to CommitFailed and the FailureCode to the returned error. The
-         *      error shall be handled in a subsequent Node Refresh.
+         * Upon receipt, this shall add a binding to an endpoint for a node in the Joint Fabric Datastore Cluster of the
+         * accessing fabric.
          *
-         * @see {@link MatterSpecification.v151.Core} § 11.24.7.17
+         * @see {@link MatterSpecification.v16.Core} § 11.24.7.17
          */
         addBindingToEndpointForNode(request: AddBindingToEndpointForNodeRequest): MaybePromise;
 
         /**
-         * This command shall be used to remove a binding from an endpoint for a node in the Joint Fabric Datastore
-         * Cluster of the accessing fabric.
-         *
-         * ListID represents the unique identifier for the binding entry in the Datastore's EndpointBindingList
-         * attribute to be removed from the endpoint.
-         *
-         * EndpointID represents the unique identifier for the endpoint to be updated in the Joint Fabric Datastore
-         * Cluster.
-         *
-         * NodeID represents the unique identifier for the node to which the endpoint belongs.
-         *
-         * Upon receipt of this command, the Datastore shall:
-         *
-         *   1. Confirm that an Endpoint Information Entry exists for the given NodeID and EndpointID, and if not, then
-         *      this command shall fail with a NOT_FOUND status code.
-         *
-         *   2. Ensure the Binding List for the Node Information Entry with the given NodeID does not include an entry
-         *      with the given ListID. If it does:
-         *
-         *   1. Update the status to DeletePending for the given Binding in the Binding List.
-         *
-         *   2. Remove this Binding from the given Node ID.
-         *
-         *   1. If this succeeds, remove the given Binding from the Binding List.
-         *
-         *   2. If not successful, update the Status to CommitFailed and the FailureCode to the returned error. The
-         *      error shall be handled in a subsequent Node Refresh.
+         * Upon receipt, this shall remove a binding from an endpoint for a node in the Joint Fabric Datastore Cluster
+         * of the accessing fabric.
          *
-         * @see {@link MatterSpecification.v151.Core} § 11.24.7.18
+         * @see {@link MatterSpecification.v16.Core} § 11.24.7.18
          */
         removeBindingFromEndpointForNode(request: RemoveBindingFromEndpointForNodeRequest): MaybePromise;
 
         /**
-         * This command shall be used to add an ACL to a node in the Joint Fabric Datastore Cluster of the accessing
-         * fabric.
-         *
-         * NodeID represents the unique identifier for the node to which the ACL is to be added.
-         *
-         * ACLEntry represents the ACL to be added to the Joint Fabric Datastore Cluster.
-         *
-         * Upon receipt of this command, the Datastore shall:
-         *
-         *   1. Confirm that a Node Information Entry exists for the given NodeID, and if not, then this command shall
-         *      fail with a NOT_FOUND status code.
-         *
-         *   2. Ensure the ACL List for the given NodeID includes the given ACLEntry. If it does not:
-         *
-         *   1. Add the ACLEntry to the ACL List for the given NodeID. The new entry's status shall be set to Pending.
-         *
-         *   2. Add this ACLEntry to the given Node ID.
-         *
-         *   1. If this succeeds, update the new ACLEntry in the Datastore to Committed.
-         *
-         *   2. If not successful, update the Status to CommitFailed and the FailureCode to the returned error. The
-         *      error shall be handled in a subsequent Node Refresh.
+         * Upon receipt, this shall add an ACL to a node in the Joint Fabric Datastore Cluster of the accessing fabric.
          *
-         * @see {@link MatterSpecification.v151.Core} § 11.24.7.19
+         * @see {@link MatterSpecification.v16.Core} § 11.24.7.19
          */
         addAclToNode(request: AddAclToNodeRequest): MaybePromise;
 
         /**
-         * This command shall be used to remove an ACL from a node in the Joint Fabric Datastore Cluster of the
-         * accessing fabric.
-         *
-         * ListID represents the unique identifier for the DatastoreACLEntryStruct to be removed from the Datastore's
-         * list of DatastoreACLEntry.
-         *
-         * NodeID represents the unique identifier for the node from which the ACL is to be removed.
-         *
-         * Upon receipt of this command, the Datastore shall:
-         *
-         *   1. Confirm that a Node Information Entry exists for the given NodeID, and if not, then this command shall
-         *      fail with a NOT_FOUND status code.
-         *
-         *   2. Ensure the ACL List for the given NodeID does not include the given ACLEntry. If it does:
-         *
-         *   1. Update the status to DeletePending for the given ACLEntry in the ACL List.
-         *
-         *   2. Remove this ACLEntry from the given Node ID.
-         *
-         *   1. If this succeeds, remove the given ACLEntry from the Node ACL List.
-         *
-         *   2. If not successful, update the Status to CommitFailed and the FailureCode to the returned error. The
-         *      error shall be handled in a subsequent Node Refresh.
+         * Upon receipt, this shall remove an ACL from a node in the Joint Fabric Datastore Cluster of the accessing
+         * fabric.
          *
-         * @see {@link MatterSpecification.v151.Core} § 11.24.7.20
+         * @see {@link MatterSpecification.v16.Core} § 11.24.7.20
          */
         removeAclFromNode(request: RemoveAclFromNodeRequest): MaybePromise;
     }
@@ -979,7 +476,7 @@ export declare namespace JointFabricDatastore {
     export type Components = [{ flags: {}, attributes: BaseAttributes, commands: BaseCommands }];
 
     /**
-     * @see {@link MatterSpecification.v151.Core} § 11.24.5.18
+     * @see {@link MatterSpecification.v16.Core} § 11.24.5.18
      */
     export class DatastoreGroupKeySet {
         constructor(values?: Partial<DatastoreGroupKeySet>);
@@ -991,11 +488,15 @@ export declare namespace JointFabricDatastore {
         epochStartTime1: number | bigint | null;
         epochKey2: Bytes | null;
         epochStartTime2: number | bigint | null;
+
+        /**
+         * @deprecated
+         */
         groupKeyMulticastPolicy?: DatastoreGroupKeyMulticastPolicy;
     }
 
     /**
-     * @see {@link MatterSpecification.v151.Core} § 11.24.5.5
+     * @see {@link MatterSpecification.v16.Core} § 11.24.5.5
      */
     export class DatastoreGroupInformationEntry {
         constructor(values?: Partial<DatastoreGroupInformationEntry>);
@@ -1003,14 +504,14 @@ export declare namespace JointFabricDatastore {
         /**
          * The unique identifier for the group.
          *
-         * @see {@link MatterSpecification.v151.Core} § 11.24.5.5.1
+         * @see {@link MatterSpecification.v16.Core} § 11.24.5.5.1
          */
         groupId: number | bigint;
 
         /**
          * The friendly name for the group.
          *
-         * @see {@link MatterSpecification.v151.Core} § 11.24.5.5.2
+         * @see {@link MatterSpecification.v16.Core} § 11.24.5.5.2
          */
         friendlyName: string;
 
@@ -1023,7 +524,7 @@ export declare namespace JointFabricDatastore {
          * A value of 0 is not allowed since this value is reserved for IPK and the group entry for this value is not
          * managed by the Datastore.
          *
-         * @see {@link MatterSpecification.v151.Core} § 11.24.5.5.3
+         * @see {@link MatterSpecification.v16.Core} § 11.24.5.5.3
          */
         groupKeySetId: number | null;
 
@@ -1034,7 +535,7 @@ export declare namespace JointFabricDatastore {
          *
          * This value may be null when unicast communication is not used for the group.
          *
-         * @see {@link MatterSpecification.v151.Core} § 11.24.5.5.4
+         * @see {@link MatterSpecification.v16.Core} § 11.24.5.5.4
          */
         groupCat: number | null;
 
@@ -1043,7 +544,7 @@ export declare namespace JointFabricDatastore {
          *
          * This value shall be null when GroupCAT value is null.
          *
-         * @see {@link MatterSpecification.v151.Core} § 11.24.5.5.5
+         * @see {@link MatterSpecification.v16.Core} § 11.24.5.5.5
          */
         groupCatVersion: number | null;
 
@@ -1051,13 +552,13 @@ export declare namespace JointFabricDatastore {
          * The permission level associated with ACL entries for this group. There should be only one Administrator group
          * per fabric, and at most one Manage group per Ecosystem (Vendor Entry).
          *
-         * @see {@link MatterSpecification.v151.Core} § 11.24.5.5.6
+         * @see {@link MatterSpecification.v16.Core} § 11.24.5.5.6
          */
         groupPermission: DatastoreAccessControlEntryPrivilege;
     }
 
     /**
-     * @see {@link MatterSpecification.v151.Core} § 11.24.5.14
+     * @see {@link MatterSpecification.v16.Core} § 11.24.5.14
      */
     export class DatastoreNodeInformationEntry {
         constructor(values?: Partial<DatastoreNodeInformationEntry>);
@@ -1065,14 +566,19 @@ export declare namespace JointFabricDatastore {
         /**
          * The unique identifier for the node.
          *
-         * @see {@link MatterSpecification.v151.Core} § 11.24.5.14.1
+         * @see {@link MatterSpecification.v16.Core} § 11.24.5.14.1
          */
         nodeId: NodeId;
 
         /**
-         * Friendly name for this node which is not propagated to nodes.
+         * This field shall contain a user-assigned label for this node, as captured by a Joint Fabric Administrator's
+         * user interface. By maintaining this value in the Joint Fabric Datastore, all Joint Fabric Administrators can
+         * keep these values synchronized. This value is not propagated to the node itself.
          *
-         * @see {@link MatterSpecification.v151.Core} § 11.24.5.14.2
+         * Administrators may keep this field in sync with the NodeLabel field from the Basic Information or Bridged
+         * Basic Information clusters.
+         *
+         * @see {@link MatterSpecification.v16.Core} § 11.24.5.14.2
          */
         friendlyName: string;
 
@@ -1080,13 +586,13 @@ export declare namespace JointFabricDatastore {
          * Set to Pending prior to completing commissioning, set to Committed after commissioning complete is
          * successful, or set to CommitFailed if commissioning failed with the FailureCode Field set to the error.
          *
-         * @see {@link MatterSpecification.v151.Core} § 11.24.5.14.3
+         * @see {@link MatterSpecification.v16.Core} § 11.24.5.14.3
          */
         commissioningStatusEntry: DatastoreStatusEntry;
     }
 
     /**
-     * @see {@link MatterSpecification.v151.Core} § 11.24.5.15
+     * @see {@link MatterSpecification.v16.Core} § 11.24.5.15
      */
     export class DatastoreAdministratorInformationEntry {
         constructor(values?: Partial<DatastoreAdministratorInformationEntry>);
@@ -1094,34 +600,34 @@ export declare namespace JointFabricDatastore {
         /**
          * The unique identifier for the node.
          *
-         * @see {@link MatterSpecification.v151.Core} § 11.24.5.15.1
+         * @see {@link MatterSpecification.v16.Core} § 11.24.5.15.1
          */
         nodeId: NodeId;
 
         /**
          * Friendly name for this node which is not propagated to nodes.
          *
-         * @see {@link MatterSpecification.v151.Core} § 11.24.5.15.2
+         * @see {@link MatterSpecification.v16.Core} § 11.24.5.15.2
          */
         friendlyName: string;
 
         /**
          * The Vendor ID for the node.
          *
-         * @see {@link MatterSpecification.v151.Core} § 11.24.5.15.3
+         * @see {@link MatterSpecification.v16.Core} § 11.24.5.15.3
          */
         vendorId: VendorId;
 
         /**
          * The ICAC used to issue the NOC.
          *
-         * @see {@link MatterSpecification.v151.Core} § 11.24.5.15.4
+         * @see {@link MatterSpecification.v16.Core} § 11.24.5.15.4
          */
         icac: Bytes;
     }
 
     /**
-     * @see {@link MatterSpecification.v151.Core} § 11.24.5.2
+     * @see {@link MatterSpecification.v16.Core} § 11.24.5.2
      */
     export class DatastoreStatusEntry {
         constructor(values?: Partial<DatastoreStatusEntry>);
@@ -1129,28 +635,28 @@ export declare namespace JointFabricDatastore {
         /**
          * This field shall contain the current state of the target device operation.
          *
-         * @see {@link MatterSpecification.v151.Core} § 11.24.5.2.1
+         * @see {@link MatterSpecification.v16.Core} § 11.24.5.2.1
          */
         state: DatastoreState;
 
         /**
          * This field shall contain the timestamp of the last update.
          *
-         * @see {@link MatterSpecification.v151.Core} § 11.24.5.2.2
+         * @see {@link MatterSpecification.v16.Core} § 11.24.5.2.2
          */
         updateTimestamp: number;
 
         /**
-         * This field shall contain the StatusCode of the last failed operation where the State field is set to
+         * This field shall contain the Status Code of the last failed operation where the State field is set to
          * CommitFailure.
          *
-         * @see {@link MatterSpecification.v151.Core} § 11.24.5.2.3
+         * @see {@link MatterSpecification.v16.Core} § 11.24.5.2.3
          */
         failureCode: Status;
     }
 
     /**
-     * @see {@link MatterSpecification.v151.Core} § 11.24.5.8
+     * @see {@link MatterSpecification.v16.Core} § 11.24.5.8
      */
     export class DatastoreEndpointGroupIdEntry {
         constructor(values?: Partial<DatastoreEndpointGroupIdEntry>);
@@ -1158,34 +664,34 @@ export declare namespace JointFabricDatastore {
         /**
          * The unique identifier for the node.
          *
-         * @see {@link MatterSpecification.v151.Core} § 11.24.5.8.1
+         * @see {@link MatterSpecification.v16.Core} § 11.24.5.8.1
          */
         nodeId: NodeId;
 
         /**
          * The unique identifier for the endpoint.
          *
-         * @see {@link MatterSpecification.v151.Core} § 11.24.5.8.2
+         * @see {@link MatterSpecification.v16.Core} § 11.24.5.8.2
          */
         endpointId: EndpointNumber;
 
         /**
          * The unique identifier for the group.
          *
-         * @see {@link MatterSpecification.v151.Core} § 11.24.5.8.3
+         * @see {@link MatterSpecification.v16.Core} § 11.24.5.8.3
          */
         groupId: GroupId;
 
         /**
          * Indicates whether entry in this list is pending, committed, delete-pending, or commit-failed.
          *
-         * @see {@link MatterSpecification.v151.Core} § 11.24.5.8.4
+         * @see {@link MatterSpecification.v16.Core} § 11.24.5.8.4
          */
         statusEntry: DatastoreStatusEntry;
     }
 
     /**
-     * @see {@link MatterSpecification.v151.Core} § 11.24.5.7
+     * @see {@link MatterSpecification.v16.Core} § 11.24.5.7
      */
     export class DatastoreEndpointBindingEntry {
         constructor(values?: Partial<DatastoreEndpointBindingEntry>);
@@ -1193,14 +699,14 @@ export declare namespace JointFabricDatastore {
         /**
          * The unique identifier for the node.
          *
-         * @see {@link MatterSpecification.v151.Core} § 11.24.5.7.1
+         * @see {@link MatterSpecification.v16.Core} § 11.24.5.7.1
          */
         nodeId: NodeId;
 
         /**
          * The unique identifier for the endpoint.
          *
-         * @see {@link MatterSpecification.v151.Core} § 11.24.5.7.2
+         * @see {@link MatterSpecification.v16.Core} § 11.24.5.7.2
          */
         endpointId: EndpointNumber;
 
@@ -1211,27 +717,27 @@ export declare namespace JointFabricDatastore {
          * This field is used to uniquely identify an entry in the EndpointBindingList attribute for the purpose of
          * deletion (RemoveBindingFromEndpointForNode Command).
          *
-         * @see {@link MatterSpecification.v151.Core} § 11.24.5.7.3
+         * @see {@link MatterSpecification.v16.Core} § 11.24.5.7.3
          */
         listId: number;
 
         /**
          * The binding target structure.
          *
-         * @see {@link MatterSpecification.v151.Core} § 11.24.5.7.4
+         * @see {@link MatterSpecification.v16.Core} § 11.24.5.7.4
          */
         binding: DatastoreBindingTarget;
 
         /**
          * Indicates whether entry in this list is pending, committed, delete-pending, or commit-failed.
          *
-         * @see {@link MatterSpecification.v151.Core} § 11.24.5.7.5
+         * @see {@link MatterSpecification.v16.Core} § 11.24.5.7.5
          */
         statusEntry: DatastoreStatusEntry;
     }
 
     /**
-     * @see {@link MatterSpecification.v151.Core} § 11.24.5.3
+     * @see {@link MatterSpecification.v16.Core} § 11.24.5.3
      */
     export class DatastoreNodeKeySetEntry {
         constructor(values?: Partial<DatastoreNodeKeySetEntry>);
@@ -1239,7 +745,7 @@ export declare namespace JointFabricDatastore {
         /**
          * The unique identifier for the node.
          *
-         * @see {@link MatterSpecification.v151.Core} § 11.24.5.3.1
+         * @see {@link MatterSpecification.v16.Core} § 11.24.5.3.1
          */
         nodeId: NodeId;
 
@@ -1248,7 +754,7 @@ export declare namespace JointFabricDatastore {
         /**
          * Indicates whether entry in this list is pending, committed, delete-pending, or commit-failed.
          *
-         * @see {@link MatterSpecification.v151.Core} § 11.24.5.3.3
+         * @see {@link MatterSpecification.v16.Core} § 11.24.5.3.3
          */
         statusEntry: DatastoreStatusEntry;
     }
@@ -1258,7 +764,7 @@ export declare namespace JointFabricDatastore {
      * is managed by the Datastore. Only ACLs on a specific Node that are fabric-scoped to the Joint Fabric are managed
      * by the Datastore. As a result, references to nodes and groups are specific to the Joint Fabric.
      *
-     * @see {@link MatterSpecification.v151.Core} § 11.24.5.13
+     * @see {@link MatterSpecification.v16.Core} § 11.24.5.13
      */
     export class DatastoreAclEntry {
         constructor(values?: Partial<DatastoreAclEntry>);
@@ -1266,28 +772,28 @@ export declare namespace JointFabricDatastore {
         /**
          * The unique identifier for the node.
          *
-         * @see {@link MatterSpecification.v151.Core} § 11.24.5.13.1
+         * @see {@link MatterSpecification.v16.Core} § 11.24.5.13.1
          */
         nodeId: NodeId;
 
         /**
          * The unique identifier for the ACL entry in the Datastore's list of DatastoreACLEntry.
          *
-         * @see {@link MatterSpecification.v151.Core} § 11.24.5.13.2
+         * @see {@link MatterSpecification.v16.Core} § 11.24.5.13.2
          */
         listId: number;
 
         /**
          * The Access Control Entry structure.
          *
-         * @see {@link MatterSpecification.v151.Core} § 11.24.5.13.3
+         * @see {@link MatterSpecification.v16.Core} § 11.24.5.13.3
          */
         aclEntry: DatastoreAccessControlEntry;
 
         /**
          * Indicates whether entry in this list is pending, committed, delete-pending, or commit-failed.
          *
-         * @see {@link MatterSpecification.v151.Core} § 11.24.5.13.4
+         * @see {@link MatterSpecification.v16.Core} § 11.24.5.13.4
          */
         statusEntry: DatastoreStatusEntry;
     }
@@ -1297,7 +803,7 @@ export declare namespace JointFabricDatastore {
      * Only Nodes on the Joint Fabric are managed by the Datastore. As a result, references to NodeID are specific to
      * the Joint Fabric.
      *
-     * @see {@link MatterSpecification.v151.Core} § 11.24.5.9
+     * @see {@link MatterSpecification.v16.Core} § 11.24.5.9
      */
     export class DatastoreEndpointEntry {
         constructor(values?: Partial<DatastoreEndpointEntry>);
@@ -1305,740 +811,1025 @@ export declare namespace JointFabricDatastore {
         /**
          * The unique identifier for the endpoint.
          *
-         * @see {@link MatterSpecification.v151.Core} § 11.24.5.9.1
+         * @see {@link MatterSpecification.v16.Core} § 11.24.5.9.1
          */
         endpointId: EndpointNumber;
 
         /**
          * The unique identifier for the node.
          *
-         * @see {@link MatterSpecification.v151.Core} § 11.24.5.9.2
+         * @see {@link MatterSpecification.v16.Core} § 11.24.5.9.2
          */
         nodeId: NodeId;
 
         /**
-         * Friendly name for this endpoint which is propagated to nodes. Any changes to Friendly Name or Group Id List
-         * (add/remove entry) must follow the pending->committed workflow with current state reflected in the Status
-         * Entry.
+         * This field shall indicate a user-assigned label for this endpoint, as captured by a Joint Fabric
+         * Administrator's user interface. By maintaining this value in the Joint Fabric Datastore, all Joint Fabric
+         * Administrators can keep these values synchronized. This is particularly useful for complex multi-application
+         * endpoint devices (such as appliances) and for endpoints exposed via a Bridge, where individual endpoints
+         * might have custom names assigned by the user. For basic devices, only the node-level FriendlyName might be
+         * used.
          *
-         * @see {@link MatterSpecification.v151.Core} § 11.24.5.9.3
-         */
-        friendlyName: string;
-
-        /**
-         * Indicates whether changes to Friendly Name are pending, committed, or commit-failed.
+         * Administrators may keep this field in sync with the NodeLabel field from the Basic Information or Bridged
+         * Basic Information clusters.
          *
-         * @see {@link MatterSpecification.v151.Core} § 11.24.5.9.4
+         * @see {@link MatterSpecification.v16.Core} § 11.24.5.9.3
          */
-        statusEntry: DatastoreStatusEntry;
+        friendlyName: string;
     }
 
     /**
-     * This command shall be used to add a KeySet to the Joint Fabric Datastore Cluster of the accessing fabric.
-     *
-     * GroupKeySet represents the KeySet to be added to the Joint Fabric Datastore Cluster.
-     *
-     * Upon receipt of this command, the Datastore shall:
-     *
-     *   1. Ensure there are no KeySets in the KeySetList attribute with the given GroupKeySetID.
+     * Upon receipt, this shall add a KeySet to the Joint Fabric Datastore Cluster of the accessing fabric.
      *
-     *   2. If a match is found, then this command shall fail with a CONSTRAINT_ERROR status code.
-     *
-     *   3. Add the Epoch Key Entry for the KeySet to the KeySetList attribute.
-     *
-     * @see {@link MatterSpecification.v151.Core} § 11.24.7.1
+     * @see {@link MatterSpecification.v16.Core} § 11.24.7.1
      */
     export class AddKeySetRequest {
         constructor(values?: Partial<AddKeySetRequest>);
+
+        /**
+         * This field shall indicate the KeySet to be added to the Joint Fabric Datastore Cluster.
+         *
+         * The Datastore shall:
+         *
+         *   1. Ensure there are no KeySets in the KeySetList attribute with the given GroupKeySetID.
+         *
+         *   2. If a match is found, then this command shall fail with a CONSTRAINT_ERROR status code.
+         *
+         *   3. Add the Epoch Key Entry for the KeySet to the KeySetList attribute.
+         *
+         * @see {@link MatterSpecification.v16.Core} § 11.24.7.1.1
+         */
         groupKeySet: DatastoreGroupKeySet;
     }
 
     /**
-     * This command shall be used to update a KeySet in the Joint Fabric Datastore Cluster of the accessing fabric.
-     *
-     * GroupKeySet represents the KeySet to be updated in the Joint Fabric Datastore Cluster.
-     *
-     * Upon receipt of this command, the Datastore shall:
-     *
-     *   1. Find the Epoch Key Entry for the KeySet in the KeySetList attribute with the given GroupKeySetID, and update
-     *      any changed fields.
+     * Upon receipt, this shall update a KeySet in the Joint Fabric Datastore Cluster of the accessing fabric.
      *
-     *   2. If entry is not found, then this command shall fail with a NOT_FOUND status code.
-     *
-     *   3. If any fields are changed as a result of this command:
-     *
-     *   1. Iterate through each Node Information Entry:
-     *
-     *   1. If the NodeKeySetList contains an entry with the given GroupKeySetID:
-     *
-     *   1. Update the Status on the given DatastoreNodeKeySetEntryStruct tp Pending.
-     *
-     *   2. Update the GroupKeySet on the given Node with the new values.
-     *
-     *   1. If successful, update the Status on this DatastoreNodeKeySetEntryStruct to Committed.
-     *
-     *   2. If not successful, update the State field of the StatusEntry on this DatastoreNodeKeySetEntryStruct to
-     *      CommitFailed and FailureCode code to the returned error. The pending change shall be applied in a subsequent
-     *      Node Refresh.
-     *
-     * @see {@link MatterSpecification.v151.Core} § 11.24.7.2
+     * @see {@link MatterSpecification.v16.Core} § 11.24.7.2
      */
     export class UpdateKeySetRequest {
         constructor(values?: Partial<UpdateKeySetRequest>);
+
+        /**
+         * This field shall indicate the KeySet to be updated in the Joint Fabric Datastore Cluster.
+         *
+         * The Datastore shall:
+         *
+         *   1. Find the Epoch Key Entry for the KeySet in the KeySetList attribute with the given GroupKeySetID, and
+         *      update any changed fields.
+         *
+         *   2. If entry is not found, then this command shall fail with a NOT_FOUND status code.
+         *
+         *   3. If any fields are changed as a result of this command:
+         *
+         *   1. Iterate through each DatastoreNodeInformationEntryStruct:
+         *
+         *   1. If the NodeKeySetList contains an entry with the given GroupKeySetID:
+         *
+         *   1. Update the Status on the given DatastoreNodeKeySetEntryStruct tp Pending.
+         *
+         *   2. Update the GroupKeySet on the given Node with the new values.
+         *
+         *   1. If successful, update the Status on this DatastoreNodeKeySetEntryStruct to Committed.
+         *
+         *   2. If not successful, update the State field of the StatusEntry on this DatastoreNodeKeySetEntryStruct to
+         *      CommitFailed and FailureCode code to the returned error. The pending change shall be applied in a
+         *      subsequent Node Refresh.
+         *
+         * @see {@link MatterSpecification.v16.Core} § 11.24.7.2.1
+         */
         groupKeySet: DatastoreGroupKeySet;
     }
 
     /**
-     * This command shall be used to remove a KeySet from the Joint Fabric Datastore Cluster of the accessing fabric.
-     *
-     * GroupKeySetID represents the unique identifier for the KeySet to be removed from the Joint Fabric Datastore
-     * Cluster.
-     *
-     * Attempt to remove the IPK, which has GroupKeySetID of 0, shall fail with response CONSTRAINT_ERROR.
-     *
-     * Upon receipt of this command, the Datastore shall:
-     *
-     *   1. If entry is not found, then this command shall fail with a NOT_FOUND status code.
-     *
-     *   2. Ensure there are no Nodes using this KeySet. To do this:
-     *
-     *   1. Iterate through each Node Information Entry:
-     *
-     *   1. If the NodeKeySetList list contains an entry with the given GroupKeySetID, and the entry does NOT have
-     *      Status DeletePending, then this command shall fail with a CONSTRAINT_ERROR status code.
+     * Upon receipt, this shall remove a KeySet from the Joint Fabric Datastore Cluster of the accessing fabric.
      *
-     *   3. Remove the DatastoreGroupKeySetStruct for the given GroupKeySetID from the GroupKeySetList attribute.
-     *
-     * @see {@link MatterSpecification.v151.Core} § 11.24.7.3
+     * @see {@link MatterSpecification.v16.Core} § 11.24.7.3
      */
     export class RemoveKeySetRequest {
         constructor(values?: Partial<RemoveKeySetRequest>);
+
+        /**
+         * This field shall indicate the unique identifier for the KeySet to be removed from the Joint Fabric Datastore
+         * Cluster.
+         *
+         * Attempt to remove the IPK, which has GroupKeySetID of 0, shall fail with response CONSTRAINT_ERROR.
+         *
+         * The Datastore shall:
+         *
+         *   1. If entry is not found, then this command shall fail with a NOT_FOUND status code.
+         *
+         *   2. Ensure there are no Nodes using this KeySet. To do this:
+         *
+         *   1. Iterate through each DatastoreNodeInformationEntryStruct:
+         *
+         *   1. If the NodeKeySetList list contains an entry with the given GroupKeySetID, and the entry does NOT have
+         *      Status DeletePending, then this command shall fail with a CONSTRAINT_ERROR status code.
+         *
+         *   3. Remove the DatastoreGroupKeySetStruct for the given GroupKeySetID from the GroupKeySetList attribute.
+         *
+         * @see {@link MatterSpecification.v16.Core} § 11.24.7.3.1
+         */
         groupKeySetId: number;
     }
 
     /**
-     * This command shall be used to add a group to the Joint Fabric Datastore Cluster of the accessing fabric.
-     *
-     * GroupInformationEntry represents the group to be added to the Joint Fabric Datastore Cluster.
-     *
-     * GroupCAT values shall fall within the range 1 to 65534. Attempts to add a group with a GroupCAT value of
-     * Administrator CAT or Anchor CAT shall fail with CONSTRAINT_ERROR.
-     *
-     * Upon receipt of this command, the Datastore shall:
-     *
-     *   1. Ensure there are no Groups in the GroupList attribute with the given GroupID. If a match is found, then this
-     *      command shall fail with a CONSTRAINT_ERROR status code.
-     *
-     *   2. Add the DatastoreGroupInformationEntryStruct for the Group with the given GroupID to the GroupList
-     *      attribute.
+     * Upon receipt, this shall add a group to the Joint Fabric Datastore Cluster of the accessing fabric.
      *
-     * @see {@link MatterSpecification.v151.Core} § 11.24.7.4
+     * @see {@link MatterSpecification.v16.Core} § 11.24.7.4
      */
     export class AddGroupRequest {
         constructor(values?: Partial<AddGroupRequest>);
+
+        /**
+         * This field shall indicate the unique identifier for the group to be added to the Joint Fabric Datastore
+         * Cluster.
+         *
+         * @see {@link MatterSpecification.v16.Core} § 11.24.7.4.1
+         */
         groupId: GroupId;
+
+        /**
+         * This field shall indicate the friendly name for the group.
+         *
+         * @see {@link MatterSpecification.v16.Core} § 11.24.7.4.2
+         */
         friendlyName: string;
+
+        /**
+         * This field shall indicate the unique identifier for the group key set.
+         *
+         * @see {@link MatterSpecification.v16.Core} § 11.24.7.4.3
+         */
         groupKeySetId: number | null;
+
+        /**
+         * This field shall indicate the CAT value for this group.
+         *
+         * GroupCAT values shall fall within the range 1 to 65534. Attempts to add a group with a GroupCAT value of
+         * Administrator CAT or Anchor CAT shall fail with CONSTRAINT_ERROR.
+         *
+         * @see {@link MatterSpecification.v16.Core} § 11.24.7.4.4
+         */
         groupCat: number | null;
+
+        /**
+         * This field shall indicate the current version number for this CAT.
+         *
+         * @see {@link MatterSpecification.v16.Core} § 11.24.7.4.5
+         */
         groupCatVersion: number | null;
-        groupPermission: DatastoreAccessControlEntryPrivilege;
-    }
 
-    /**
-     * This command shall be used to update a group in the Joint Fabric Datastore Cluster of the accessing fabric.
-     *
-     * GroupID represents the group to be updated in the Joint Fabric Datastore Cluster. NULL values for the additional
-     * parameters will be ignored (not updated).
-     *
-     * GroupCAT values shall fall within the range 1 to 65534. Attempts to update the GroupCAT on an existing group
-     * which has a GroupCAT value of Administrator CAT or Anchor CAT shall fail with CONSTRAINT_ERROR.
-     *
-     * Attempts to set the GroupCAT to Administrator CAT or Anchor CAT shall fail with CONSTRAINT_ERROR.
-     *
-     * Upon receipt of this command, the Datastore shall:
-     *
-     *   1. If entry is not found, then this command shall fail with a NOT_FOUND status code.
-     *
-     *   2. Update the DatastoreGroupInformationEntryStruct for the Group with the given GroupID to match the non-NULL
-     *      fields passed in.
-     *
-     *   3. If any fields are changed as a result of this command:
-     *
-     *   1. Iterate through each Node Information Entry:
-     *
-     *   1. If the GroupKeySetID changed:
-     *
-     *   1. Add a DatastoreNodeKeySetEntryStruct with the new GroupKeySetID, and Status set to Pending.
-     *
-     *   2. Add this KeySet to the Node.
-     *
-     *   1. If successful, Set the Status to Committed for this entry in the NodeKeySetList.
-     *
-     *   2. If not successful, Set the Status to CommitFailed and the FailureCode to the returned error. The pending
-     *      change shall be applied in a subsequent Node Refresh.
-     *
-     *   1. If the NodeKeySetList list contains an entry with the previous GroupKeySetID:
-     *
-     *   3. Set the Status set to DeletePending.
-     *
-     *   4. Remove this KeySet from the Node.
-     *
-     *   1. If successful, Remove this entry from the NodeKeySetList.
-     *
-     *   2. If not successful, the pending change shall be applied in a subsequent Node Refresh.
-     *
-     *   2. If the GroupCAT, GroupCATVersion or GroupPermission changed:
-     *
-     *   1. If the ACLList contains an entry for this Group, update the ACL List Entry in the Datastore with the new
-     *      values and Status Pending, update the ACL attribute on the given Node with the new values. If the update
-     *      succeeds, set the Status to Committed on the ACLList Entry in the Datastore.
-     *
-     *   3. If the FriendlyName changed:
-     *
-     *   1. Iterate through each Endpoint Information Entry:
-     *
-     *   1. If the GroupIDList contains an entry with the given GroupID:
-     *
-     *   1. Update the GroupIDList Entry in the Datastore with the new values and Status Pending
-     *
-     *   2. Update the Groups on the given Node with the new values.
-     *
-     *   1. If the update succeeds, set the Status to Committed on the GroupIDList Entry in the Datastore.
-     *
-     *   2. If not successful, the pending change shall be applied in a subsequent Node Refresh.
+        /**
+         * This field shall indicate the permission level associated with ACL entries for this group.
+         *
+         * The Datastore shall:
+         *
+         *   1. Ensure there are no Groups in the GroupList attribute with the given GroupID. If a match is found, then
+         *      this command shall fail with a CONSTRAINT_ERROR status code.
+         *
+         *   2. Add the DatastoreGroupInformationEntryStruct for the Group with the given GroupID to the GroupList
+         *      attribute.
+         *
+         * @see {@link MatterSpecification.v16.Core} § 11.24.7.4.6
+         */
+        groupPermission: DatastoreAccessControlEntryPrivilege;
+    }
+
+    /**
+     * Upon receipt, this shall update a group in the Joint Fabric Datastore Cluster of the accessing fabric.
      *
-     * @see {@link MatterSpecification.v151.Core} § 11.24.7.5
+     * @see {@link MatterSpecification.v16.Core} § 11.24.7.5
      */
     export class UpdateGroupRequest {
         constructor(values?: Partial<UpdateGroupRequest>);
+
+        /**
+         * This field shall indicate the group to be updated in the Joint Fabric Datastore Cluster.
+         *
+         * @see {@link MatterSpecification.v16.Core} § 11.24.7.5.1
+         */
         groupId: GroupId;
+
+        /**
+         * This field shall indicate the friendly name for the group. NULL values will be ignored (not updated).
+         *
+         * @see {@link MatterSpecification.v16.Core} § 11.24.7.5.2
+         */
         friendlyName: string | null;
+
+        /**
+         * This field shall indicate the unique identifier for the group key set. NULL values will be ignored (not
+         * updated).
+         *
+         * @see {@link MatterSpecification.v16.Core} § 11.24.7.5.3
+         */
         groupKeySetId: number | null;
+
+        /**
+         * This field shall indicate the CAT value for this group. NULL values will be ignored (not updated).
+         *
+         * GroupCAT values shall fall within the range 1 to 65534. Attempts to update the GroupCAT on an existing group
+         * which has a GroupCAT value of Administrator CAT or Anchor CAT shall fail with CONSTRAINT_ERROR.
+         *
+         * Attempts to set the GroupCAT to Administrator CAT or Anchor CAT shall fail with CONSTRAINT_ERROR.
+         *
+         * @see {@link MatterSpecification.v16.Core} § 11.24.7.5.4
+         */
         groupCat: number | null;
+
+        /**
+         * This field shall indicate the current version number for this CAT. NULL values will be ignored (not updated).
+         *
+         * @see {@link MatterSpecification.v16.Core} § 11.24.7.5.5
+         */
         groupCatVersion: number | null;
+
+        /**
+         * This field shall indicate the permission level associated with ACL entries for this group. NULL values will
+         * be ignored (not updated).
+         *
+         * The Datastore shall:
+         *
+         *   1. If entry is not found, then this command shall fail with a NOT_FOUND status code.
+         *
+         *   2. Update the DatastoreGroupInformationEntryStruct for the Group with the given GroupID to match the
+         *      non-NULL fields passed in.
+         *
+         *   3. If any fields are changed as a result of this command:
+         *
+         *   1. Iterate through each DatastoreNodeInformationEntryStruct:
+         *
+         *   1. If the GroupKeySetID changed:
+         *
+         *   1. Add a DatastoreNodeKeySetEntryStruct with the new GroupKeySetID, and Status set to Pending.
+         *
+         *   2. Add this KeySet to the Node.
+         *
+         *   1. If successful, Set the Status to Committed for this entry in the NodeKeySetList.
+         *
+         *   2. If not successful, Set the Status to CommitFailed and the FailureCode to the returned error. The pending
+         *      change shall be applied in a subsequent Node Refresh.
+         *
+         *   1. If the NodeKeySetList list contains an entry with the previous GroupKeySetID:
+         *
+         *   3. Set the Status set to DeletePending.
+         *
+         *   4. Remove this KeySet from the Node.
+         *
+         *   1. If successful, Remove this entry from the NodeKeySetList.
+         *
+         *   2. If not successful, the pending change shall be applied in a subsequent Node Refresh.
+         *
+         *   2. If the GroupCAT, GroupCATVersion or GroupPermission changed:
+         *
+         *   1. If the ACLList contains an entry for this Group, update the ACL List Entry in the Datastore with the new
+         *      values and Status Pending, update the ACL attribute on the given Node with the new values. If the update
+         *      succeeds, set the Status to Committed on the ACLList Entry in the Datastore.
+         *
+         *   3. If the FriendlyName changed:
+         *
+         *   1. Iterate through each DatastoreEndpointGroupIDEntryStruct in the EndpointGroupIDList attribute:
+         *
+         *   1. If the DatastoreEndpointGroupIDEntryStruct contains an entry with the given GroupID:
+         *
+         *   1. Update the DatastoreEndpointGroupIDEntryStruct Entry in the Datastore with the new values and Status
+         *      Pending
+         *
+         *   2. Update the Groups on the given Node with the new values.
+         *
+         *   1. If the update succeeds, set the Status to Committed on the GroupIDList Entry in the Datastore.
+         *
+         *   2. If not successful, the pending change shall be applied in a subsequent Node Refresh.
+         *
+         * @see {@link MatterSpecification.v16.Core} § 11.24.7.5.6
+         */
         groupPermission: DatastoreAccessControlEntryPrivilege | null;
     }
 
     /**
-     * This command shall be used to remove a group from the Joint Fabric Datastore Cluster of the accessing fabric.
-     *
-     * GroupID represents the unique identifier for the group to be removed from the Joint Fabric Datastore Cluster.
-     *
-     * Attempts to remove a group with GroupCAT value set to Administrator CAT or Anchor CAT shall fail with
-     * CONSTRAINT_ERROR.
-     *
-     * Upon receipt of this command, the Datastore shall:
-     *
-     *   1. If entry is not found, then this command shall fail with a NOT_FOUND status code.
-     *
-     *   2. Ensure there are no Nodes in this group. To do this:
+     * Upon receipt, this shall remove a group from the Joint Fabric Datastore Cluster of the accessing fabric.
      *
-     *   1. Iterate through each Node Information Entry:
-     *
-     *   1. If the GroupIDList contains an entry with the given GroupID, and the entry does NOT have Status
-     *      DeletePending, then this command shall fail with a CONSTRAINT_ERROR status code.
-     *
-     *   3. Remove the DatastoreGroupInformationEntryStruct for the Group with the given GroupID from the GroupList
-     *      attribute.
-     *
-     * @see {@link MatterSpecification.v151.Core} § 11.24.7.6
+     * @see {@link MatterSpecification.v16.Core} § 11.24.7.6
      */
     export class RemoveGroupRequest {
         constructor(values?: Partial<RemoveGroupRequest>);
+
+        /**
+         * This field shall indicate the unique identifier for the group to be removed from the Joint Fabric Datastore
+         * Cluster.
+         *
+         * Attempts to remove a group with GroupCAT value set to Administrator CAT or Anchor CAT shall fail with
+         * CONSTRAINT_ERROR.
+         *
+         * The Datastore shall:
+         *
+         *   1. If entry is not found, then this command shall fail with a NOT_FOUND status code.
+         *
+         *   2. Ensure there are no Nodes in this group. To do this:
+         *
+         *   1. Iterate through each DatastoreNodeInformationEntryStruct:
+         *
+         *   1. If the GroupIDList contains an entry with the given GroupID, and the entry does NOT have Status
+         *      DeletePending, then this command shall fail with a CONSTRAINT_ERROR status code.
+         *
+         *   3. Remove the DatastoreGroupInformationEntryStruct for the Group with the given GroupID from the GroupList
+         *      attribute.
+         *
+         * @see {@link MatterSpecification.v16.Core} § 11.24.7.6.1
+         */
         groupId: GroupId;
     }
 
     /**
-     * This command shall be used to add an admin to the Joint Fabric Datastore Cluster of the accessing fabric.
-     *
-     * NodeID, FriendlyName, VendorID and ICAC represent the admin to be added to the Joint Fabric Datastore Cluster.
+     * Upon receipt, this shall add an admin to the Joint Fabric Datastore Cluster of the accessing fabric.
      *
-     * @see {@link MatterSpecification.v151.Core} § 11.24.7.7
+     * @see {@link MatterSpecification.v16.Core} § 11.24.7.7
      */
     export class AddAdminRequest {
         constructor(values?: Partial<AddAdminRequest>);
+
+        /**
+         * This field shall indicate the unique identifier for the admin node.
+         *
+         * @see {@link MatterSpecification.v16.Core} § 11.24.7.7.1
+         */
         nodeId: NodeId;
+
+        /**
+         * This field shall indicate the friendly name for the admin node.
+         *
+         * @see {@link MatterSpecification.v16.Core} § 11.24.7.7.2
+         */
         friendlyName: string;
+
+        /**
+         * This field shall indicate the Vendor ID for the admin node.
+         *
+         * @see {@link MatterSpecification.v16.Core} § 11.24.7.7.3
+         */
         vendorId: VendorId;
+
+        /**
+         * This field shall indicate the ICAC used to issue the NOC.
+         *
+         * The Datastore shall:
+         *
+         *   1. Ensure there are no Admins in the AdminList attribute with the given NodeID. If a match is found, then
+         *      this command shall fail with a CONSTRAINT_ERROR status code.
+         *
+         *   2. Add the DatastoreAdministratorInformationEntryStruct for the Admin with the given NodeID to the
+         *      AdminList attribute.
+         *
+         * @see {@link MatterSpecification.v16.Core} § 11.24.7.7.4
+         */
         icac: Bytes;
     }
 
     /**
-     * This command shall be used to update an admin in the Joint Fabric Datastore Cluster of the accessing fabric.
-     *
-     * NodeID represents the admin to be updated in the Joint Fabric Datastore Cluster. NULL values for the additional
-     * parameters will be ignored (not updated).
+     * Upon receipt, this shall update an admin entry in the AdminList attribute.
      *
-     * If entry is not found, then this command shall fail with a NOT_FOUND status code.
-     *
-     * @see {@link MatterSpecification.v151.Core} § 11.24.7.8
+     * @see {@link MatterSpecification.v16.Core} § 11.24.7.8
      */
     export class UpdateAdminRequest {
         constructor(values?: Partial<UpdateAdminRequest>);
-        nodeId: NodeId | null;
-        friendlyName: string | null;
-        icac: Bytes | null;
+
+        /**
+         * This field shall indicate the admin to be updated in the Joint Fabric Datastore Cluster.
+         *
+         * @see {@link MatterSpecification.v16.Core} § 11.24.7.8.1
+         */
+        nodeId: NodeId;
+
+        /**
+         * This field shall indicate the friendly name for the admin node.
+         *
+         * @see {@link MatterSpecification.v16.Core} § 11.24.7.8.2
+         */
+        friendlyName?: string;
+
+        /**
+         * This field shall indicate the ICAC used to issue the NOC.
+         *
+         * The Datastore shall:
+         *
+         *   1. Find the entry in the AdminList attribute with the given NodeID, and update any changed fields.
+         *
+         *   2. If entry is not found, then this command shall fail with a NOT_FOUND status code.
+         *
+         * @see {@link MatterSpecification.v16.Core} § 11.24.7.8.3
+         */
+        icac?: Bytes;
     }
 
     /**
-     * This command shall be used to remove an admin from the Joint Fabric Datastore Cluster of the accessing fabric.
-     *
-     * NodeID represents the unique identifier for the admin to be removed from the Joint Fabric Datastore Cluster.
-     *
-     * If entry is not found, then this command shall fail with a NOT_FOUND status code.
+     * Upon receipt, this shall remove an admin from the Joint Fabric Datastore Cluster of the accessing fabric.
      *
-     * @see {@link MatterSpecification.v151.Core} § 11.24.7.9
+     * @see {@link MatterSpecification.v16.Core} § 11.24.7.9
      */
     export class RemoveAdminRequest {
         constructor(values?: Partial<RemoveAdminRequest>);
+
+        /**
+         * This field shall indicate the unique identifier for the admin to be removed from the Joint Fabric Datastore
+         * Cluster.
+         *
+         * The Datastore shall:
+         *
+         *   1. If an entry in the AdminList attribute with the given NodeID is not found, then this command shall fail
+         *      with a NOT_FOUND status code.
+         *
+         *   2. Remove the DatastoreAdministratorInformationEntryStruct for the Admin with the given NodeID from the
+         *      AdminList attribute.
+         *
+         * @see {@link MatterSpecification.v16.Core} § 11.24.7.9.1
+         */
         nodeId: NodeId;
     }
 
     /**
-     * The command shall be used to add a node to the Joint Fabric Datastore Cluster of the accessing fabric.
-     *
-     * NodeID represents the node to be added to the Joint Fabric Datastore Cluster.
-     *
-     * Upon receipt of this command, the Datastore shall:
-     *
-     *   1. Update CommissioningStatusEntry of the Node Information Entry with the given NodeID to Pending.
-     *
-     * If a Node Information Entry exists for the given NodeID, then this command shall fail with a INVALID_CONSTRAINT
-     * status code.
+     * Upon receipt, this shall add a node to the Joint Fabric Datastore Cluster of the accessing fabric.
      *
-     * @see {@link MatterSpecification.v151.Core} § 11.24.7.10
+     * @see {@link MatterSpecification.v16.Core} § 11.24.7.10
      */
     export class AddPendingNodeRequest {
         constructor(values?: Partial<AddPendingNodeRequest>);
+
+        /**
+         * This field shall indicate the node to be added to the Joint Fabric Datastore Cluster.
+         *
+         * @see {@link MatterSpecification.v16.Core} § 11.24.7.10.1
+         */
         nodeId: NodeId;
+
+        /**
+         * This field shall indicate the friendly name for the node.
+         *
+         * If a DatastoreNodeInformationEntryStruct exists for the given NodeID, then this command shall fail with a
+         * INVALID_CONSTRAINT status code.
+         *
+         * The Datastore shall:
+         *
+         *   1. Add an entry for the given NodeID to the NodeList attribute and set the status for the
+         *      DatastoreNodeInformationEntryStruct to Pending.
+         *
+         * @see {@link MatterSpecification.v16.Core} § 11.24.7.10.2
+         */
         friendlyName: string;
     }
 
     /**
-     * The command shall be used to request that Datastore information relating to a Node of the accessing fabric is
+     * Upon receipt, this shall request that Datastore information relating to a Node of the accessing fabric is
      * refreshed.
      *
-     * Upon receipt of this command, the Datastore shall:
-     *
-     *   1. Confirm that a Node Information Entry exists for the given NodeID, and if not, then this command shall fail
-     *      with a NOT_FOUND status code.
-     *
-     *   2. Update the CommissioningStatusEntry for the Node Information Entry to Pending.
-     *
-     *   3. Ensure the Endpoint List for the Node Information Entry with the given NodeID matches Endpoint list on the
-     *      given Node. This involves the following steps:
-     *
-     *   1. Read the PartsList of the Descriptor cluster from the Node.
-     *
-     *   2. For each Endpoint Information Entry in the Endpoint List of the Node Information Entry that does not match
-     *      an Endpoint ID in the PartsList, remove the Endpoint Information Entry.
-     *
-     *   3. For each Endpoint Information Entry in the Endpoint List of the Node Information Entry that matches an
-     *      Endpoint ID in the PartsList:
-     *
-     *   1. Check that each entry in Node's Group List occurs in the GroupIDList of the Endpoint Information Entry.
-     *
-     *   1. Add any missing entries to the GroupIDList of the Endpoint Information Entry.
-     *
-     *   2. For any entries in the GroupIDList with Status of Pending:
-     *
-     *   1. Add the corresponding change to the Node's Group List.
-     *
-     *   1. If successful, mark the Status to Committed.
-     *
-     *   2. If not successful, update the Status to CommitFailed and the FailureCode to the returned error. The error
-     *      shall be handled in a subsequent Node Refresh.
-     *
-     *   3. For any entries in the GroupIDList with Status of DeletePending:
-     *
-     *   1. If successful, remove the corresponding entry from the Node's Group List.
-     *
-     *   2. If not successful, update the Status to CommitFailed and the FailureCode to the returned error. The error
-     *      shall be handled in a subsequent Node Refresh.
-     *
-     *   4. For any entries in the GroupIDList with Status of CommitFailure:
-     *
-     *   1. A CommitFailure with an unrecoverable FailureCode shall be handled by removing the entry from the
-     *      GroupIDList.
-     *
-     *   2. A CommitFailure with a recoverable FailureCode (i.e. TIMEOUT, BUSY) shall be handle in a subsequent Node
-     *      Refresh.
-     *
-     *   2. Check that each entry in Node's Binding List occurs in the BindingList of the Endpoint Information Entry.
-     *
-     *   1. Add any missing entries to the BindingList of the Endpoint Information Entry.
-     *
-     *   2. For any entries in the BindingList with Status of Pending:
-     *
-     *   1. Add the corresponding change to the Node's Binding List.
-     *
-     *   1. If successful, mark the Status to Committed.
-     *
-     *   2. If not successful, update the Status to CommitFailed and the FailureCode to the returned error. The error
-     *      shall be handled in a subsequent Node Refresh.
-     *
-     *   3. For any entries in the BindingList with Status of DeletePending:
-     *
-     *   1. If successful, remove the corresponding entry from the Node's BindingList.
-     *
-     *   2. If not successful, update the Status to CommitFailed and the FailureCode to the returned error. The error
-     *      shall be handled in a subsequent Node Refresh.
-     *
-     *   4. For any entries in the BindingList with Status of CommitFailure:
-     *
-     *   1. A CommitFailure with an unrecoverable FailureCode shall be handled by removing the entry from the
-     *      BindingList.
-     *
-     *   2. A CommitFailure with a recoverable FailureCode (i.e. TIMEOUT, BUSY) shall be handle in a subsequent Node
-     *      Refresh.
-     *
-     *   4. Ensure the GroupKeySetList for the Node Information Entry with the given NodeID matches the Group Keys on
-     *      the given Node. This involves the following steps:
-     *
-     *   1. Read the Group Keys from the Node.
-     *
-     *   2. For each GroupKeySetEntry in the GroupKeySetList of the Node Information Entry with a Pending Status:
-     *
-     *   1. Add the corresponding DatastoreGroupKeySetStruct to the Node's Group Key list.
-     *
-     *   1. If successful, mark the Status to Committed.
-     *
-     *   2. If not successful, update the Status to CommitFailed and the FailureCode to the returned error. The error
-     *      shall be handled in a subsequent Node Refresh.
-     *
-     *   3. For each GroupKeySetEntry in the GroupKeySetList of the Node Information Entry with a CommitFailure Status:
-     *
-     *   1. A CommitFailure with an unrecoverable FailureCode shall be handled by removing the entry from the
-     *      GroupKeySetList.
-     *
-     *   2. A CommitFailure with a recoverable FailureCode (i.e. TIMEOUT, BUSY) shall be handle in a subsequent Node
-     *      Refresh.
-     *
-     *   4. All remaining entries in the GroupKeySetList should be replaced by the remaining entries on the Node.
-     *
-     *   5. Ensure the ACLList for the Node Information Entry with the given NodeID matches the ACL attribute on the
-     *      given Node. This involves the following steps:
-     *
-     *   1. Read the ACL attribute on the Node.
-     *
-     *   2. For each DatastoreACLEntryStruct in the ACLList of the Node Information Entry with a Pending Status:
-     *
-     *   1. Add the corresponding DatastoreACLEntryStruct to the Node's ACL attribute.
-     *
-     *   1. If successful, mark the Status to Committed.
-     *
-     *   2. If not successful, update the Status to CommitFailed and the FailureCode to the returned error. The error
-     *      shall be handled in a subsequent Node Refresh.
-     *
-     *   3. For each DatastoreACLEntryStruct in the ACLList of the Node Information Entry with a CommitFailure Status:
-     *
-     *   1. A CommitFailure with an unrecoverable FailureCode (i.e. RESOURCE_EXHAUSTED, CONSTRAINT_ERROR) shall be
-     *      handled by removing the entry from the ACLList.
-     *
-     *   2. A CommitFailure with a recoverable FailureCode (i.e. TIMEOUT, BUSY) shall be handle in a subsequent Node
-     *      Refresh.
-     *
-     *   4. All remaining entries in the ACLList should be replaced by the remaining entries on the Node.
-     *
-     *   6. Update the CommissioningStatusEntry for the Node Information Entry to Committed.
-     *
-     * @see {@link MatterSpecification.v151.Core} § 11.24.7.11
+     * @see {@link MatterSpecification.v16.Core} § 11.24.7.11
      */
     export class RefreshNodeRequest {
         constructor(values?: Partial<RefreshNodeRequest>);
+
+        /**
+         * This field shall indicate the node for which Datastore information should be refreshed.
+         *
+         * The Datastore shall:
+         *
+         *   1. Confirm that a DatastoreNodeInformationEntryStruct exists in the NodeList attribute for the given
+         *      NodeID, and if not, then this command shall fail with a NOT_FOUND status code.
+         *
+         *   2. Update the CommissioningStatusEntry for the DatastoreNodeInformationEntryStruct to Pending.
+         *
+         *   3. Ensure the Endpoint List for the DatastoreNodeInformationEntryStruct with the given NodeID matches
+         *      Endpoint list on the given Node. This involves the following steps:
+         *
+         *   1. Read the PartsList of the Descriptor cluster from the Node.
+         *
+         *   2. For each DatastoreEndpointEntryStruct in the NodeEndpointList attribute with the given NodeID that does
+         *      not match an Endpoint ID in the PartsList, remove the DatastoreEndpointEntryStruct.
+         *
+         *   3. For each DatastoreEndpointEntryStruct in the NodeEndpointList attribute with the given NodeID that
+         *      matches an Endpoint ID in the PartsList:
+         *
+         *   1. Check that each entry in Node's Group List occurs in the EndpointGroupIDList attribute.
+         *
+         *   1. Add any missing entries to the EndpointGroupIDList.
+         *
+         *   2. For any entries in the EndpointGroupIDList attribute with the given NodeId and EndpointId with Status of
+         *      Pending:
+         *
+         *   1. Add the corresponding change to the Node's Group List.
+         *
+         *   1. If successful, mark the Status to Committed.
+         *
+         *   2. If not successful, update the Status to CommitFailed and the FailureCode to the returned error. The
+         *      error shall be handled in a subsequent Node Refresh.
+         *
+         *   3. For any entries in the EndpointGroupIDList attribute with the given NodeID and EndpointID with Status of
+         *      DeletePending:
+         *
+         *   1. If successful, remove the corresponding entry from the Node's Group List.
+         *
+         *   2. If not successful, update the Status to CommitFailed and the FailureCode to the returned error. The
+         *      error shall be handled in a subsequent Node Refresh.
+         *
+         *   4. For any entries in the EndpointGroupIDList attribute with the given NodeID and EndpointID with Status of
+         *      CommitFailure:
+         *
+         *   1. A CommitFailure with an unrecoverable FailureCode shall be handled by removing the entry from the
+         *      GroupIDList.
+         *
+         *   2. A CommitFailure with a recoverable FailureCode (i.e. TIMEOUT, BUSY) shall be handle in a subsequent Node
+         *      Refresh.
+         *
+         *   2. Check that each entry in Node's Binding List occurs in the EndpointBindingList attribute with the given
+         *      NodeId and EndpointId.
+         *
+         *   1. Add any missing entries to the EndpointBindingList attribute.
+         *
+         *   2. For any entries in the EndpointBindingList attribute with the given NodeID and EndpointID with Status of
+         *      Pending:
+         *
+         *   1. Add the corresponding change to the Node's Binding List.
+         *
+         *   1. If successful, mark the Status to Committed.
+         *
+         *   2. If not successful, update the Status to CommitFailed and the FailureCode to the returned error. The
+         *      error shall be handled in a subsequent Node Refresh.
+         *
+         *   3. For any entries in the EndpointBindingList attribute with the given NodeID and EndpointID with Status of
+         *      DeletePending:
+         *
+         *   1. If successful, remove the corresponding entry from the Node's BindingList.
+         *
+         *   2. If not successful, update the Status to CommitFailed and the FailureCode to the returned error. The
+         *      error shall be handled in a subsequent Node Refresh.
+         *
+         *   4. For any entries in the EndpointBindingList attribute with the given NodeID and EndpointID with Status of
+         *      CommitFailure:
+         *
+         *   1. A CommitFailure with an unrecoverable FailureCode shall be handled by removing the entry from the
+         *      BindingList.
+         *
+         *   2. A CommitFailure with a recoverable FailureCode (i.e. TIMEOUT, BUSY) shall be handle in a subsequent Node
+         *      Refresh.
+         *
+         *   4. Ensure the GroupKeySetList entries with the given NodeID match the Group Keys on the given Node. This
+         *      involves the following steps:
+         *
+         *   1. Read the Group Keys from the Node.
+         *
+         *   2. For each DatastoreGroupKeySetStruct in the GroupKeySetList attribute for the given NodeID with a Pending
+         *      Status:
+         *
+         *   1. Add the corresponding DatastoreGroupKeySetStruct to the Node's Group Key list.
+         *
+         *   1. If successful, mark the Status to Committed.
+         *
+         *   2. If not successful, update the Status to CommitFailed and the FailureCode to the returned error. The
+         *      error shall be handled in a subsequent Node Refresh.
+         *
+         *   3. For each DatastoreGroupKeySetStruct in the GroupKeySetList attribute for the given NodeID with a
+         *      CommitFailure Status:
+         *
+         *   1. A CommitFailure with an unrecoverable FailureCode shall be handled by removing the entry from the
+         *      GroupKeySetList.
+         *
+         *   2. A CommitFailure with a recoverable FailureCode (i.e. TIMEOUT, BUSY) shall be handle in a subsequent Node
+         *      Refresh.
+         *
+         *   4. All remaining entries in the GroupKeySetList attribute for the given NodeId should be replaced by the
+         *      remaining entries on the Node.
+         *
+         *   5. Ensure the NodeACLList attribute for the given NodeID matches the ACL attribute on the given Node. This
+         *      involves the following steps:
+         *
+         *   1. Read the ACL attribute on the Node.
+         *
+         *   2. For each DatastoreACLEntryStruct in the ACLList attribute with the given NodeID with a Pending Status:
+         *
+         *   1. Add the corresponding DatastoreACLEntryStruct to the Node's ACL attribute.
+         *
+         *   1. If successful, mark the Status to Committed.
+         *
+         *   2. If not successful, update the Status to CommitFailed and the FailureCode to the returned error. The
+         *      error shall be handled in a subsequent Node Refresh.
+         *
+         *   3. For each DatastoreACLEntryStruct in the ACLList attribute with the given NodeID with a CommitFailure
+         *      Status:
+         *
+         *   1. A CommitFailure with an unrecoverable FailureCode (i.e. RESOURCE_EXHAUSTED, CONSTRAINT_ERROR) shall be
+         *      handled by removing the entry from the ACLList.
+         *
+         *   2. A CommitFailure with a recoverable FailureCode (i.e. TIMEOUT, BUSY) shall be handle in a subsequent Node
+         *      Refresh.
+         *
+         *   4. All remaining entries in the ACLList should be replaced by the remaining entries on the Node.
+         *
+         *   6. Update the CommissioningStatusEntry for the DatastoreNodeInformationEntryStruct to Committed.
+         *
+         * @see {@link MatterSpecification.v16.Core} § 11.24.7.11.1
+         */
         nodeId: NodeId;
     }
 
     /**
-     * The command shall be used to update the friendly name for a node in the Joint Fabric Datastore Cluster of the
+     * Upon receipt, this shall update the friendly name for a node in the Joint Fabric Datastore Cluster of the
      * accessing fabric.
      *
-     * NodeID represents the node to be updated in the Joint Fabric Datastore Cluster.
-     *
-     * If a Node Information Entry does not exist for the given NodeID, then this command shall fail with a NOT_FOUND
-     * status code.
-     *
-     * @see {@link MatterSpecification.v151.Core} § 11.24.7.12
+     * @see {@link MatterSpecification.v16.Core} § 11.24.7.12
      */
     export class UpdateNodeRequest {
         constructor(values?: Partial<UpdateNodeRequest>);
+
+        /**
+         * This field shall indicate the node to be updated in the Joint Fabric Datastore Cluster.
+         *
+         * @see {@link MatterSpecification.v16.Core} § 11.24.7.12.1
+         */
         nodeId: NodeId;
+
+        /**
+         * This field shall indicate the friendly name for the node.
+         *
+         * The Datastore shall:
+         *
+         *   1. If a DatastoreNodeInformationEntryStruct does not exist for the given NodeID in the NodeList attribute,
+         *      then this command shall fail with a NOT_FOUND status code.
+         *
+         *   2. Update the FriendlyName field of the DatastoreNodeInformationEntryStruct with the given NodeID.
+         *
+         * @see {@link MatterSpecification.v16.Core} § 11.24.7.12.2
+         */
         friendlyName: string;
     }
 
     /**
-     * This command shall be used to remove a node from the Joint Fabric Datastore Cluster of the accessing fabric.
-     *
-     * NodeID represents the unique identifier for the node to be removed from the Joint Fabric Datastore Cluster.
-     *
-     * If a Node Information Entry does not exist for the given NodeID, then this command shall fail with a NOT_FOUND
-     * status code.
+     * Upon receipt, this shall remove a node from the Joint Fabric Datastore Cluster of the accessing fabric.
      *
-     * @see {@link MatterSpecification.v151.Core} § 11.24.7.13
+     * @see {@link MatterSpecification.v16.Core} § 11.24.7.13
      */
     export class RemoveNodeRequest {
         constructor(values?: Partial<RemoveNodeRequest>);
+
+        /**
+         * This field shall indicate the unique identifier for the node to be removed from the Joint Fabric Datastore
+         * Cluster.
+         *
+         * The Datastore shall:
+         *
+         *   1. If a DatastoreNodeInformationEntryStruct does not exist for the given NodeID in the NodeList attribute,
+         *      then this command shall fail with a NOT_FOUND status code.
+         *
+         *   2. Remove the DatastoreNodeInformationEntryStruct with the given NodeID from the NodeList attribute.
+         *
+         * @see {@link MatterSpecification.v16.Core} § 11.24.7.13.1
+         */
         nodeId: NodeId;
     }
 
     /**
-     * This command shall be used to update the state of an endpoint for a node in the Joint Fabric Datastore Cluster of
-     * the accessing fabric.
-     *
-     * EndpointID represents the unique identifier for the endpoint to be updated in the Joint Fabric Datastore Cluster.
-     *
-     * NodeID represents the unique identifier for the node to which the endpoint belongs.
-     *
-     * If an Endpoint Information Entry does not exist for the given NodeID and EndpointID, then this command shall fail
-     * with a NOT_FOUND status code.
+     * Upon receipt, this shall update the state of an endpoint for a node in the Joint Fabric Datastore Cluster of the
+     * accessing fabric.
      *
-     * @see {@link MatterSpecification.v151.Core} § 11.24.7.14
+     * @see {@link MatterSpecification.v16.Core} § 11.24.7.14
      */
     export class UpdateEndpointForNodeRequest {
         constructor(values?: Partial<UpdateEndpointForNodeRequest>);
+
+        /**
+         * This field shall indicate the unique identifier for the endpoint to be updated in the Joint Fabric Datastore
+         * Cluster.
+         *
+         * @see {@link MatterSpecification.v16.Core} § 11.24.7.14.1
+         */
         endpointId: EndpointNumber;
+
+        /**
+         * This field shall indicate the unique identifier for the node to which the endpoint belongs.
+         *
+         * @see {@link MatterSpecification.v16.Core} § 11.24.7.14.2
+         */
         nodeId: NodeId;
+
+        /**
+         * This field shall indicate the friendly name for the endpoint.
+         *
+         * The Datastore shall:
+         *
+         *   1. If an DatastoreNodeInformationEntryStruct does not exist for the given NodeID and EndpointID in the
+         *      NodeEndpointList attribute, then this command shall fail with a NOT_FOUND status code.
+         *
+         *   2. Update the FriendlyName field of the DatastoreNodeInformationEntryStruct with the given NodeID and
+         *      EndpointID.
+         *
+         * @see {@link MatterSpecification.v16.Core} § 11.24.7.14.3
+         */
         friendlyName: string;
     }
 
     /**
-     * This command shall be used to add a Group ID to an endpoint for a node in the Joint Fabric Datastore Cluster of
-     * the accessing fabric.
-     *
-     * GroupID represents the unique identifier for the group to be added to the endpoint.
-     *
-     * EndpointID represents the unique identifier for the endpoint to be updated in the Joint Fabric Datastore Cluster.
-     *
-     * NodeID represents the unique identifier for the node to which the endpoint belongs.
-     *
-     * Upon receipt of this command, the Datastore shall:
-     *
-     *   1. Confirm that an Endpoint Information Entry exists for the given NodeID and EndpointID, and if not, then this
-     *      command shall fail with a NOT_FOUND status code.
-     *
-     *   2. Ensure the Group Key List for the Node Information Entry with the given NodeID includes the KeySet for the
-     *      given Group ID. If it does not:
-     *
-     *   1. Add an entry for the KeySet of the given Group ID to the Group Key List for the Node. The new entry's status
-     *      shall be set to Pending.
-     *
-     *   2. Add a Group Key Entry for this KeySet to the given Node ID.
-     *
-     *   1. If this succeeds, update the new KeySet entry in the Datastore to Committed.
-     *
-     *   2. If not successful, the pending change shall be applied in a subsequent Node Refresh.
-     *
-     *   3. Ensure the Group List for the Endpoint Information Entry with the given NodeID and EndpointID includes an
-     *      entry for the given Group. If it does not:
-     *
-     *   1. Add a Group entry for the given Group ID to the Group List for the Endpoint and Node. The new entry's status
-     *      shall be set to Pending.
-     *
-     *   2. Add this Group entry to the given Endpoint ID on the given Node ID.
-     *
-     *   1. If this succeeds, update the new Group entry in the Datastore to Committed.
-     *
-     *   2. If not successful, update the Status to CommitFailed and the FailureCode to the returned error. The error
-     *      shall be handled in a subsequent Node Refresh.
+     * Upon receipt, this shall add a Group ID to an endpoint for a node in the Joint Fabric Datastore Cluster of the
+     * accessing fabric.
      *
-     * @see {@link MatterSpecification.v151.Core} § 11.24.7.15
+     * @see {@link MatterSpecification.v16.Core} § 11.24.7.15
      */
     export class AddGroupIdToEndpointForNodeRequest {
         constructor(values?: Partial<AddGroupIdToEndpointForNodeRequest>);
+
+        /**
+         * This field shall indicate the unique identifier for the node to which the endpoint belongs.
+         *
+         * @see {@link MatterSpecification.v16.Core} § 11.24.7.15.1
+         */
         nodeId: NodeId;
+
+        /**
+         * This field shall indicate the unique identifier for the endpoint to be updated in the Joint Fabric Datastore
+         * Cluster.
+         *
+         * @see {@link MatterSpecification.v16.Core} § 11.24.7.15.2
+         */
         endpointId: EndpointNumber;
+
+        /**
+         * This field shall indicate the unique identifier for the group to be added to the endpoint.
+         *
+         * The Datastore shall:
+         *
+         *   1. Confirm that an DatastoreNodeInformationEntryStruct exists for the given NodeID and EndpointID in the
+         *      NodeEndpointList attribute, and if not, then this command shall fail with a NOT_FOUND status code.
+         *
+         *   2. Ensure the Group Key List for the DatastoreNodeInformationEntryStruct with the given NodeID includes the
+         *      KeySet for the given Group ID. If it does not:
+         *
+         *   1. Add an entry for the KeySet of the given Group ID to the Group Key List for the Node. The new entry's
+         *      status shall be set to Pending.
+         *
+         *   2. Add a Group Key Entry for this KeySet to the given Node ID.
+         *
+         *   1. If this succeeds, update the new KeySet entry in the Datastore to Committed.
+         *
+         *   2. If not successful, the pending change shall be applied in a subsequent Node Refresh.
+         *
+         *   3. Ensure the Group List for the DatastoreNodeInformationEntryStruct with the given NodeID and EndpointID
+         *      includes an entry for the given Group. If it does not:
+         *
+         *   1. Add a Group entry for the given Group ID to the Group List for the Endpoint and Node. The new entry's
+         *      status shall be set to Pending.
+         *
+         *   2. Add this Group entry to the given Endpoint ID on the given Node ID.
+         *
+         *   1. If this succeeds, update the new Group entry in the Datastore to Committed.
+         *
+         *   2. If not successful, update the Status to CommitFailed and the FailureCode to the returned error. The
+         *      error shall be handled in a subsequent Node Refresh.
+         *
+         * @see {@link MatterSpecification.v16.Core} § 11.24.7.15.3
+         */
         groupId: GroupId;
     }
 
     /**
-     * This command shall be used to remove a Group ID from an endpoint for a node in the Joint Fabric Datastore Cluster
-     * of the accessing fabric.
-     *
-     * GroupID represents the unique identifier for the group to be removed from the endpoint.
-     *
-     * EndpointID represents the unique identifier for the endpoint to be updated in the Joint Fabric Datastore Cluster.
-     *
-     * NodeID represents the unique identifier for the node to which the endpoint belongs.
-     *
-     * Upon receipt of this command, the Datastore shall:
-     *
-     *   1. Confirm that an Endpoint Information Entry exists for the given NodeID and EndpointID, and if not, then this
-     *      command shall fail with a NOT_FOUND status code.
-     *
-     *   2. Ensure the Group List for the Endpoint Information Entry with the given NodeID and EndpointID does not
-     *      include an entry for the given Group. If it does:
-     *
-     *   1. Update the status to DeletePending of the Group entry for the given Group ID in the Group List.
-     *
-     *   2. Remove this Group entry for the given Endpoint ID on the given Node ID.
-     *
-     *   1. If this succeeds, remove the Group entry for the given Group ID in the Group List for this NodeID and
-     *      EndpointID in the Datastore.
-     *
-     *   2. If not successful, the pending change shall be applied in a subsequent Node Refresh.
-     *
-     *   3. Ensure the Group Key List for the Node Information Entry with the given NodeID does not include the KeySet
-     *      for the given Group ID. If it does:
-     *
-     *   1. Update the status to DeletePending for the entry for the KeySet of the given Group ID in the Node Group Key
-     *      List.
-     *
-     *   2. Remove the Group Key Entry for this KeySet from the given Node ID.
-     *
-     *   1. If this succeeds, remove the KeySet entry for the given Node ID.
-     *
-     *   2. If not successful, update the Status to CommitFailed and the FailureCode to the returned error. The error
-     *      shall be handled in a subsequent Node Refresh.
+     * Upon receipt, this shall remove a Group ID from an endpoint for a node in the Joint Fabric Datastore Cluster of
+     * the accessing fabric.
      *
-     * @see {@link MatterSpecification.v151.Core} § 11.24.7.16
+     * @see {@link MatterSpecification.v16.Core} § 11.24.7.16
      */
     export class RemoveGroupIdFromEndpointForNodeRequest {
         constructor(values?: Partial<RemoveGroupIdFromEndpointForNodeRequest>);
+
+        /**
+         * This field shall indicate the unique identifier for the node to which the endpoint belongs.
+         *
+         * @see {@link MatterSpecification.v16.Core} § 11.24.7.16.1
+         */
         nodeId: NodeId;
+
+        /**
+         * This field shall indicate the unique identifier for the endpoint to be updated in the Joint Fabric Datastore
+         * Cluster.
+         *
+         * @see {@link MatterSpecification.v16.Core} § 11.24.7.16.2
+         */
         endpointId: EndpointNumber;
+
+        /**
+         * This field shall indicate the unique identifier for the group to be removed from the endpoint.
+         *
+         * The Datastore shall:
+         *
+         *   1. Confirm that an DatastoreNodeInformationEntryStruct exists for the given NodeID and EndpointID in the
+         *      NodeEndpointList attribute, and if not, then this command shall fail with a NOT_FOUND status code.
+         *
+         *   2. Ensure the EndpointGroupIDList entries with the given NodeID and EndpointID does not include an entry
+         *      for the given Group. If it does:
+         *
+         *   1. Update the status to DeletePending of the Group entry for the given Group ID in the Group List.
+         *
+         *   2. Remove this Group entry for the given Endpoint ID on the given Node ID.
+         *
+         *   1. If this succeeds, remove the Group entry for the given Group ID in the Group List for this NodeID and
+         *      EndpointID in the Datastore.
+         *
+         *   2. If not successful, the pending change shall be applied in a subsequent Node Refresh.
+         *
+         *   3. Ensure the Group Key List for the DatastoreNodeInformationEntryStruct with the given NodeID does not
+         *      include the KeySet for the given Group ID. If it does:
+         *
+         *   1. Update the status to DeletePending for the entry for the KeySet of the given Group ID in the Node Group
+         *      Key List.
+         *
+         *   2. Remove the Group Key Entry for this KeySet from the given Node ID.
+         *
+         *   1. If this succeeds, remove the KeySet entry for the given Node ID.
+         *
+         *   2. If not successful, update the Status to CommitFailed and the FailureCode to the returned error. The
+         *      error shall be handled in a subsequent Node Refresh.
+         *
+         * @see {@link MatterSpecification.v16.Core} § 11.24.7.16.3
+         */
         groupId: GroupId;
     }
 
     /**
-     * This command shall be used to add a binding to an endpoint for a node in the Joint Fabric Datastore Cluster of
-     * the accessing fabric.
-     *
-     * Binding represents the binding to be added to the endpoint.
-     *
-     * EndpointID represents the unique identifier for the endpoint to be updated in the Joint Fabric Datastore Cluster.
-     *
-     * NodeID represents the unique identifier for the node to which the endpoint belongs.
-     *
-     * Upon receipt of this command, the Datastore shall:
-     *
-     *   1. Confirm that an Endpoint Information Entry exists for the given NodeID and EndpointID, and if not, then this
-     *      command shall fail with a NOT_FOUND status code.
-     *
-     *   2. Ensure the Binding List for the Node Information Entry with the given NodeID includes the given Binding. If
-     *      it does not:
-     *
-     *   1. Add the Binding to the Binding List for the Node Information Entry for the given NodeID. The new entry's
-     *      status shall be set to Pending.
-     *
-     *   2. Add this Binding to the given Node ID.
-     *
-     *   1. If this succeeds, update the new Binding in the Datastore to Committed.
-     *
-     *   2. If not successful, update the Status to CommitFailed and the FailureCode to the returned error. The error
-     *      shall be handled in a subsequent Node Refresh.
+     * Upon receipt, this shall add a binding to an endpoint for a node in the Joint Fabric Datastore Cluster of the
+     * accessing fabric.
      *
-     * @see {@link MatterSpecification.v151.Core} § 11.24.7.17
+     * @see {@link MatterSpecification.v16.Core} § 11.24.7.17
      */
     export class AddBindingToEndpointForNodeRequest {
         constructor(values?: Partial<AddBindingToEndpointForNodeRequest>);
+
+        /**
+         * This field shall indicate the unique identifier for the node to which the endpoint belongs.
+         *
+         * @see {@link MatterSpecification.v16.Core} § 11.24.7.17.1
+         */
         nodeId: NodeId;
+
+        /**
+         * This field shall indicate the unique identifier for the endpoint to be updated in the Joint Fabric Datastore
+         * Cluster.
+         *
+         * @see {@link MatterSpecification.v16.Core} § 11.24.7.17.2
+         */
         endpointId: EndpointNumber;
+
+        /**
+         * This field shall indicate the binding to be added to the endpoint.
+         *
+         * The Datastore shall:
+         *
+         *   1. Confirm that an DatastoreNodeInformationEntryStruct exists for the given NodeID and EndpointID in the
+         *      NodeEndpointList attribute, and if not, then this command shall fail with a NOT_FOUND status code.
+         *
+         *   2. Ensure the Binding List for the DatastoreNodeInformationEntryStruct with the given NodeID includes the
+         *      given Binding. If it does not:
+         *
+         *   1. Add the DatastoreEndpointBindingEntryStruct entry to the EndpointBindingList attribute for the given
+         *      NodeID and EndpointID. The new entry's status shall be set to Pending.
+         *
+         *   2. Add this Binding to the given Node ID.
+         *
+         *   1. If this succeeds, update the new Binding in the Datastore to Committed.
+         *
+         *   2. If not successful, update the Status to CommitFailed and the FailureCode to the returned error. The
+         *      error shall be handled in a subsequent Node Refresh.
+         *
+         * @see {@link MatterSpecification.v16.Core} § 11.24.7.17.3
+         */
         binding: DatastoreBindingTarget;
     }
 
     /**
-     * This command shall be used to remove a binding from an endpoint for a node in the Joint Fabric Datastore Cluster
-     * of the accessing fabric.
-     *
-     * ListID represents the unique identifier for the binding entry in the Datastore's EndpointBindingList attribute to
-     * be removed from the endpoint.
-     *
-     * EndpointID represents the unique identifier for the endpoint to be updated in the Joint Fabric Datastore Cluster.
-     *
-     * NodeID represents the unique identifier for the node to which the endpoint belongs.
-     *
-     * Upon receipt of this command, the Datastore shall:
-     *
-     *   1. Confirm that an Endpoint Information Entry exists for the given NodeID and EndpointID, and if not, then this
-     *      command shall fail with a NOT_FOUND status code.
-     *
-     *   2. Ensure the Binding List for the Node Information Entry with the given NodeID does not include an entry with
-     *      the given ListID. If it does:
-     *
-     *   1. Update the status to DeletePending for the given Binding in the Binding List.
-     *
-     *   2. Remove this Binding from the given Node ID.
-     *
-     *   1. If this succeeds, remove the given Binding from the Binding List.
-     *
-     *   2. If not successful, update the Status to CommitFailed and the FailureCode to the returned error. The error
-     *      shall be handled in a subsequent Node Refresh.
+     * Upon receipt, this shall remove a binding from an endpoint for a node in the Joint Fabric Datastore Cluster of
+     * the accessing fabric.
      *
-     * @see {@link MatterSpecification.v151.Core} § 11.24.7.18
+     * @see {@link MatterSpecification.v16.Core} § 11.24.7.18
      */
     export class RemoveBindingFromEndpointForNodeRequest {
         constructor(values?: Partial<RemoveBindingFromEndpointForNodeRequest>);
+
+        /**
+         * This field shall indicate the unique identifier for the binding entry in the Datastore's EndpointBindingList
+         * attribute to be removed from the endpoint.
+         *
+         * @see {@link MatterSpecification.v16.Core} § 11.24.7.18.1
+         */
         listId: number;
+
+        /**
+         * This field shall indicate the unique identifier for the endpoint to be updated in the Joint Fabric Datastore
+         * Cluster.
+         *
+         * @see {@link MatterSpecification.v16.Core} § 11.24.7.18.2
+         */
         endpointId: EndpointNumber;
+
+        /**
+         * This field shall indicate the unique identifier for the node to which the endpoint belongs.
+         *
+         * The Datastore shall:
+         *
+         *   1. Confirm that an DatastoreNodeInformationEntryStruct exists for the given NodeID and EndpointID in the
+         *      EndpointBindingList attribute, and if not, then this command shall fail with a NOT_FOUND status code.
+         *
+         *   2. Ensure the EndpointBindingList entries with the given NodeID does not include an entry with the given
+         *      ListID. If it does:
+         *
+         *   1. Update the status to DeletePending for the given Binding in the Binding List.
+         *
+         *   2. Remove this Binding from the given Node ID.
+         *
+         *   1. If this succeeds, remove the given Binding from the Binding List.
+         *
+         *   2. If not successful, update the Status to CommitFailed and the FailureCode to the returned error. The
+         *      error shall be handled in a subsequent Node Refresh.
+         *
+         * @see {@link MatterSpecification.v16.Core} § 11.24.7.18.3
+         */
         nodeId: NodeId;
     }
 
     /**
-     * This command shall be used to add an ACL to a node in the Joint Fabric Datastore Cluster of the accessing fabric.
+     * Upon receipt, this shall add an ACL to a node in the Joint Fabric Datastore Cluster of the accessing fabric.
      *
-     * NodeID represents the unique identifier for the node to which the ACL is to be added.
-     *
-     * ACLEntry represents the ACL to be added to the Joint Fabric Datastore Cluster.
-     *
-     * Upon receipt of this command, the Datastore shall:
-     *
-     *   1. Confirm that a Node Information Entry exists for the given NodeID, and if not, then this command shall fail
-     *      with a NOT_FOUND status code.
-     *
-     *   2. Ensure the ACL List for the given NodeID includes the given ACLEntry. If it does not:
-     *
-     *   1. Add the ACLEntry to the ACL List for the given NodeID. The new entry's status shall be set to Pending.
-     *
-     *   2. Add this ACLEntry to the given Node ID.
-     *
-     *   1. If this succeeds, update the new ACLEntry in the Datastore to Committed.
-     *
-     *   2. If not successful, update the Status to CommitFailed and the FailureCode to the returned error. The error
-     *      shall be handled in a subsequent Node Refresh.
-     *
-     * @see {@link MatterSpecification.v151.Core} § 11.24.7.19
+     * @see {@link MatterSpecification.v16.Core} § 11.24.7.19
      */
     export class AddAclToNodeRequest {
         constructor(values?: Partial<AddAclToNodeRequest>);
+
+        /**
+         * This field shall indicate the unique identifier for the node to which the ACL is to be added.
+         *
+         * @see {@link MatterSpecification.v16.Core} § 11.24.7.19.1
+         */
         nodeId: NodeId;
+
+        /**
+         * This field shall indicate the ACL to be added to the Joint Fabric Datastore Cluster.
+         *
+         * The Datastore shall:
+         *
+         *   1. Confirm that a DatastoreNodeInformationEntryStruct exists for the given NodeID in the NodeList
+         *      attribute, and if not, then this command shall fail with a NOT_FOUND status code.
+         *
+         *   2. Ensure the ACL List for the given NodeID includes the given ACLEntry. If it does not:
+         *
+         *   1. Add the ACLEntry to the ACL List for the given NodeID. The new entry's status shall be set to Pending.
+         *
+         *   2. Add this ACLEntry to the given Node ID.
+         *
+         *   1. If this succeeds, update the new ACLEntry in the Datastore to Committed.
+         *
+         *   2. If not successful, update the Status to CommitFailed and the FailureCode to the returned error. The
+         *      error shall be handled in a subsequent Node Refresh.
+         *
+         * @see {@link MatterSpecification.v16.Core} § 11.24.7.19.2
+         */
         aclEntry: DatastoreAccessControlEntry;
     }
 
     /**
-     * This command shall be used to remove an ACL from a node in the Joint Fabric Datastore Cluster of the accessing
-     * fabric.
-     *
-     * ListID represents the unique identifier for the DatastoreACLEntryStruct to be removed from the Datastore's list
-     * of DatastoreACLEntry.
-     *
-     * NodeID represents the unique identifier for the node from which the ACL is to be removed.
+     * Upon receipt, this shall remove an ACL from a node in the Joint Fabric Datastore Cluster of the accessing fabric.
      *
-     * Upon receipt of this command, the Datastore shall:
-     *
-     *   1. Confirm that a Node Information Entry exists for the given NodeID, and if not, then this command shall fail
-     *      with a NOT_FOUND status code.
-     *
-     *   2. Ensure the ACL List for the given NodeID does not include the given ACLEntry. If it does:
-     *
-     *   1. Update the status to DeletePending for the given ACLEntry in the ACL List.
-     *
-     *   2. Remove this ACLEntry from the given Node ID.
-     *
-     *   1. If this succeeds, remove the given ACLEntry from the Node ACL List.
-     *
-     *   2. If not successful, update the Status to CommitFailed and the FailureCode to the returned error. The error
-     *      shall be handled in a subsequent Node Refresh.
-     *
-     * @see {@link MatterSpecification.v151.Core} § 11.24.7.20
+     * @see {@link MatterSpecification.v16.Core} § 11.24.7.20
      */
     export class RemoveAclFromNodeRequest {
         constructor(values?: Partial<RemoveAclFromNodeRequest>);
+
+        /**
+         * This field shall indicate the unique identifier for the DatastoreACLEntryStruct to be removed from the
+         * Datastore's list of DatastoreACLEntry.
+         *
+         * @see {@link MatterSpecification.v16.Core} § 11.24.7.20.1
+         */
         listId: number;
+
+        /**
+         * This field shall indicate the unique identifier for the node from which the ACL is to be removed.
+         *
+         * The Datastore shall:
+         *
+         *   1. Confirm that a DatastoreNodeInformationEntryStruct exists for the given NodeID in the NodeList
+         *      attribute, and if not, then this command shall fail with a NOT_FOUND status code.
+         *
+         *   2. Ensure the ACL List for the given NodeID does not include the given ACLEntry. If it does:
+         *
+         *   1. Update the status to DeletePending for the given ACLEntry in the ACL List.
+         *
+         *   2. Remove this ACLEntry from the given Node ID.
+         *
+         *   1. If this succeeds, remove the given ACLEntry from the Node ACL List.
+         *
+         *   2. If not successful, update the Status to CommitFailed and the FailureCode to the returned error. The
+         *      error shall be handled in a subsequent Node Refresh.
+         *
+         * @see {@link MatterSpecification.v16.Core} § 11.24.7.20.2
+         */
         nodeId: NodeId;
     }
 
     /**
-     * @see {@link MatterSpecification.v151.Core} § 11.24.5.1
+     * @see {@link MatterSpecification.v16.Core} § 11.24.5.1
      */
     export enum DatastoreState {
         /**
@@ -2063,7 +1854,7 @@ export declare namespace JointFabricDatastore {
     }
 
     /**
-     * @see {@link MatterSpecification.v151.Core} § 11.24.5.4
+     * @see {@link MatterSpecification.v16.Core} § 11.24.5.4
      */
     export enum DatastoreAccessControlEntryPrivilege {
         /**
@@ -2071,11 +1862,6 @@ export declare namespace JointFabricDatastore {
          */
         View = 1,
 
-        /**
-         * @deprecated
-         */
-        ProxyView = 2,
-
         /**
          * View privileges, and can perform the primary function of this Node (except Access Control Cluster)
          */
@@ -2098,7 +1884,7 @@ export declare namespace JointFabricDatastore {
      * fabric-scoped to the Joint Fabric are managed by the Datastore. As a result, references to nodes and groups are
      * specific to the Joint Fabric.
      *
-     * @see {@link MatterSpecification.v151.Core} § 11.24.5.6
+     * @see {@link MatterSpecification.v16.Core} § 11.24.5.6
      */
     export class DatastoreBindingTarget {
         constructor(values?: Partial<DatastoreBindingTarget>);
@@ -2107,7 +1893,7 @@ export declare namespace JointFabricDatastore {
          * This field is the binding's remote target node ID. If the Endpoint field is present, this field shall be
          * present.
          *
-         * @see {@link MatterSpecification.v151.Core} § 11.24.5.6.1
+         * @see {@link MatterSpecification.v16.Core} § 11.24.5.6.1
          */
         node?: NodeId;
 
@@ -2115,7 +1901,7 @@ export declare namespace JointFabricDatastore {
          * This field is the binding's target group ID that represents remote endpoints. If the Endpoint field is
          * present, this field shall NOT be present.
          *
-         * @see {@link MatterSpecification.v151.Core} § 11.24.5.6.2
+         * @see {@link MatterSpecification.v16.Core} § 11.24.5.6.2
          */
         group?: GroupId;
 
@@ -2123,7 +1909,7 @@ export declare namespace JointFabricDatastore {
          * This field is the binding's remote endpoint that the local endpoint is bound to. If the Group field is
          * present, this field shall NOT be present.
          *
-         * @see {@link MatterSpecification.v151.Core} § 11.24.5.6.3
+         * @see {@link MatterSpecification.v16.Core} § 11.24.5.6.3
          */
         endpoint?: EndpointNumber;
 
@@ -2132,13 +1918,13 @@ export declare namespace JointFabricDatastore {
          * is present, the client cluster shall also exist on this endpoint (with this Binding cluster). If this field
          * is present, the target shall be this cluster on the target endpoint(s).
          *
-         * @see {@link MatterSpecification.v151.Core} § 11.24.5.6.4
+         * @see {@link MatterSpecification.v16.Core} § 11.24.5.6.4
          */
         cluster?: ClusterId;
     }
 
     /**
-     * @see {@link MatterSpecification.v151.Core} § 11.24.5.10
+     * @see {@link MatterSpecification.v16.Core} § 11.24.5.10
      */
     export enum DatastoreAccessControlEntryAuthMode {
         /**
@@ -2158,7 +1944,7 @@ export declare namespace JointFabricDatastore {
     }
 
     /**
-     * @see {@link MatterSpecification.v151.Core} § 11.24.5.11
+     * @see {@link MatterSpecification.v16.Core} § 11.24.5.11
      */
     export class DatastoreAccessControlTarget {
         constructor(values?: Partial<DatastoreAccessControlTarget>);
@@ -2173,7 +1959,7 @@ export declare namespace JointFabricDatastore {
      * to the Joint Fabric are managed by the Datastore. As a result, references to nodes and groups are specific to the
      * Joint Fabric.
      *
-     * @see {@link MatterSpecification.v151.Core} § 11.24.5.12
+     * @see {@link MatterSpecification.v16.Core} § 11.24.5.12
      */
     export class DatastoreAccessControlEntry {
         constructor(values?: Partial<DatastoreAccessControlEntry>);
@@ -2184,7 +1970,7 @@ export declare namespace JointFabricDatastore {
     }
 
     /**
-     * @see {@link MatterSpecification.v151.Core} § 11.24.5.16
+     * @see {@link MatterSpecification.v16.Core} § 11.24.5.16
      */
     export enum DatastoreGroupKeySecurityPolicy {
         /**
@@ -2194,7 +1980,7 @@ export declare namespace JointFabricDatastore {
     }
 
     /**
-     * @see {@link MatterSpecification.v151.Core} § 11.24.5.17
+     * @see {@link MatterSpecification.v16.Core} § 11.24.5.17
      */
     export enum DatastoreGroupKeyMulticastPolicy {
         /**