matterbridge 1.6.0 → 1.6.2

package/dist/matterbridgeEndpoint.js

@@ -6,7 +6,7 @@
  * @date 2024-10-01
  * @version 1.0.0
  *
- * Copyright 2024 Luca Liguori.
+ * Copyright 2024, 2025, 2026 Luca Liguori.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,81 +21,124 @@
  * limitations under the License. *
  */
 /* eslint-disable @typescript-eslint/no-unused-vars */
-// New API imports
-import { Endpoint } from '@project-chip/matter.js/endpoint';
-import { MutableEndpoint } from '@project-chip/matter.js/endpoint/type';
-import { SupportedBehaviors } from '@project-chip/matter.js/endpoint/properties';
-import { DescriptorServer } from '@project-chip/matter.js/behavior/definitions/descriptor';
-import { IdentifyServer } from '@project-chip/matter.js/behavior/definitions/identify';
-import { GroupsServer } from '@project-chip/matter.js/behavior/definitions/groups';
-// import { ScenesServer, ScenesBehavior } from '@project-chip/matter.js/behavior/definitions/scenes';
-import { OnOffServer } from '@project-chip/matter.js/behavior/definitions/on-off';
-import { TemperatureMeasurementServer } from '@project-chip/matter.js/behavior/definitions/temperature-measurement';
-import { RelativeHumidityMeasurementServer } from '@project-chip/matter.js/behavior/definitions/relative-humidity-measurement';
-import { PressureMeasurementServer } from '@project-chip/matter.js/behavior/definitions/pressure-measurement';
-import { BridgedDeviceBasicInformationServer } from '@project-chip/matter.js/behavior/definitions/bridged-device-basic-information';
-import { AirQuality, AirQualityCluster, BasicInformationCluster, BooleanState, BooleanStateCluster, BooleanStateConfiguration, BooleanStateConfigurationCluster, BridgedDeviceBasicInformation, BridgedDeviceBasicInformationCluster, CarbonDioxideConcentrationMeasurement, CarbonDioxideConcentrationMeasurementCluster, CarbonMonoxideConcentrationMeasurement, CarbonMonoxideConcentrationMeasurementCluster, ClusterServer, ColorControl, ColorControlCluster, ConcentrationMeasurement, DoorLock, DoorLockCluster, ElectricalEnergyMeasurement, ElectricalEnergyMeasurementCluster, ElectricalPowerMeasurement, ElectricalPowerMeasurementCluster, FanControl, FanControlCluster, FlowMeasurement, FlowMeasurementCluster, FormaldehydeConcentrationMeasurement, FormaldehydeConcentrationMeasurementCluster, Groups, GroupsCluster, GroupsClusterHandler, Identify, IdentifyCluster, IlluminanceMeasurement, IlluminanceMeasurementCluster, LevelControl, LevelControlCluster, MeasurementType, ModeSelectCluster, NitrogenDioxideConcentrationMeasurement, NitrogenDioxideConcentrationMeasurementCluster, OccupancySensing, OccupancySensingCluster, OnOff, OnOffCluster, OzoneConcentrationMeasurement, OzoneConcentrationMeasurementCluster, Pm10ConcentrationMeasurement, Pm10ConcentrationMeasurementCluster, Pm1ConcentrationMeasurement, Pm1ConcentrationMeasurementCluster, Pm25ConcentrationMeasurement, Pm25ConcentrationMeasurementCluster, PowerSource, PowerSourceCluster, PowerSourceConfigurationCluster, PowerTopology, PowerTopologyCluster, PressureMeasurement, PressureMeasurementCluster, RadonConcentrationMeasurement, RadonConcentrationMeasurementCluster, RelativeHumidityMeasurement, RelativeHumidityMeasurementCluster, SmokeCoAlarm, SmokeCoAlarmCluster, Switch, SwitchCluster, TemperatureMeasurement, TemperatureMeasurementCluster, Thermostat, ThermostatCluster, ThreadNetworkDiagnostics, ThreadNetworkDiagnosticsCluster, TimeSynchronization, TimeSynchronizationCluster, TotalVolatileOrganicCompoundsConcentrationMeasurement, TotalVolatileOrganicCompoundsConcentrationMeasurementCluster, WindowCovering, WindowCoveringCluster, getClusterNameById, } from '@project-chip/matter-node.js/cluster';
-import { NamedHandler } from '@project-chip/matter-node.js/util';
-import { EndpointNumber, VendorId } from '@project-chip/matter-node.js/datatype';
-// Matterbridge imports
-import { AnsiLogger, YELLOW, db, debugStringify, er, hk, or, rs, zb } from 'node-ansi-logger';
+// Node.js modules
 import { createHash } from 'crypto';
-import { Specification } from '@project-chip/matter-node.js/model';
-import { LevelControlServer } from '@project-chip/matter.js/behaviors/level-control';
-import { ColorControlServer } from '@project-chip/matter.js/behaviors/color-control';
-import { FlowMeasurementServer } from '@project-chip/matter.js/behaviors/flow-measurement';
-import { DoorLockServer } from '@project-chip/matter.js/behaviors/door-lock';
-import { ThermostatServer } from '@project-chip/matter.js/behaviors/thermostat';
-import { WindowCoveringServer } from '@project-chip/matter.js/behaviors/window-covering';
-import { FanControlServer } from '@project-chip/matter.js/behaviors/fan-control';
-import { TimeSynchronizationServer } from '@project-chip/matter.js/behaviors/time-synchronization';
-import { IlluminanceMeasurementServer } from '@project-chip/matter.js/behaviors/illuminance-measurement';
-import { BooleanStateServer } from '@project-chip/matter.js/behaviors/boolean-state';
-import { BooleanStateConfigurationServer } from '@project-chip/matter.js/behaviors/boolean-state-configuration';
-import { OccupancySensingServer } from '@project-chip/matter.js/behaviors/occupancy-sensing';
+// AnsiLogger module
+import { AnsiLogger, BLUE, CYAN, YELLOW, db, debugStringify, er, hk, or, rs, zb } from 'node-ansi-logger';
+// Matterbridge
+import { MatterbridgeBehavior, MatterbridgeBehaviorDevice, MatterbridgeBooleanStateConfigurationServer, MatterbridgeColorControlServer, MatterbridgeDoorLockServer, MatterbridgeFanControlServer, MatterbridgeIdentifyServer, MatterbridgeLevelControlServer, MatterbridgeOnOffServer, MatterbridgeThermostatServer, MatterbridgeWindowCoveringServer, } from './matterbridgeBehaviors.js';
+import { bridgedNode } from './matterbridgeDeviceTypes.js';
+import { deepCopy, isValidNumber } from './utils/utils.js';
+// @matter
+import { Endpoint, MutableEndpoint, SupportedBehaviors, NamedHandler, Lifecycle } from '@matter/main';
+import { EndpointNumber, VendorId } from '@matter/main';
+import { AirQuality, AirQualityCluster, BasicInformation, BasicInformationCluster, BooleanState, BooleanStateCluster, BooleanStateConfiguration, BooleanStateConfigurationCluster, BridgedDeviceBasicInformation, BridgedDeviceBasicInformationCluster, CarbonDioxideConcentrationMeasurement, CarbonDioxideConcentrationMeasurementCluster, CarbonMonoxideConcentrationMeasurement, CarbonMonoxideConcentrationMeasurementCluster, ColorControl, ColorControlCluster, ConcentrationMeasurement, Descriptor, DoorLock, DoorLockCluster, ElectricalEnergyMeasurement, ElectricalEnergyMeasurementCluster, ElectricalPowerMeasurement, ElectricalPowerMeasurementCluster, FanControl, FanControlCluster, FixedLabel, FixedLabelCluster, FlowMeasurement, FlowMeasurementCluster, FormaldehydeConcentrationMeasurement, FormaldehydeConcentrationMeasurementCluster, Groups, GroupsCluster, Identify, IdentifyCluster, IlluminanceMeasurement, IlluminanceMeasurementCluster, LevelControl, LevelControlCluster, ModeSelect, ModeSelectCluster, NitrogenDioxideConcentrationMeasurement, NitrogenDioxideConcentrationMeasurementCluster, OccupancySensing, OccupancySensingCluster, OnOff, OnOffCluster, OzoneConcentrationMeasurement, OzoneConcentrationMeasurementCluster, Pm10ConcentrationMeasurement, Pm10ConcentrationMeasurementCluster, Pm1ConcentrationMeasurement, Pm1ConcentrationMeasurementCluster, Pm25ConcentrationMeasurement, Pm25ConcentrationMeasurementCluster, PowerSource, PowerSourceCluster, PowerSourceConfigurationCluster, PowerTopology, PowerTopologyCluster, PressureMeasurement, PressureMeasurementCluster, RadonConcentrationMeasurement, RadonConcentrationMeasurementCluster, RelativeHumidityMeasurement, RelativeHumidityMeasurementCluster, SmokeCoAlarm, SmokeCoAlarmCluster, Switch, SwitchCluster, TemperatureMeasurement, TemperatureMeasurementCluster, Thermostat, ThermostatCluster, TotalVolatileOrganicCompoundsConcentrationMeasurement, TotalVolatileOrganicCompoundsConcentrationMeasurementCluster, UserLabel, UserLabelCluster, WindowCovering, WindowCoveringCluster, } from '@matter/main/clusters';
+import { MeasurementType, getClusterNameById } from '@matter/main/types';
+import { Specification } from '@matter/main/model';
+import { DescriptorServer } from '@matter/node/behaviors/descriptor';
+import { IdentifyBehavior } from '@matter/node/behaviors/identify';
+import { GroupsServer } from '@matter/node/behaviors/groups';
+import { TemperatureMeasurementServer } from '@matter/node/behaviors/temperature-measurement';
+import { RelativeHumidityMeasurementServer } from '@matter/node/behaviors/relative-humidity-measurement';
+import { PressureMeasurementServer } from '@matter/node/behaviors/pressure-measurement';
+import { BridgedDeviceBasicInformationServer } from '@matter/node/behaviors/bridged-device-basic-information';
+import { FlowMeasurementServer } from '@matter/node/behaviors/flow-measurement';
+import { IlluminanceMeasurementServer } from '@matter/node/behaviors/illuminance-measurement';
+import { BooleanStateServer } from '@matter/node/behaviors/boolean-state';
+import { OccupancySensingServer } from '@matter/node/behaviors/occupancy-sensing';
+import { AirQualityServer, BasicInformationServer, CarbonDioxideConcentrationMeasurementServer, CarbonMonoxideConcentrationMeasurementServer, ElectricalEnergyMeasurementServer, ElectricalPowerMeasurementServer, FixedLabelServer, FormaldehydeConcentrationMeasurementServer, ModeSelectServer, NitrogenDioxideConcentrationMeasurementServer, OzoneConcentrationMeasurementServer, Pm10ConcentrationMeasurementServer, Pm1ConcentrationMeasurementServer, Pm25ConcentrationMeasurementServer, PowerSourceServer, PowerTopologyServer, RadonConcentrationMeasurementServer, SmokeCoAlarmServer, SwitchServer, TotalVolatileOrganicCompoundsConcentrationMeasurementServer, UserLabelServer, } from '@matter/main/behaviors';
+import { ClusterServer, GroupsClusterHandler } from '@project-chip/matter.js/cluster';
 export class MatterbridgeEndpoint extends Endpoint {
     static bridgeMode = '';
+    static logLevel = "info" /* LogLevel.INFO */;
     log;
-    serialNumber = undefined;
+    plugin = undefined;
     deviceName = undefined;
+    serialNumber = undefined;
     uniqueId = undefined;
+    vendorId = undefined;
+    vendorName = undefined;
+    productId = undefined;
+    productName = undefined;
+    softwareVersion = undefined;
+    softwareVersionString = undefined;
+    hardwareVersion = undefined;
+    hardwareVersionString = undefined;
+    uniqueStorageKey = undefined;
+    tagList = undefined;
     // Maps matter deviceTypes and endpoints
     deviceTypes = new Map();
     clusterServers = new Map();
     clusterClients = new Map();
     commandHandler = new NamedHandler();
     /**
-     * Represents a MatterbridgeEndpoint device.
+     * Represents a MatterbridgeEndpoint.
      * @constructor
-     * @param {DeviceTypeDefinition} definition - The definition of the device.
+     * @param {DeviceTypeDefinition | AtLeastOne<DeviceTypeDefinition>} definition - The DeviceTypeDefinition(s) of the endpoint.
      * @param {EndpointOptions} [options={}] - The options for the device.
      */
-    constructor(definition, options = {}) {
-        // Convert the DeviceTypeDefinition to a EndpointType.Options
+    constructor(definition, options = {}, debug = false) {
+        const { uniqueStorageKey, endpointId, tagList, colorControlFeatures } = options;
+        // Get the first DeviceTypeDefinition
+        let firstDefinition;
+        if (Array.isArray(definition))
+            firstDefinition = definition[0];
+        else
+            firstDefinition = definition;
+        // Convert the first DeviceTypeDefinition to an EndpointType.Options
         const deviceTypeDefinitionV8 = {
-            name: definition.name.replace('-', '_'),
-            deviceType: definition.code,
-            deviceRevision: definition.revision,
-            deviceClass: definition.deviceClass,
+            name: firstDefinition.name.replace('-', '_'),
+            deviceType: firstDefinition.code,
+            deviceRevision: firstDefinition.revision,
+            deviceClass: firstDefinition.deviceClass.toLowerCase(),
             requirements: {
                 server: {
-                    mandatory: SupportedBehaviors(...MatterbridgeEndpoint.getBehaviourTypesFromClusterServerIds(definition.requiredServerClusters)),
-                    optional: SupportedBehaviors(...MatterbridgeEndpoint.getBehaviourTypesFromClusterServerIds(definition.optionalServerClusters)),
+                    mandatory: SupportedBehaviors(...MatterbridgeEndpoint.getBehaviourTypesFromClusterServerIds(firstDefinition.requiredServerClusters)),
+                    optional: SupportedBehaviors(...MatterbridgeEndpoint.getBehaviourTypesFromClusterServerIds(firstDefinition.optionalServerClusters)),
                 },
                 client: {
-                    mandatory: SupportedBehaviors(...MatterbridgeEndpoint.getBehaviourTypesFromClusterClientIds(definition.requiredClientClusters)),
-                    optional: SupportedBehaviors(...MatterbridgeEndpoint.getBehaviourTypesFromClusterClientIds(definition.optionalClientClusters)),
+                    mandatory: SupportedBehaviors(...MatterbridgeEndpoint.getBehaviourTypesFromClusterClientIds(firstDefinition.requiredClientClusters)),
+                    optional: SupportedBehaviors(...MatterbridgeEndpoint.getBehaviourTypesFromClusterClientIds(firstDefinition.optionalClientClusters)),
                 },
             },
-            behaviors: SupportedBehaviors(...MatterbridgeEndpoint.getBehaviourTypesFromClusterServerIds(definition.requiredServerClusters)),
+            behaviors: tagList ? SupportedBehaviors(DescriptorServer.with(Descriptor.Feature.TagList)) : {},
         };
         const endpointV8 = MutableEndpoint(deviceTypeDefinitionV8);
+        // Convert the options to an Endpoint.Options
+        // [{ mfgCode: null, namespaceId: 0x07, tag: 1, label: 'Switch1' }]
+        // endpoint = endpoint.enable({features: { tagList: true }});
         const optionsV8 = {
-            id: options.uniqueStorageKey,
+            // id: uniqueStorageKey,
+            id: uniqueStorageKey?.replace(/[ .]/g, ''),
+            // id: uniqueStorageKey?.replace(/[^a-zA-Z0-9_-]/g, ''),
+            number: endpointId,
+            descriptor: tagList ? { tagList } : undefined,
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
         };
         super(endpointV8, optionsV8);
-        this.log = new AnsiLogger({ logName: 'MatterbridgeDevice', logTimestampFormat: 4 /* TimestampFormat.TIME_MILLIS */, logDebug: true });
-        this.deviceTypes.set(definition.code, definition);
+        this.uniqueStorageKey = uniqueStorageKey;
+        this.tagList = tagList;
+        // Update the endpoint
+        this.log = new AnsiLogger({ logName: 'MatterbridgeEndpoint', logTimestampFormat: 4 /* TimestampFormat.TIME_MILLIS */, logLevel: debug === true ? "debug" /* LogLevel.DEBUG */ : MatterbridgeEndpoint.logLevel });
+        this.log.debug(`${YELLOW}new${db} MatterbridgeEndpoint: ${zb}${'0x' + firstDefinition.code.toString(16).padStart(4, '0')}${db}-${zb}${firstDefinition.name}${db} id: ${CYAN}${this.id}${db}`);
+        this.deviceTypes.set(firstDefinition.code, firstDefinition);
+        // Add the other device types to the descriptor server
+        if (Array.isArray(definition)) {
+            definition.forEach((deviceType) => {
+                this.addDeviceType(deviceType);
+            });
+        }
+        // Add MatterbridgeBehavior with MatterbridgeBehaviorDevice
+        this.behaviors.require(MatterbridgeBehavior, { deviceCommand: new MatterbridgeBehaviorDevice(this.log, this.commandHandler, undefined) });
+    }
+    /**
+     * Loads an instance of the MatterbridgeDevice class.
+     *
+     * @param {DeviceTypeDefinition | AtLeastOne<DeviceTypeDefinition>} definition - The DeviceTypeDefinition(s) of the device.
+     * @returns MatterbridgeDevice instance.
+     */
+    static async loadInstance(definition, options = {}, debug = false) {
+        return new MatterbridgeEndpoint(definition, options, debug);
     }
     static getBehaviourTypesFromClusterServerIds(clusterServerList) {
         // Map Server ClusterId to Behavior.Type
@@ -113,57 +156,97 @@ export class MatterbridgeEndpoint extends Endpoint {
         });
         return behaviorTypes;
     }
-    static getBehaviourTypeFromClusterServerId(clusterId) {
+    static getBehaviourTypeFromClusterServerId(clusterId, type) {
         // Map ClusterId to Behavior.Type
         if (clusterId === Identify.Cluster.id)
-            return IdentifyServer;
+            return MatterbridgeIdentifyServer;
         if (clusterId === Groups.Cluster.id)
             return GroupsServer;
-        // if (clusterId === Scenes.Cluster.id) return ScenesServer;
         if (clusterId === OnOff.Cluster.id)
-            return OnOffServer;
+            return MatterbridgeOnOffServer;
         if (clusterId === LevelControl.Cluster.id)
-            return LevelControlServer;
+            return MatterbridgeLevelControlServer;
         if (clusterId === ColorControl.Cluster.id)
-            return ColorControlServer.with(ColorControl.Feature.HueSaturation, ColorControl.Feature.Xy, ColorControl.Feature.ColorTemperature);
+            return MatterbridgeColorControlServer;
         if (clusterId === DoorLock.Cluster.id)
-            return DoorLockServer;
+            return MatterbridgeDoorLockServer;
         if (clusterId === Thermostat.Cluster.id)
-            return ThermostatServer.with(Thermostat.Feature.Heating, Thermostat.Feature.Cooling, Thermostat.Feature.AutoMode);
-        if (clusterId === TimeSynchronization.Cluster.id)
-            return TimeSynchronizationServer.with(TimeSynchronization.Feature.TimeZone);
+            return MatterbridgeThermostatServer;
         if (clusterId === WindowCovering.Cluster.id)
-            return WindowCoveringServer.with(WindowCovering.Feature.Lift, WindowCovering.Feature.PositionAwareLift);
+            return MatterbridgeWindowCoveringServer;
         if (clusterId === FanControl.Cluster.id)
-            return FanControlServer.with(FanControl.Feature.MultiSpeed, FanControl.Feature.Auto, FanControl.Feature.Step);
+            return MatterbridgeFanControlServer;
+        if (clusterId === Switch.Cluster.id && type === 'MomentarySwitch')
+            return SwitchServer.with('MomentarySwitch', 'MomentarySwitchRelease', 'MomentarySwitchLongPress', 'MomentarySwitchMultiPress');
+        if (clusterId === Switch.Cluster.id && type === 'LatchingSwitch')
+            return SwitchServer.with('LatchingSwitch');
         if (clusterId === TemperatureMeasurement.Cluster.id)
             return TemperatureMeasurementServer;
         if (clusterId === RelativeHumidityMeasurement.Cluster.id)
             return RelativeHumidityMeasurementServer;
         if (clusterId === PressureMeasurement.Cluster.id)
-            return PressureMeasurementServer.with(PressureMeasurement.Feature.Extended);
+            return PressureMeasurementServer;
         if (clusterId === FlowMeasurement.Cluster.id)
             return FlowMeasurementServer;
         if (clusterId === BooleanState.Cluster.id)
             return BooleanStateServer;
         if (clusterId === BooleanStateConfiguration.Cluster.id)
-            return BooleanStateConfigurationServer;
+            return MatterbridgeBooleanStateConfigurationServer;
         if (clusterId === OccupancySensing.Cluster.id)
             return OccupancySensingServer;
         if (clusterId === IlluminanceMeasurement.Cluster.id)
             return IlluminanceMeasurementServer;
+        if (clusterId === SmokeCoAlarm.Cluster.id)
+            return SmokeCoAlarmServer.with(SmokeCoAlarm.Feature.SmokeAlarm, SmokeCoAlarm.Feature.CoAlarm);
+        if (clusterId === AirQuality.Cluster.id)
+            return AirQualityServer.with(AirQuality.Feature.Fair, AirQuality.Feature.Moderate, AirQuality.Feature.VeryPoor, AirQuality.Feature.ExtremelyPoor);
+        if (clusterId === CarbonMonoxideConcentrationMeasurement.Cluster.id)
+            return CarbonMonoxideConcentrationMeasurementServer.with('NumericMeasurement');
+        if (clusterId === CarbonDioxideConcentrationMeasurement.Cluster.id)
+            return CarbonDioxideConcentrationMeasurementServer.with('NumericMeasurement');
+        if (clusterId === NitrogenDioxideConcentrationMeasurement.Cluster.id)
+            return NitrogenDioxideConcentrationMeasurementServer.with('NumericMeasurement');
+        if (clusterId === OzoneConcentrationMeasurement.Cluster.id)
+            return OzoneConcentrationMeasurementServer.with('NumericMeasurement');
+        if (clusterId === FormaldehydeConcentrationMeasurement.Cluster.id)
+            return FormaldehydeConcentrationMeasurementServer.with('NumericMeasurement');
+        if (clusterId === Pm1ConcentrationMeasurement.Cluster.id)
+            return Pm1ConcentrationMeasurementServer.with('NumericMeasurement');
+        if (clusterId === Pm25ConcentrationMeasurement.Cluster.id)
+            return Pm25ConcentrationMeasurementServer.with('NumericMeasurement');
+        if (clusterId === Pm10ConcentrationMeasurement.Cluster.id)
+            return Pm10ConcentrationMeasurementServer.with('NumericMeasurement');
+        if (clusterId === RadonConcentrationMeasurement.Cluster.id)
+            return RadonConcentrationMeasurementServer.with('NumericMeasurement');
+        if (clusterId === TotalVolatileOrganicCompoundsConcentrationMeasurement.Cluster.id)
+            return TotalVolatileOrganicCompoundsConcentrationMeasurementServer.with('NumericMeasurement');
+        if (clusterId === ModeSelect.Cluster.id)
+            return ModeSelectServer;
+        if (clusterId === UserLabel.Cluster.id)
+            return UserLabelServer;
+        if (clusterId === FixedLabel.Cluster.id)
+            return FixedLabelServer;
+        if (clusterId === PowerTopology.Cluster.id)
+            return PowerTopologyServer.with('TreeTopology');
+        if (clusterId === ElectricalPowerMeasurement.Cluster.id)
+            return ElectricalPowerMeasurementServer.with('AlternatingCurrent');
+        if (clusterId === ElectricalEnergyMeasurement.Cluster.id)
+            return ElectricalEnergyMeasurementServer.with('ImportedEnergy', 'ExportedEnergy', 'CumulativeEnergy');
+        if (clusterId === PowerSource.Cluster.id && type === 'WiredPowerSource')
+            return PowerSourceServer.with(PowerSource.Feature.Wired);
+        if (clusterId === PowerSource.Cluster.id && type === 'BatteryReplaceablePowerSource')
+            return PowerSourceServer.with(PowerSource.Feature.Battery, PowerSource.Feature.Replaceable);
+        if (clusterId === PowerSource.Cluster.id && type === 'BatteryRechargeablePowerSource')
+            return PowerSourceServer.with(PowerSource.Feature.Battery, PowerSource.Feature.Rechargeable);
+        if (clusterId === BasicInformation.Cluster.id)
+            return BasicInformationServer;
         if (clusterId === BridgedDeviceBasicInformation.Cluster.id)
             return BridgedDeviceBasicInformationServer;
-        return IdentifyServer;
+        return MatterbridgeIdentifyServer;
     }
-    /**
-     * Loads an instance of the MatterbridgeDevice class.
-     *
-     * @param {DeviceTypeDefinition} definition - The DeviceTypeDefinition of the device.
-     * @returns MatterbridgeDevice instance.
-     */
-    static async loadInstance(definition, options = {}) {
-        return new MatterbridgeEndpoint(definition, options);
+    static getBehaviourTypeFromClusterClientId(clusterId) {
+        // Map ClusterId to Behavior.Type
+        return IdentifyBehavior;
     }
     /**
      * Adds a device type to the list of device types.
@@ -174,16 +257,24 @@ export class MatterbridgeEndpoint extends Endpoint {
     addDeviceType(deviceType) {
         if (!this.deviceTypes.has(deviceType.code)) {
             // Keep the Matterbridge internal map
-            this.log.debug(`addDeviceType: ${zb}${deviceType.code}${db}-${zb}${deviceType.name}${db}`);
+            this.log.debug(`addDeviceType: ${zb}${'0x' + deviceType.code.toString(16).padStart(4, '0')}${db}-${zb}${deviceType.name}${db}`);
             this.deviceTypes.set(deviceType.code, deviceType);
             // Add the device types to the descriptor server
             const deviceTypeList = Array.from(this.deviceTypes.values()).map((dt) => ({
                 deviceType: dt.code,
                 revision: dt.revision,
             }));
-            this.behaviors.require(DescriptorServer, {
-                deviceTypeList,
-            });
+            if (this.tagList) {
+                this.behaviors.require(DescriptorServer.with(Descriptor.Feature.TagList), {
+                    tagList: this.tagList,
+                    deviceTypeList,
+                });
+            }
+            else {
+                this.behaviors.require(DescriptorServer, {
+                    deviceTypeList,
+                });
+            }
         }
     }
     /**
@@ -195,20 +286,64 @@ export class MatterbridgeEndpoint extends Endpoint {
     addDeviceTypeWithClusterServer(deviceTypes, includeServerList) {
         this.log.debug('addDeviceTypeWithClusterServer:');
         deviceTypes.forEach((deviceType) => {
-            this.log.debug(`- with deviceType: ${zb}${deviceType.code}${db}-${zb}${deviceType.name}${db}`);
+            this.log.debug(`- with deviceType: ${zb}${'0x' + deviceType.code.toString(16).padStart(4, '0')}${db}-${zb}${deviceType.name}${db}`);
             deviceType.requiredServerClusters.forEach((clusterId) => {
                 if (!includeServerList.includes(clusterId))
                     includeServerList.push(clusterId);
             });
         });
         includeServerList.forEach((clusterId) => {
-            this.log.debug(`- with cluster: ${hk}${clusterId}${db}-${hk}${getClusterNameById(clusterId)}${db}`);
+            this.log.debug(`- with cluster: ${hk}${'0x' + clusterId.toString(16).padStart(4, '0')}${db}-${hk}${getClusterNameById(clusterId)}${db}`);
         });
         deviceTypes.forEach((deviceType) => {
             this.addDeviceType(deviceType);
         });
         this.addClusterServerFromList(this, includeServerList);
     }
+    /**
+     * Adds the required cluster servers (only if they are not present) for the device types of the specified endpoint.
+     *
+     * @param {MatterbridgeEndpoint} endpoint - The endpoint to add the required cluster servers to.
+     * @returns {MatterbridgeEndpoint} The updated endpoint with the required cluster servers added.
+     */
+    addRequiredClusterServers(endpoint) {
+        const requiredServerList = [];
+        this.log.debug(`addRequiredClusterServer for ${CYAN}${endpoint.id}${db}`);
+        endpoint.getDeviceTypes().forEach((deviceType) => {
+            this.log.debug(`- for deviceType: ${zb}${'0x' + deviceType.code.toString(16).padStart(4, '0')}${db}-${zb}${deviceType.name}${db}`);
+            deviceType.requiredServerClusters.forEach((clusterId) => {
+                if (!requiredServerList.includes(clusterId) && !endpoint.getClusterServerById(clusterId))
+                    requiredServerList.push(clusterId);
+            });
+        });
+        requiredServerList.forEach((clusterId) => {
+            this.log.debug(`- with cluster: ${hk}${'0x' + clusterId.toString(16).padStart(4, '0')}${db}-${hk}${getClusterNameById(clusterId)}${db}`);
+        });
+        this.addClusterServerFromList(endpoint, requiredServerList);
+        return endpoint;
+    }
+    /**
+     * Adds the optional cluster servers (only if they are not present) for the device types of the specified endpoint.
+     *
+     * @param {MatterbridgeEndpoint} endpoint - The endpoint to add the required cluster servers to.
+     * @returns {MatterbridgeEndpoint} The updated endpoint with the required cluster servers added.
+     */
+    addOptionalClusterServers(endpoint) {
+        const optionalServerList = [];
+        this.log.debug(`addRequiredClusterServer for ${CYAN}${endpoint.id}${db}`);
+        endpoint.getDeviceTypes().forEach((deviceType) => {
+            this.log.debug(`- for deviceType: ${zb}${'0x' + deviceType.code.toString(16).padStart(4, '0')}${db}-${zb}${deviceType.name}${db}`);
+            deviceType.optionalServerClusters.forEach((clusterId) => {
+                if (!optionalServerList.includes(clusterId) && !endpoint.getClusterServerById(clusterId))
+                    optionalServerList.push(clusterId);
+            });
+        });
+        optionalServerList.forEach((clusterId) => {
+            this.log.debug(`- with cluster: ${hk}${'0x' + clusterId.toString(16).padStart(4, '0')}${db}-${hk}${getClusterNameById(clusterId)}${db}`);
+        });
+        this.addClusterServerFromList(endpoint, optionalServerList);
+        return endpoint;
+    }
     /**
      * Adds a child endpoint with one or more device types with the required cluster servers and the specified cluster servers.
      * If the child endpoint is not already present in the childEndpoints, it will be added.
@@ -216,30 +351,60 @@ export class MatterbridgeEndpoint extends Endpoint {
      *
      * @param {string} endpointName - The name of the new enpoint to add.
      * @param {AtLeastOne<DeviceTypeDefinition>} deviceTypes - The device types to add.
-     * @param {ClusterId[]} includeServerList - The list of cluster IDs to include.
-     * @returns {Endpoint} - The child endpoint that was found or added.
+     * @param {ClusterId[]} [includeServerList=[]] - The list of cluster IDs to include.
+     * @param {EndpointOptions} [options={}] - The options for the device.
+     * @param {boolean} [debug=false] - Whether to enable debug logging.
+     * @returns {MatterbridgeEndpoint} - The child endpoint that was found or added.
      */
-    addChildDeviceTypeWithClusterServer(endpointName, deviceTypes, includeServerList) {
-        /*
+    addChildDeviceTypeWithClusterServer(endpointName, deviceTypes, includeServerList = [], options = {}, debug = false) {
         this.log.debug(`addChildDeviceTypeWithClusterServer: ${CYAN}${endpointName}${db}`);
-        let child = this.getChildEndpoints().find((endpoint) => endpoint.uniqueStorageKey === endpointName);
+        let child = this.getChildEndpointByName(endpointName);
         if (!child) {
-          child = new Endpoint(deviceTypes, { uniqueStorageKey: endpointName });
-          child.addFixedLabel('endpointName', endpointName);
+            child = new MatterbridgeEndpoint(deviceTypes[0], { uniqueStorageKey: endpointName }, debug);
         }
         deviceTypes.forEach((deviceType) => {
-          this.log.debug(`- with deviceType: ${zb}${deviceType.code}${db}-${zb}${deviceType.name}${db}`);
-          deviceType.requiredServerClusters.forEach((clusterId) => {
-            if (!includeServerList.includes(clusterId)) includeServerList.push(clusterId);
-          });
+            this.log.debug(`- with deviceType: ${zb}${'0x' + deviceType.code.toString(16).padStart(4, '0')}${db}-${zb}${deviceType.name}${db}`);
+            deviceType.requiredServerClusters.forEach((clusterId) => {
+                if (!includeServerList.includes(clusterId))
+                    includeServerList.push(clusterId);
+            });
         });
         includeServerList.forEach((clusterId) => {
-          this.log.debug(`- with cluster: ${hk}${clusterId}${db}-${hk}${getClusterNameById(clusterId)}${db}`);
+            this.log.debug(`- with cluster: ${hk}${'0x' + clusterId.toString(16).padStart(4, '0')}${db}-${hk}${getClusterNameById(clusterId)}${db}`);
         });
         this.addClusterServerFromList(child, includeServerList);
-        this.addChildEndpoint(child);
+        if (this.lifecycle.isInstalled) {
+            this.log.debug(`- with lifecycle installed`);
+            this.add(child);
+        }
+        else {
+            this.log.debug(`- with lifecycle NOT installed`);
+            this.parts.add(child);
+        }
         return child;
-        */
+    }
+    /**
+     * Retrieves a child endpoint by its name.
+     *
+     * @param {string} endpointName - The name of the endpoint to retrieve.
+     * @returns {Endpoint | undefined} The child endpoint with the specified name, or undefined if not found.
+     */
+    getChildEndpointByName(endpointName) {
+        return this.parts.find((part) => part.id === endpointName);
+    }
+    getChildEndpoint(endpointNumber) {
+        return this.parts.find((part) => part.number === endpointNumber);
+    }
+    getChildEndpoints() {
+        return Array.from(this.parts);
+    }
+    getDeviceTypes() {
+        return Array.from(this.deviceTypes.values());
+    }
+    setDeviceTypes(deviceTypes) {
+        deviceTypes.forEach((deviceType) => {
+            this.addDeviceType(deviceType);
+        });
     }
     getClusterServer(cluster) {
         const clusterServer = this.clusterServers.get(cluster.id);
@@ -254,17 +419,28 @@ export class MatterbridgeEndpoint extends Endpoint {
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
         const options = {};
         for (const attribute of Object.values(cluster.attributes)) {
+            // console.error('Attribute:', (attribute as any).id, (attribute as any).name, (attribute as any).value);
             // eslint-disable-next-line @typescript-eslint/no-explicit-any
             if (attribute.id < 0xfff0) {
-                // No issue here for value, as cluster here is just a definition without getter setter
                 // eslint-disable-next-line @typescript-eslint/no-explicit-any
                 options[attribute.name] = attribute.value;
             }
         }
-        this.log.debug(`addClusterServer: ${hk}${cluster.id}${db}-${hk}${getClusterNameById(cluster.id)}${db} with options: ${debugStringify(options)}${rs}`);
-        const behavior = MatterbridgeEndpoint.getBehaviourTypeFromClusterServerId(cluster.id);
-        this.behaviors.require(behavior, options);
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        this.log.debug(`addClusterServer: ${hk}${'0x' + cluster.id.toString(16).padStart(4, '0')}${db}-${hk}${getClusterNameById(cluster.id)}${db} with options: ${debugStringify(options)}${rs}`);
+        let type = undefined;
+        if (cluster.id === SwitchCluster.id && cluster.isEventSupportedByName('multiPressComplete'))
+            type = 'MomentarySwitch';
+        if (cluster.id === SwitchCluster.id && cluster.isEventSupportedByName('switchLatched'))
+            type = 'LatchingSwitch';
+        if (cluster.id === PowerSourceCluster.id && cluster.isAttributeSupportedByName('wiredCurrentType'))
+            type = 'WiredPowerSource';
+        if (cluster.id === PowerSourceCluster.id && cluster.isAttributeSupportedByName('batReplacementDescription'))
+            type = 'BatteryReplaceablePowerSource';
+        if (cluster.id === PowerSourceCluster.id && cluster.isAttributeSupportedByName('batChargeState'))
+            type = 'BatteryRechargeablePowerSource';
+        const behavior = MatterbridgeEndpoint.getBehaviourTypeFromClusterServerId(cluster.id, type);
+        if (cluster.id !== BasicInformationCluster.id)
+            this.behaviors.require(behavior, options);
         this.clusterServers.set(cluster.id, cluster);
     }
     /**
@@ -279,21 +455,18 @@ export class MatterbridgeEndpoint extends Endpoint {
             endpoint.addClusterServer(this.getDefaultIdentifyClusterServer());
         if (includeServerList.includes(Groups.Cluster.id))
             endpoint.addClusterServer(this.getDefaultGroupsClusterServer());
-        // if (includeServerList.includes(Scenes.Cluster.id)) endpoint.addClusterServer(this.getDefaultScenesClusterServer());
         if (includeServerList.includes(OnOff.Cluster.id))
             endpoint.addClusterServer(this.getDefaultOnOffClusterServer());
         if (includeServerList.includes(LevelControl.Cluster.id))
             endpoint.addClusterServer(this.getDefaultLevelControlClusterServer());
         if (includeServerList.includes(ColorControl.Cluster.id))
-            endpoint.addClusterServer(this.getDefaultCompleteColorControlClusterServer());
+            endpoint.addClusterServer(this.getDefaultColorControlClusterServer());
         if (includeServerList.includes(Switch.Cluster.id))
             endpoint.addClusterServer(this.getDefaultSwitchClusterServer());
         if (includeServerList.includes(DoorLock.Cluster.id))
             endpoint.addClusterServer(this.getDefaultDoorLockClusterServer());
         if (includeServerList.includes(Thermostat.Cluster.id))
             endpoint.addClusterServer(this.getDefaultThermostatClusterServer());
-        if (includeServerList.includes(TimeSynchronization.Cluster.id))
-            endpoint.addClusterServer(this.getDefaultTimeSyncClusterServer());
         if (includeServerList.includes(WindowCovering.Cluster.id))
             endpoint.addClusterServer(this.getDefaultWindowCoveringClusterServer());
         if (includeServerList.includes(FanControl.Cluster.id))
@@ -349,20 +522,38 @@ export class MatterbridgeEndpoint extends Endpoint {
         // if (includeServerList.includes(DeviceEnergyManagement.Cluster.id)) endpoint.addClusterServer(this.getDefaultDeviceEnergyManagementClusterServer());
         // if (includeServerList.includes(DeviceEnergyManagementMode.Cluster.id)) endpoint.addClusterServer(this.getDefaultDeviceEnergyManagementModeClusterServer());
     }
-    /**
-     * From here copy paste from MatterbridgeDevice
-     */
-    /**
-     * Retrieves a child endpoint by its name.
-     *
-     * @param {string} endpointName - The name of the endpoint to retrieve.
-     * @returns {Endpoint | undefined} The child endpoint with the specified name, or undefined if not found.
-     */
-    /*
-    getChildEndpointByName(endpointName: string): Endpoint | undefined {
-      return this.getChildEndpoints().find((endpoint) => endpoint.uniqueStorageKey === endpointName);
+    async addFixedLabel(label, value) {
+        if (!this.clusterServers.get(FixedLabelCluster.id)) {
+            this.addClusterServer(ClusterServer(FixedLabelCluster, {
+                labelList: [{ label, value }],
+            }, {}));
+            return;
+        }
+        const labelList = (this.getAttribute(FixedLabelCluster.id, 'labelList', this.log) ?? []).filter((entryLabel) => entryLabel.label !== label);
+        labelList.push({ label, value });
+        await this.setAttribute(FixedLabelCluster.id, 'labelList', labelList, this.log);
+    }
+    async addUserLabel(label, value) {
+        if (!this.clusterServers.get(UserLabelCluster.id)) {
+            this.addClusterServer(ClusterServer(UserLabelCluster, {
+                labelList: [{ label, value }],
+            }, {}));
+            return;
+        }
+        const labelList = (this.getAttribute(UserLabelCluster.id, 'labelList', this.log) ?? []).filter((entryLabel) => entryLabel.label !== label);
+        labelList.push({ label, value });
+        await this.setAttribute(UserLabelCluster.id, 'labelList', labelList, this.log);
+    }
+    capitalizeFirstLetter(name) {
+        if (!name)
+            return name;
+        return name.charAt(0).toUpperCase() + name.slice(1);
+    }
+    lowercaseFirstLetter(name) {
+        if (!name)
+            return name;
+        return name.charAt(0).toLowerCase() + name.slice(1);
     }
-    */
     /**
      * Retrieves the value of the specified attribute from the given endpoint and cluster.
      *
@@ -372,33 +563,30 @@ export class MatterbridgeEndpoint extends Endpoint {
      * @param {Endpoint} [endpoint] - Optional the child endpoint to retrieve the attribute from.
      * @returns {any} The value of the attribute, or undefined if the attribute is not found.
      */
-    /*
-    getAttribute(clusterId: ClusterId, attribute: string, log?: AnsiLogger, endpoint?: Endpoint): any {
-      if (!endpoint) endpoint = this as Endpoint;
-  
-      const clusterServer = endpoint.getClusterServerById(clusterId);
-      if (!clusterServer) {
-        log?.error(`getAttribute error: Cluster ${clusterId} not found on endpoint ${endpoint.name}:${endpoint.number}`);
-        return undefined;
-      }
-      const capitalizedAttributeName = attribute.charAt(0).toUpperCase() + attribute.slice(1);
-      if (!clusterServer.isAttributeSupportedByName(attribute) && !clusterServer.isAttributeSupportedByName(capitalizedAttributeName)) {
-        if (log) log.error(`getAttribute error: Attribute ${attribute} not found on Cluster ${clusterServer.name} on endpoint ${endpoint.name}:${endpoint.number}`);
-        return undefined;
-      }
-      // Find the getter method
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      if (!(clusterServer as any)[`get${capitalizedAttributeName}Attribute`]) {
-        log?.error(`getAttribute error: Getter get${capitalizedAttributeName}Attribute not found on Cluster ${clusterServer.name} on endpoint ${endpoint.name}:${endpoint.number}`);
-        return undefined;
-      }
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-empty-object-type
-      const getter = (clusterServer as any)[`get${capitalizedAttributeName}Attribute`] as () => {};
-      const value = getter();
-      log?.info(`${db}Get endpoint ${or}${endpoint.name}:${endpoint.number}${db} attribute ${hk}${clusterServer.name}.${capitalizedAttributeName}${db} value ${YELLOW}${typeof value === 'object' ? debugStringify(value) : value}${db}`);
-      return value;
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    getAttribute(clusterId, attribute, log, endpoint) {
+        if (!endpoint)
+            endpoint = this;
+        const clusterName = this.lowercaseFirstLetter(getClusterNameById(clusterId));
+        if (endpoint.construction.status !== Lifecycle.Status.Active) {
+            log?.error(`getAttribute ${hk}${clusterName}.${attribute}${er} error: Endpoint ${or}${endpoint.id}${er} is in the ${BLUE}${endpoint.construction.status}${er} state`);
+            return undefined;
+        }
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        const state = endpoint.state;
+        if (!(clusterName in state)) {
+            log?.error(`getAttribute error: Cluster ${'0x' + clusterId.toString(16).padStart(4, '0')}:${clusterName} not found on endpoint ${or}${endpoint.id}${er}:${or}${endpoint.number}${er}`);
+            return undefined;
+        }
+        attribute = this.lowercaseFirstLetter(attribute);
+        if (!(attribute in state[clusterName])) {
+            log?.error(`getAttribute error: Attribute ${hk}${attribute}${er} not found on Cluster ${'0x' + clusterId.toString(16).padStart(4, '0')}:${clusterName} on endpoint ${or}${endpoint.id}${er}:${or}${endpoint.number}${er}`);
+            return undefined;
+        }
+        const value = state[clusterName][attribute];
+        log?.info(`${db}Get endpoint ${or}${endpoint.id}${db}:${or}${endpoint.number}${db} attribute ${hk}${this.capitalizeFirstLetter(clusterName)}${db}.${hk}${attribute}${db} value ${YELLOW}${typeof value === 'object' ? debugStringify(value) : value}${db}`);
+        return value;
     }
-    */
     /**
      * Sets the value of an attribute on a cluster server endpoint.
      *
@@ -408,46 +596,36 @@ export class MatterbridgeEndpoint extends Endpoint {
      * @param {AnsiLogger} [log] - (Optional) The logger to use for logging errors and information.
      * @param {Endpoint} [endpoint] - (Optional) The endpoint to set the attribute on. If not provided, the attribute will be set on the current endpoint.
      */
-    /*
-    setAttribute(clusterId: ClusterId, attribute: string, value: any, log?: AnsiLogger, endpoint?: Endpoint): boolean {
-      if (!endpoint) endpoint = this as Endpoint;
-  
-      const clusterServer = endpoint.getClusterServerById(clusterId);
-      if (!clusterServer) {
-        log?.error(`setAttribute error: Cluster ${clusterId} not found on endpoint ${endpoint.name}:${endpoint.number}`);
-        return false;
-      }
-      const capitalizedAttributeName = attribute.charAt(0).toUpperCase() + attribute.slice(1);
-      if (!clusterServer.isAttributeSupportedByName(attribute) && !clusterServer.isAttributeSupportedByName(capitalizedAttributeName)) {
-        if (log) log.error(`setAttribute error: Attribute ${attribute} not found on Cluster ${clusterId} on endpoint ${endpoint.name}:${endpoint.number}`);
-        return false;
-      }
-      // Find the getter method
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      if (!(clusterServer as any)[`get${capitalizedAttributeName}Attribute`]) {
-        log?.error(`setAttribute error: Getter get${capitalizedAttributeName}Attribute not found on Cluster ${clusterServer.name} on endpoint ${endpoint.name}:${endpoint.number}`);
-        return false;
-      }
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-empty-object-type
-      const getter = (clusterServer as any)[`get${capitalizedAttributeName}Attribute`] as () => {};
-      // Find the setter method
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      if (!(clusterServer as any)[`set${capitalizedAttributeName}Attribute`]) {
-        log?.error(`setAttribute error: Setter set${capitalizedAttributeName}Attribute not found on Cluster ${clusterServer.name} on endpoint ${endpoint.name}:${endpoint.number}`);
-        return false;
-      }
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-empty-object-type
-      const setter = (clusterServer as any)[`set${capitalizedAttributeName}Attribute`] as (value: any) => {};
-      const oldValue = getter();
-      setter(value);
-      log?.info(
-        `${db}Set endpoint ${or}${endpoint.name}:${endpoint.number}${db} attribute ${hk}${clusterServer.name}.${capitalizedAttributeName}${db} ` +
-          `from ${YELLOW}${typeof oldValue === 'object' ? debugStringify(oldValue) : oldValue}${db} ` +
-          `to ${YELLOW}${typeof value === 'object' ? debugStringify(value) : value}${db}`,
-      );
-      return true;
-    }
-    */
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    async setAttribute(clusterId, attribute, value, log, endpoint) {
+        if (!endpoint)
+            endpoint = this;
+        const clusterName = this.lowercaseFirstLetter(getClusterNameById(clusterId));
+        if (endpoint.construction.status !== Lifecycle.Status.Active) {
+            log?.error(`setAttribute ${hk}${clusterName}.${attribute}${er} error: Endpoint ${or}${endpoint.id}${er} is in the ${BLUE}${endpoint.construction.status}${er} state`);
+            return false;
+        }
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        const state = endpoint.state;
+        if (!(clusterName in state)) {
+            log?.error(`setAttribute ${hk}${attribute}${er} error: Cluster ${'0x' + clusterId.toString(16).padStart(4, '0')}:${clusterName} not found on endpoint ${or}${endpoint.id}${er}:${or}${endpoint.number}${er}`);
+            return false;
+        }
+        attribute = this.lowercaseFirstLetter(attribute);
+        if (!(attribute in state[clusterName])) {
+            log?.error(`setAttribute error: Attribute ${hk}${attribute}${er} not found on Cluster ${'0x' + clusterId.toString(16).padStart(4, '0')}:${clusterName} on endpoint ${or}${endpoint.id}${er}:${or}${endpoint.number}${er}`);
+            return false;
+        }
+        let oldValue = state[clusterName][attribute];
+        if (typeof oldValue === 'object')
+            oldValue = deepCopy(oldValue);
+        await endpoint.setStateOf(endpoint.behaviors.supported[clusterName], { [attribute]: value });
+        // await endpoint.set({ [clusterName]: { [attribute]: value } });
+        log?.info(`${db}Set endpoint ${or}${endpoint.id}${db}:${or}${endpoint.number}${db} attribute ${hk}${this.capitalizeFirstLetter(clusterName)}${db}.${hk}${attribute}${db} ` +
+            `from ${YELLOW}${typeof oldValue === 'object' ? debugStringify(oldValue) : oldValue}${db} ` +
+            `to ${YELLOW}${typeof value === 'object' ? debugStringify(value) : value}${db}`);
+        return true;
+    }
     /**
      * Subscribes to an attribute on a cluster.
      *
@@ -458,58 +636,50 @@ export class MatterbridgeEndpoint extends Endpoint {
      * @param {Endpoint} endpoint - (Optional) The endpoint to subscribe the attribute on. If not provided, the current endpoint will be used.
      * @returns A boolean indicating whether the subscription was successful.
      */
-    /*
-    subscribeAttribute(clusterId: ClusterId, attribute: string, listener: (newValue: any, oldValue: any) => void, log?: AnsiLogger, endpoint?: Endpoint): boolean {
-      if (!endpoint) endpoint = this as Endpoint;
-  
-      const clusterServer = endpoint.getClusterServerById(clusterId);
-      if (!clusterServer) {
-        log?.error(`subscribeAttribute error: Cluster ${clusterId} not found on endpoint ${endpoint.name}:${endpoint.number}`);
-        return false;
-      }
-      const capitalizedAttributeName = attribute.charAt(0).toUpperCase() + attribute.slice(1);
-      if (!clusterServer.isAttributeSupportedByName(attribute) && !clusterServer.isAttributeSupportedByName(capitalizedAttributeName)) {
-        if (log) log.error(`subscribeAttribute error: Attribute ${attribute} not found on Cluster ${clusterServer.name} on endpoint ${endpoint.name}:${endpoint.number}`);
-        return false;
-      }
-      // Find the subscribe method
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      if (!(clusterServer as any)[`subscribe${capitalizedAttributeName}Attribute`]) {
-        log?.error(`subscribeAttribute error: subscribe${capitalizedAttributeName}Attribute not found on Cluster ${clusterServer.name} on endpoint ${endpoint.name}:${endpoint.number}`);
-        return false;
-      }
-      // Subscribe to the attribute
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-empty-object-type
-      const subscribe = (clusterServer as any)[`subscribe${capitalizedAttributeName}Attribute`] as (listener: (newValue: any, oldValue: any) => void) => {};
-      subscribe(listener);
-      log?.info(`${db}Subscribe endpoint ${or}${endpoint.name}:${endpoint.number}${db} attribute ${hk}${clusterServer.name}.${capitalizedAttributeName}${db}`);
-      return true;
-    }
-    */
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    addCommandHandler(clusterId, command, handler) {
-        const clusterServer = this.getClusterServerById(clusterId);
-        if (!clusterServer) {
-            this.log.error(`addCommandHandler error: Cluster ${clusterId} not found on endpoint ${this.id}:${this.number}`);
+    subscribeAttribute(clusterId, attribute, listener, log, endpoint) {
+        if (!endpoint)
+            endpoint = this;
+        const clusterName = this.lowercaseFirstLetter(getClusterNameById(clusterId));
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        const events = endpoint.events;
+        if (!(clusterName in events)) {
+            log?.error(`subscribeAttribute ${hk}${attribute}${er} error: Cluster ${'0x' + clusterId.toString(16).padStart(4, '0')}:${clusterName} not found on endpoint ${or}${endpoint.id}${er}:${or}${endpoint.number}${er}`);
+            return false;
+        }
+        attribute = this.lowercaseFirstLetter(attribute) + '$Changed';
+        if (!(attribute in events[clusterName])) {
+            log?.error(`subscribeAttribute error: Attribute ${hk}${attribute}${er} not found on Cluster ${'0x' + clusterId.toString(16).padStart(4, '0')}:${clusterName} on endpoint ${or}${endpoint.id}${er}:${or}${endpoint.number}${er}`);
             return false;
         }
-        if (!clusterServer.isCommandSupportedByName(command)) {
-            this.log.error(`addCommandHandler error: Command ${command} not found on Cluster ${clusterServer.name} on endpoint ${this.id}:${this.number}`);
+        events[clusterName][attribute].on(listener);
+        log?.info(`${db}Subscribe endpoint ${or}${endpoint.id}${db}:${or}${endpoint.number}${db} attribute ${hk}${this.capitalizeFirstLetter(clusterName)}${db}.${hk}${attribute}${db}`);
+        return true;
+    }
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    async triggerEvent(clusterId, event, payload, log, endpoint) {
+        if (!endpoint)
+            endpoint = this;
+        const clusterName = this.lowercaseFirstLetter(getClusterNameById(clusterId));
+        if (endpoint.construction.status !== Lifecycle.Status.Active) {
+            log?.error(`triggerEvent ${hk}${clusterName}.${event}${er} error: Endpoint ${or}${endpoint.id}${er} is in the ${BLUE}${endpoint.construction.status}${er} state`);
             return false;
         }
-        // Find the command
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        const commands = clusterServer.commands;
-        for (const [key, value] of Object.entries(commands)) {
-            // console.log(`Key "${key}": ${debugStringify(value)}`);
-            if (key === command) {
-                value.handler = handler;
-                this.log.info(`${db}Command handler added for endpoint ${or}${this.id}:${this.number}${db} ${hk}${clusterServer.name}.${command}${db}`);
-                return true;
-            }
+        const events = endpoint.events;
+        if (!(clusterName in events) || !(event in events[clusterName])) {
+            log?.error(`triggerEvent ${hk}${event}${er} error: Cluster ${'0x' + clusterId.toString(16).padStart(4, '0')}:${clusterName} not found on endpoint ${or}${endpoint.id}${er}:${or}${endpoint.number}${er}`);
+            return false;
         }
-        this.log.error(`Command handler not found for endpoint ${or}${this.id}:${this.number}${er} ${hk}${clusterServer.name}.${command}${er}`);
-        return false;
+        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+        // @ts-ignore
+        await endpoint.act((agent) => agent[clusterName].events[event].emit(payload, agent.context));
+        log?.info(`${db}Trigger event ${hk}${this.capitalizeFirstLetter(clusterName)}${db}.${hk}${event}${db} with ${debugStringify(payload)}${db} on endpoint ${or}${endpoint.id}${db}:${or}${endpoint.number}${db} `);
+        return true;
+    }
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    addCommandHandler(command, handler) {
+        this.commandHandler.addHandler(command, handler);
     }
     /**
      * Serializes the Matterbridge device into a serialized object.
@@ -517,64 +687,69 @@ export class MatterbridgeEndpoint extends Endpoint {
      * @param pluginName - The name of the plugin.
      * @returns The serialized Matterbridge device object.
      */
-    /*
-    serialize(): SerializedMatterbridgeDevice | undefined {
-      if (!this.serialNumber || !this.deviceName || !this.uniqueId) return;
-      const cluster = this.getClusterServer(BasicInformationCluster) ?? this.getClusterServer(BridgedDeviceBasicInformationCluster);
-      if (!cluster) return;
-      const serialized: SerializedMatterbridgeDevice = {
-        pluginName: this.plugin ?? 'Unknown',
-        serialNumber: this.serialNumber,
-        deviceName: this.deviceName,
-        uniqueId: this.uniqueId,
-        productName: cluster.attributes.productName?.getLocal(),
-        vendorId: cluster.attributes.vendorId?.getLocal(),
-        vendorName: cluster.attributes.vendorName?.getLocal(),
-        deviceTypes: this.getDeviceTypes(),
-        endpoint: this.number,
-        endpointName: this.name,
-        clusterServersId: [],
-      };
-      this.getAllClusterServers().forEach((clusterServer) => {
-        serialized.clusterServersId.push(clusterServer.id);
-      });
-      return serialized;
-    }
-    */
+    serialize() {
+        return undefined;
+        /*
+        if (!this.serialNumber || !this.deviceName || !this.uniqueId) return;
+        const cluster = this.getClusterServer(BasicInformationCluster) ?? this.getClusterServer(BridgedDeviceBasicInformationCluster);
+        if (!cluster) return;
+        const serialized: SerializedMatterbridgeDevice = {
+          pluginName: this.plugin ?? 'Unknown',
+          serialNumber: this.serialNumber,
+          deviceName: this.deviceName,
+          uniqueId: this.uniqueId,
+          productName: cluster.attributes.productName?.getLocal(),
+          vendorId: cluster.attributes.vendorId?.getLocal(),
+          vendorName: cluster.attributes.vendorName?.getLocal(),
+          deviceTypes: Array.from(this.deviceTypes.values()),
+          endpoint: this.number,
+          endpointName: this.id,
+          clusterServersId: [],
+        };
+        this.getAllClusterServers().forEach((clusterServer) => {
+          serialized.clusterServersId.push(clusterServer.id);
+        });
+        return serialized;
+        */
+    }
     /**
      * Deserializes the device into a serialized object.
      *
      * @returns The deserialized MatterbridgeDevice.
      */
-    /*
-    static deserialize(serializedDevice: SerializedMatterbridgeDevice): MatterbridgeDevice {
-      const device = new MatterbridgeDevice(serializedDevice.deviceTypes);
-      device.serialNumber = serializedDevice.serialNumber;
-      device.deviceName = serializedDevice.deviceName;
-      device.uniqueId = serializedDevice.uniqueId;
-      for (const clusterId of serializedDevice.clusterServersId) {
-        if (clusterId === BasicInformationCluster.id)
-          device.createDefaultBasicInformationClusterServer(
-            serializedDevice.deviceName,
-            serializedDevice.serialNumber,
-            serializedDevice.vendorId ?? 0xfff1,
-            serializedDevice.vendorName ?? 'Matterbridge',
-            serializedDevice.productId ?? 0x8000,
-            serializedDevice.productName ?? 'Matterbridge device',
-          );
-        else if (clusterId === BridgedDeviceBasicInformationCluster.id)
-          device.createDefaultBridgedDeviceBasicInformationClusterServer(
-            serializedDevice.deviceName,
-            serializedDevice.serialNumber,
-            serializedDevice.vendorId ?? 0xfff1,
-            serializedDevice.vendorName ?? 'Matterbridge',
-            serializedDevice.productName ?? 'Matterbridge device',
-          );
-        else device.addClusterServerFromList(device, [clusterId]);
-      }
-      return device;
-    }
-    */
+    static deserialize(serializedDevice) {
+        return undefined;
+        /*
+        const device = new MatterbridgeDevice(serializedDevice.deviceTypes);
+        device.serialNumber = serializedDevice.serialNumber;
+        device.deviceName = serializedDevice.deviceName;
+        device.uniqueId = serializedDevice.uniqueId;
+        for (const clusterId of serializedDevice.clusterServersId) {
+          if (clusterId === BasicInformationCluster.id)
+            device.createDefaultBasicInformationClusterServer(
+              serializedDevice.deviceName,
+              serializedDevice.serialNumber,
+              serializedDevice.vendorId ?? 0xfff1,
+              serializedDevice.vendorName ?? 'Matterbridge',
+              serializedDevice.productId ?? 0x8000,
+              serializedDevice.productName ?? 'Matterbridge device',
+            );
+          else if (clusterId === BridgedDeviceBasicInformationCluster.id)
+            device.createDefaultBridgedDeviceBasicInformationClusterServer(
+              serializedDevice.deviceName,
+              serializedDevice.serialNumber,
+              serializedDevice.vendorId ?? 0xfff1,
+              serializedDevice.vendorName ?? 'Matterbridge',
+              serializedDevice.productName ?? 'Matterbridge device',
+            );
+          else device.addClusterServerFromList(device, [clusterId]);
+        }
+        return device;
+        */
+    }
+    /**
+     * From here copy paste from MatterbridgeDevice
+     */
     /**
      * Get a default IdentifyCluster server.
      */
@@ -676,6 +851,18 @@ export class MatterbridgeEndpoint extends Endpoint {
      * @param hardwareVersionString - The hardware version string of the device. Default is 'v.1.0.0'.
      */
     getDefaultBasicInformationClusterServer(deviceName, serialNumber, vendorId, vendorName, productId, productName, softwareVersion = 1, softwareVersionString = '1.0.0', hardwareVersion = 1, hardwareVersionString = '1.0.0') {
+        this.log.logName = deviceName;
+        this.deviceName = deviceName;
+        this.serialNumber = serialNumber;
+        this.uniqueId = this.createUniqueId(deviceName, serialNumber, vendorName, productName);
+        this.productId = productId;
+        this.productName = productName;
+        this.vendorId = vendorId;
+        this.vendorName = vendorName;
+        this.softwareVersion = softwareVersion;
+        this.softwareVersionString = softwareVersionString;
+        this.hardwareVersion = hardwareVersion;
+        this.hardwareVersionString = hardwareVersionString;
         return ClusterServer(BasicInformationCluster, {
             dataModelRevision: 1,
             location: 'XX',
@@ -717,10 +904,8 @@ export class MatterbridgeEndpoint extends Endpoint {
      * @param hardwareVersionString - The hardware version string of the device. Default is 'v.1.0.0'.
      */
     createDefaultBasicInformationClusterServer(deviceName, serialNumber, vendorId, vendorName, productId, productName, softwareVersion = 1, softwareVersionString = '1.0.0', hardwareVersion = 1, hardwareVersionString = '1.0.0') {
-        this.deviceName = deviceName;
-        this.serialNumber = serialNumber;
-        this.uniqueId = this.createUniqueId(deviceName, serialNumber, vendorName, productName);
         if (MatterbridgeEndpoint.bridgeMode === 'bridge') {
+            this.addDeviceType(bridgedNode);
             this.createDefaultBridgedDeviceBasicInformationClusterServer(deviceName, serialNumber, vendorId, vendorName, productName, softwareVersion, softwareVersionString, hardwareVersion, hardwareVersionString);
             return;
         }
@@ -740,6 +925,18 @@ export class MatterbridgeEndpoint extends Endpoint {
      * @param hardwareVersionString - The hardware version string of the device. Default is 'v.1.0.0'.
      */
     getDefaultBridgedDeviceBasicInformationClusterServer(deviceName, serialNumber, vendorId, vendorName, productName, softwareVersion = 1, softwareVersionString = '1.0.0', hardwareVersion = 1, hardwareVersionString = '1.0.0') {
+        this.log.logName = deviceName;
+        this.deviceName = deviceName;
+        this.serialNumber = serialNumber;
+        this.uniqueId = this.createUniqueId(deviceName, serialNumber, vendorName, productName);
+        this.productId = undefined;
+        this.productName = productName;
+        this.vendorId = vendorId;
+        this.vendorName = vendorName;
+        this.softwareVersion = softwareVersion;
+        this.softwareVersionString = softwareVersionString;
+        this.hardwareVersion = hardwareVersion;
+        this.hardwareVersionString = hardwareVersionString;
         return ClusterServer(BridgedDeviceBasicInformationCluster, {
             vendorId: vendorId !== undefined ? VendorId(vendorId) : undefined, // 4874
             vendorName: vendorName.slice(0, 32),
@@ -774,9 +971,6 @@ export class MatterbridgeEndpoint extends Endpoint {
      * @param hardwareVersionString - The hardware version string of the device. Default is 'v.1.0.0'.
      */
     createDefaultBridgedDeviceBasicInformationClusterServer(deviceName, serialNumber, vendorId, vendorName, productName, softwareVersion = 1, softwareVersionString = '1.0.0', hardwareVersion = 1, hardwareVersionString = '1.0.0') {
-        this.deviceName = deviceName;
-        this.serialNumber = serialNumber;
-        this.uniqueId = this.createUniqueId(deviceName, serialNumber, vendorName, productName);
         this.addClusterServer(this.getDefaultBridgedDeviceBasicInformationClusterServer(deviceName, serialNumber, vendorId, vendorName, productName, softwareVersion, softwareVersionString, hardwareVersion, hardwareVersionString));
     }
     /**
@@ -821,7 +1015,7 @@ export class MatterbridgeEndpoint extends Endpoint {
     getDefaultElectricalPowerMeasurementClusterServer(voltage = null, current = null, power = null, frequency = null) {
         return ClusterServer(ElectricalPowerMeasurementCluster.with(ElectricalPowerMeasurement.Feature.AlternatingCurrent), {
             powerMode: ElectricalPowerMeasurement.PowerMode.Ac,
-            numberOfMeasurementTypes: 3,
+            numberOfMeasurementTypes: 4,
             accuracy: [
                 {
                     measurementType: MeasurementType.Voltage,
@@ -858,42 +1052,6 @@ export class MatterbridgeEndpoint extends Endpoint {
             frequency: frequency,
         }, {}, {});
     }
-    /**
-     * Creates a default Dummy Thread Network Diagnostics Cluster server.
-     * @deprecated This method is deprecated and is only used for testing.
-     *
-     * @remarks
-     * This method adds a cluster server used only to give the networkName to Eve app.
-     *
-     * @returns void
-     */
-    createDefaultDummyThreadNetworkDiagnosticsClusterServer() {
-        this.addClusterServer(ClusterServer(ThreadNetworkDiagnosticsCluster.with(ThreadNetworkDiagnostics.Feature.PacketCounts, ThreadNetworkDiagnostics.Feature.ErrorCounts), {
-            channel: 1,
-            routingRole: ThreadNetworkDiagnostics.RoutingRole.Router,
-            networkName: 'MyMatterThread',
-            panId: 0,
-            extendedPanId: 0,
-            meshLocalPrefix: null,
-            neighborTable: [],
-            routeTable: [],
-            partitionId: null,
-            weighting: null,
-            dataVersion: null,
-            stableDataVersion: null,
-            leaderRouterId: null,
-            securityPolicy: null,
-            channelPage0Mask: null,
-            operationalDatasetComponents: null,
-            overrunCount: 0,
-            activeNetworkFaultsList: [],
-        }, {
-            resetCounts: async (data) => {
-                this.log.debug('Matter command: resetCounts');
-                await this.commandHandler.executeHandler('resetCounts', data);
-            },
-        }, {}));
-    }
     /**
      * Get a default OnOff cluster server.
      *
@@ -921,6 +1079,7 @@ export class MatterbridgeEndpoint extends Endpoint {
      * Creates a default OnOff cluster server.
      *
      * @param onOff - The initial state of the OnOff cluster (default: false).
+     * @returns {void}
      */
     createDefaultOnOffClusterServer(onOff = false) {
         this.addClusterServer(this.getDefaultOnOffClusterServer(onOff));
@@ -928,12 +1087,17 @@ export class MatterbridgeEndpoint extends Endpoint {
     /**
      * Get a default level control cluster server.
      *
-     * @param currentLevel - The current level (default: 0).
+     * @param currentLevel - The current level (default: 254).
+     * @param minLevel - The minimum level (default: 1).
+     * @param maxLevel - The maximum level (default: 254).
+     * @param onLevel - The on level (default: null).
      */
-    getDefaultLevelControlClusterServer(currentLevel = 0) {
+    getDefaultLevelControlClusterServer(currentLevel = 254, minLevel = 1, maxLevel = 254, onLevel = null) {
         return ClusterServer(LevelControlCluster.with(LevelControl.Feature.OnOff), {
             currentLevel,
-            onLevel: 0,
+            minLevel,
+            maxLevel,
+            onLevel,
             options: {
                 executeIfOff: false,
                 coupleColorTempToLevel: false,
@@ -970,10 +1134,13 @@ export class MatterbridgeEndpoint extends Endpoint {
     /**
      * Creates a default level control cluster server.
      *
-     * @param currentLevel - The current level (default: 0).
+     * @param currentLevel - The current level (default: 254).
+     * @param minLevel - The minimum level (default: 1).
+     * @param maxLevel - The maximum level (default: 254).
+     * @param onLevel - The on level (default: null).
      */
-    createDefaultLevelControlClusterServer(currentLevel = 0) {
-        this.addClusterServer(this.getDefaultLevelControlClusterServer(currentLevel));
+    createDefaultLevelControlClusterServer(currentLevel = 254, minLevel = 1, maxLevel = 254, onLevel = null) {
+        this.addClusterServer(this.getDefaultLevelControlClusterServer(currentLevel, minLevel, maxLevel, onLevel));
     }
     /**
      * Get a default color control cluster server.
@@ -986,7 +1153,7 @@ export class MatterbridgeEndpoint extends Endpoint {
      * @param colorTempPhysicalMinMireds - The physical minimum color temperature in mireds.
      * @param colorTempPhysicalMaxMireds - The physical maximum color temperature in mireds.
      */
-    getDefaultCompleteColorControlClusterServer(currentX = 0, currentY = 0, currentHue = 0, currentSaturation = 0, colorTemperatureMireds = 500, colorTempPhysicalMinMireds = 147, colorTempPhysicalMaxMireds = 500) {
+    getDefaultColorControlClusterServer(currentX = 0, currentY = 0, currentHue = 0, currentSaturation = 0, colorTemperatureMireds = 500, colorTempPhysicalMinMireds = 147, colorTempPhysicalMaxMireds = 500) {
         return ClusterServer(ColorControlCluster.with(ColorControl.Feature.Xy, ColorControl.Feature.HueSaturation, ColorControl.Feature.ColorTemperature), {
             colorMode: ColorControl.ColorMode.CurrentHueAndCurrentSaturation,
             enhancedColorMode: ColorControl.EnhancedColorMode.CurrentHueAndCurrentSaturation,
@@ -1002,6 +1169,8 @@ export class MatterbridgeEndpoint extends Endpoint {
             colorTemperatureMireds,
             colorTempPhysicalMinMireds,
             colorTempPhysicalMaxMireds,
+            coupleColorTempToLevelMinMireds: colorTempPhysicalMinMireds,
+            startUpColorTemperatureMireds: null,
         }, {
             moveToColor: async (data) => {
                 this.log.debug('Matter command: moveToColor request:', data.request, 'attributes.currentX:', data.attributes.currentX.getLocal(), 'attributes.currentY:', data.attributes.currentY.getLocal());
@@ -1063,14 +1232,15 @@ export class MatterbridgeEndpoint extends Endpoint {
      * @param colorTempPhysicalMinMireds - The physical minimum color temperature in mireds.
      * @param colorTempPhysicalMaxMireds - The physical maximum color temperature in mireds.
      */
-    createDefaultCompleteColorControlClusterServer(currentX = 0, currentY = 0, currentHue = 0, currentSaturation = 0, colorTemperatureMireds = 500, colorTempPhysicalMinMireds = 147, colorTempPhysicalMaxMireds = 500) {
-        this.addClusterServer(this.getDefaultCompleteColorControlClusterServer(currentX, currentY, currentHue, currentSaturation, colorTemperatureMireds, colorTempPhysicalMinMireds, colorTempPhysicalMaxMireds));
+    createDefaultColorControlClusterServer(currentX = 0, currentY = 0, currentHue = 0, currentSaturation = 0, colorTemperatureMireds = 500, colorTempPhysicalMinMireds = 147, colorTempPhysicalMaxMireds = 500) {
+        this.addClusterServer(this.getDefaultColorControlClusterServer(currentX, currentY, currentHue, currentSaturation, colorTemperatureMireds, colorTempPhysicalMinMireds, colorTempPhysicalMaxMireds));
     }
+    isColorControlConfigured = false;
     /**
      * Configures the color control cluster for a device.
      *
-     * @remark This method must be called only after creating the cluster with getDefaultCompleteColorControlClusterServer or createDefaultCompleteColorControlClusterServer
-     * and before starting the matter server.
+     * @remark This method must be called only after creating the cluster with getDefaultColorControlClusterServer or createDefaultColorControlClusterServer
+     * and before starting the matter node.
      *
      * @param {boolean} hueSaturation - A boolean indicating whether the device supports hue and saturation control.
      * @param {boolean} xy - A boolean indicating whether the device supports XY control.
@@ -1078,15 +1248,27 @@ export class MatterbridgeEndpoint extends Endpoint {
      * @param {ColorControl.ColorMode} colorMode - An optional parameter specifying the color mode of the device.
      * @param {Endpoint} endpoint - An optional parameter specifying the endpoint to configure. If not provided, the device endpoint will be used.
      */
-    configureColorControlCluster(hueSaturation, xy, colorTemperature, colorMode, endpoint) {
+    async configureColorControlCluster(hueSaturation, xy, colorTemperature, colorMode, endpoint) {
         if (!endpoint)
             endpoint = this;
-        endpoint.getClusterServer(ColorControlCluster)?.setFeatureMapAttribute({ hueSaturation, enhancedHue: false, colorLoop: false, xy, colorTemperature });
-        endpoint.getClusterServer(ColorControlCluster)?.setColorCapabilitiesAttribute({ hueSaturation, enhancedHue: false, colorLoop: false, xy, colorTemperature });
-        if (colorMode !== undefined && colorMode >= 0 && colorMode <= 2) {
-            endpoint.getClusterServer(ColorControlCluster)?.setColorModeAttribute(colorMode);
-            endpoint.getClusterServer(ColorControlCluster)?.setEnhancedColorModeAttribute(colorMode);
+        if (this.isColorControlConfigured)
+            return;
+        if (endpoint.construction.status !== Lifecycle.Status.Active) {
+            this.log.debug(`**configureColorControlCluster() delaying for endpoint construction ${endpoint.construction.status}`);
+            setTimeout(async () => {
+                await endpoint.configureColorControlCluster(hueSaturation, xy, colorTemperature, colorMode, endpoint);
+                this.isColorControlConfigured = true;
+            }, 500);
+            return;
+        }
+        this.log.debug(`**configureColorControlCluster()`);
+        await endpoint.setAttribute(ColorControlCluster.id, 'featureMap', { hueSaturation, enhancedHue: false, colorLoop: false, xy, colorTemperature }, this.log, endpoint);
+        await endpoint.setAttribute(ColorControlCluster.id, 'colorCapabilities', { hueSaturation, enhancedHue: false, colorLoop: false, xy, colorTemperature }, this.log, endpoint);
+        if (isValidNumber(colorMode, ColorControl.ColorMode.CurrentHueAndCurrentSaturation, ColorControl.ColorMode.ColorTemperatureMireds)) {
+            await endpoint.setAttribute(ColorControlCluster.id, 'colorMode', colorMode, this.log, endpoint);
+            await endpoint.setAttribute(ColorControlCluster.id, 'enhancedColorMode', colorMode, this.log, endpoint);
         }
+        this.isColorControlConfigured = true;
     }
     /**
      * Configures the color control mode for the device.
@@ -1094,18 +1276,18 @@ export class MatterbridgeEndpoint extends Endpoint {
      * @param {ColorControl.ColorMode} colorMode - The color mode to set.
      * @param {Endpoint} endpoint - The optional endpoint to configure. If not provided, the method will configure the current endpoint.
      */
-    configureColorControlMode(colorMode, endpoint) {
+    async configureColorControlMode(colorMode, endpoint) {
         if (!endpoint)
             endpoint = this;
-        if (colorMode !== undefined && colorMode >= ColorControl.ColorMode.CurrentHueAndCurrentSaturation && colorMode <= ColorControl.ColorMode.ColorTemperatureMireds) {
-            endpoint.getClusterServer(ColorControlCluster)?.setColorModeAttribute(colorMode);
-            endpoint.getClusterServer(ColorControlCluster)?.setEnhancedColorModeAttribute(colorMode);
+        if (isValidNumber(colorMode, ColorControl.ColorMode.CurrentHueAndCurrentSaturation, ColorControl.ColorMode.ColorTemperatureMireds)) {
+            await endpoint.setAttribute(ColorControlCluster.id, 'colorMode', colorMode, this.log, endpoint);
+            await endpoint.setAttribute(ColorControlCluster.id, 'enhancedColorMode', colorMode, this.log, endpoint);
         }
     }
     /**
      * Get a default window covering cluster server.
      *
-     * @param positionPercent100ths - The position percentage in 100ths (0-10000). Defaults to 0.
+     * @param positionPercent100ths - The position percentage in 100ths (0-10000). Defaults to 0. Matter uses 10000 = fully closed 0 = fully opened.
      */
     getDefaultWindowCoveringClusterServer(positionPercent100ths) {
         return ClusterServer(WindowCoveringCluster.with(WindowCovering.Feature.Lift, WindowCovering.Feature.PositionAwareLift), {
@@ -1124,8 +1306,6 @@ export class MatterbridgeEndpoint extends Endpoint {
             mode: { motorDirectionReversed: false, calibrationMode: false, maintenanceMode: false, ledFeedback: false },
             targetPositionLiftPercent100ths: positionPercent100ths ?? 0, // 0 Fully open 10000 fully closed
             currentPositionLiftPercent100ths: positionPercent100ths ?? 0, // 0 Fully open 10000 fully closed
-            // installedClosedLimitLift: 10000,
-            // installedOpenLimitLift: 0,
         }, {
             upOrOpen: async (data) => {
                 this.log.debug('Matter command: upOrOpen');
@@ -1149,7 +1329,7 @@ export class MatterbridgeEndpoint extends Endpoint {
     /**
      * Creates a default window covering cluster server.
      *
-     * @param positionPercent100ths - The position percentage in 100ths (0-10000). Defaults to 0.
+     * @param positionPercent100ths - The position percentage in 100ths (0-10000). Defaults to 0. Matter uses 10000 = fully closed 0 = fully opened.
      */
     createDefaultWindowCoveringClusterServer(positionPercent100ths) {
         this.addClusterServer(this.getDefaultWindowCoveringClusterServer(positionPercent100ths));
@@ -1158,22 +1338,19 @@ export class MatterbridgeEndpoint extends Endpoint {
      * Sets the window covering target position as the current position and stops the movement.
      * @param {Endpoint} endpoint - The endpoint on which to set the window covering (default the device endpoint).
      */
-    setWindowCoveringTargetAsCurrentAndStopped(endpoint) {
+    async setWindowCoveringTargetAsCurrentAndStopped(endpoint) {
         if (!endpoint)
             endpoint = this;
-        const windowCoveringCluster = endpoint.getClusterServer(WindowCoveringCluster.with(WindowCovering.Feature.Lift, WindowCovering.Feature.PositionAwareLift));
-        if (windowCoveringCluster) {
-            const position = windowCoveringCluster.getCurrentPositionLiftPercent100thsAttribute();
-            if (position !== null) {
-                windowCoveringCluster.setTargetPositionLiftPercent100thsAttribute(position);
-                windowCoveringCluster.setOperationalStatusAttribute({
-                    global: WindowCovering.MovementStatus.Stopped,
-                    lift: WindowCovering.MovementStatus.Stopped,
-                    tilt: WindowCovering.MovementStatus.Stopped,
-                });
-            }
-            this.log.debug(`Set WindowCovering currentPositionLiftPercent100ths and targetPositionLiftPercent100ths to ${position} and operationalStatus to Stopped.`);
+        const position = endpoint.getAttribute(WindowCoveringCluster.id, 'currentPositionLiftPercent100ths', this.log, endpoint); // windowCoveringCluster.getCurrentPositionLiftPercent100thsAttribute();
+        if (position !== null) {
+            await endpoint.setAttribute(WindowCoveringCluster.id, 'targetPositionLiftPercent100ths', position, this.log, endpoint);
+            await endpoint.setAttribute(WindowCoveringCluster.id, 'operationalStatus', {
+                global: WindowCovering.MovementStatus.Stopped,
+                lift: WindowCovering.MovementStatus.Stopped,
+                tilt: WindowCovering.MovementStatus.Stopped,
+            }, this.log, endpoint);
         }
+        this.log.debug(`Set WindowCovering currentPositionLiftPercent100ths and targetPositionLiftPercent100ths to ${position} and operationalStatus to Stopped.`);
     }
     /**
      * Sets the current and target status of a window covering.
@@ -1182,19 +1359,16 @@ export class MatterbridgeEndpoint extends Endpoint {
      * @param {WindowCovering.MovementStatus} status - The movement status of the window covering.
      * @param {Endpoint} endpoint - The endpoint on which to set the window covering (default the device endpoint).
      */
-    setWindowCoveringCurrentTargetStatus(current, target, status, endpoint) {
+    async setWindowCoveringCurrentTargetStatus(current, target, status, endpoint) {
         if (!endpoint)
             endpoint = this;
-        const windowCoveringCluster = endpoint.getClusterServer(WindowCoveringCluster.with(WindowCovering.Feature.Lift, WindowCovering.Feature.PositionAwareLift));
-        if (windowCoveringCluster) {
-            windowCoveringCluster.setCurrentPositionLiftPercent100thsAttribute(current);
-            windowCoveringCluster.setTargetPositionLiftPercent100thsAttribute(target);
-            windowCoveringCluster.setOperationalStatusAttribute({
-                global: status,
-                lift: status,
-                tilt: status,
-            });
-        }
+        await endpoint.setAttribute(WindowCoveringCluster.id, 'currentPositionLiftPercent100ths', current, this.log, endpoint);
+        await endpoint.setAttribute(WindowCoveringCluster.id, 'targetPositionLiftPercent100ths', target, this.log, endpoint);
+        await endpoint.setAttribute(WindowCoveringCluster.id, 'operationalStatus', {
+            global: status,
+            lift: status,
+            tilt: status,
+        }, this.log, endpoint);
         this.log.debug(`Set WindowCovering currentPositionLiftPercent100ths: ${current}, targetPositionLiftPercent100ths: ${target} and operationalStatus: ${status}.`);
     }
     /**
@@ -1202,13 +1376,14 @@ export class MatterbridgeEndpoint extends Endpoint {
      * @param {WindowCovering.MovementStatus} status - The movement status to set.
      * @param {Endpoint} endpoint - The endpoint on which to set the window covering (default the device endpoint).
      */
-    setWindowCoveringStatus(status, endpoint) {
+    async setWindowCoveringStatus(status, endpoint) {
         if (!endpoint)
             endpoint = this;
-        const windowCovering = endpoint.getClusterServer(WindowCoveringCluster.with(WindowCovering.Feature.Lift, WindowCovering.Feature.PositionAwareLift));
-        if (!windowCovering)
-            return;
-        windowCovering.setOperationalStatusAttribute({ global: status, lift: status, tilt: status });
+        await endpoint.setAttribute(WindowCoveringCluster.id, 'operationalStatus', {
+            global: status,
+            lift: status,
+            tilt: status,
+        }, this.log, endpoint);
         this.log.debug(`Set WindowCovering operationalStatus: ${status}`);
     }
     /**
@@ -1220,10 +1395,7 @@ export class MatterbridgeEndpoint extends Endpoint {
     getWindowCoveringStatus(endpoint) {
         if (!endpoint)
             endpoint = this;
-        const windowCovering = endpoint.getClusterServer(WindowCoveringCluster.with(WindowCovering.Feature.Lift, WindowCovering.Feature.PositionAwareLift));
-        if (!windowCovering)
-            return undefined;
-        const status = windowCovering.getOperationalStatusAttribute();
+        const status = endpoint.getAttribute(WindowCoveringCluster.id, 'operationalStatus', this.log, endpoint);
         this.log.debug(`Get WindowCovering operationalStatus: ${status.global}`);
         return status.global;
     }
@@ -1233,14 +1405,11 @@ export class MatterbridgeEndpoint extends Endpoint {
      * @param position - The position to set, specified as a number.
      * @param {Endpoint} endpoint - The endpoint on which to set the window covering (default the device endpoint).
      */
-    setWindowCoveringTargetAndCurrentPosition(position, endpoint) {
+    async setWindowCoveringTargetAndCurrentPosition(position, endpoint) {
         if (!endpoint)
             endpoint = this;
-        const windowCovering = endpoint.getClusterServer(WindowCoveringCluster.with(WindowCovering.Feature.Lift, WindowCovering.Feature.PositionAwareLift));
-        if (!windowCovering)
-            return;
-        windowCovering.setCurrentPositionLiftPercent100thsAttribute(position);
-        windowCovering.setTargetPositionLiftPercent100thsAttribute(position);
+        await endpoint.setAttribute(WindowCoveringCluster.id, 'currentPositionLiftPercent100ths', position, this.log, endpoint);
+        await endpoint.setAttribute(WindowCoveringCluster.id, 'targetPositionLiftPercent100ths', position, this.log, endpoint);
         this.log.debug(`Set WindowCovering currentPositionLiftPercent100ths: ${position} and targetPositionLiftPercent100ths: ${position}.`);
     }
     /**
@@ -1341,7 +1510,7 @@ export class MatterbridgeEndpoint extends Endpoint {
      * @param {Endpoint} endpoint - The endpoint on which to trigger the event (default the device endpoint).
      * @returns {void}
      */
-    triggerSwitchEvent(event, log, endpoint) {
+    async triggerSwitchEvent(event, log, endpoint) {
         if (!endpoint)
             endpoint = this;
         if (['Single', 'Double', 'Long'].includes(event)) {
@@ -1355,38 +1524,38 @@ export class MatterbridgeEndpoint extends Endpoint {
                 return false;
             }
             if (event === 'Single') {
-                cluster.setCurrentPositionAttribute(1);
-                cluster.triggerInitialPressEvent({ newPosition: 1 });
-                cluster.setCurrentPositionAttribute(0);
-                cluster.triggerShortReleaseEvent({ previousPosition: 1 });
-                cluster.setCurrentPositionAttribute(0);
-                cluster.triggerMultiPressCompleteEvent({ previousPosition: 1, totalNumberOfPressesCounted: 1 });
+                await endpoint.setAttribute(cluster.id, 'currentPosition', 1, log);
+                endpoint.triggerEvent(cluster.id, 'initialPress', { newPosition: 1 }, log);
+                await endpoint.setAttribute(cluster.id, 'currentPosition', 0, log);
+                endpoint.triggerEvent(cluster.id, 'shortRelease', { previousPosition: 1 }, log);
+                await endpoint.setAttribute(cluster.id, 'currentPosition', 0, log);
+                endpoint.triggerEvent(cluster.id, 'multiPressComplete', { previousPosition: 1, totalNumberOfPressesCounted: 1 }, log);
                 log?.info(`${db}Trigger endpoint ${or}${endpoint.id}:${endpoint.number}${db} event ${hk}${cluster.name}.SinglePress${db}`);
             }
             if (event === 'Double') {
-                cluster.setCurrentPositionAttribute(1);
-                cluster.triggerInitialPressEvent({ newPosition: 1 });
-                cluster.setCurrentPositionAttribute(0);
-                cluster.triggerShortReleaseEvent({ previousPosition: 1 });
-                cluster.setCurrentPositionAttribute(1);
-                cluster.triggerInitialPressEvent({ newPosition: 1 });
-                cluster.triggerMultiPressOngoingEvent({ newPosition: 1, currentNumberOfPressesCounted: 2 });
-                cluster.setCurrentPositionAttribute(0);
-                cluster.triggerShortReleaseEvent({ previousPosition: 1 });
-                cluster.triggerMultiPressCompleteEvent({ previousPosition: 1, totalNumberOfPressesCounted: 2 });
+                await endpoint.setAttribute(cluster.id, 'currentPosition', 1, log);
+                endpoint.triggerEvent(cluster.id, 'initialPress', { newPosition: 1 }, log);
+                await endpoint.setAttribute(cluster.id, 'currentPosition', 0, log);
+                endpoint.triggerEvent(cluster.id, 'shortRelease', { previousPosition: 1 }, log);
+                await endpoint.setAttribute(cluster.id, 'currentPosition', 1, log);
+                endpoint.triggerEvent(cluster.id, 'initialPress', { newPosition: 1 }, log);
+                endpoint.triggerEvent(cluster.id, 'multiPressOngoing', { newPosition: 1, currentNumberOfPressesCounted: 2 }, log);
+                await endpoint.setAttribute(cluster.id, 'currentPosition', 0, log);
+                endpoint.triggerEvent(cluster.id, 'shortRelease', { previousPosition: 1 }, log);
+                endpoint.triggerEvent(cluster.id, 'multiPressComplete', { previousPosition: 1, totalNumberOfPressesCounted: 2 }, log);
                 log?.info(`${db}Trigger endpoint ${or}${endpoint.id}:${endpoint.number}${db} event ${hk}${cluster.name}.DoublePress${db}`);
             }
             if (event === 'Long') {
-                cluster.setCurrentPositionAttribute(1);
-                cluster.triggerInitialPressEvent({ newPosition: 1 });
-                cluster.triggerLongPressEvent({ newPosition: 1 });
-                cluster.setCurrentPositionAttribute(0);
-                cluster.triggerLongReleaseEvent({ previousPosition: 1 });
+                await endpoint.setAttribute(cluster.id, 'currentPosition', 1, log);
+                endpoint.triggerEvent(cluster.id, 'initialPress', { newPosition: 1 }, log);
+                endpoint.triggerEvent(cluster.id, 'longPress', { newPosition: 1 }, log);
+                await endpoint.setAttribute(cluster.id, 'currentPosition', 0, log);
+                endpoint.triggerEvent(cluster.id, 'longRelease', { previousPosition: 1 }, log);
                 log?.info(`${db}Trigger endpoint ${or}${endpoint.id}:${endpoint.number}${db} event ${hk}${cluster.name}.LongPress${db}`);
             }
         }
         if (['Press', 'Release'].includes(event)) {
-            const cluster = endpoint.getClusterServer(Switch.Complete);
+            const cluster = endpoint.getClusterServer(SwitchCluster.with(Switch.Feature.LatchingSwitch));
             if (!cluster || !cluster.getFeatureMapAttribute().latchingSwitch) {
                 log?.error(`triggerSwitchEvent ${event} error: Switch cluster with LatchingSwitch not found on endpoint ${endpoint.id}:${endpoint.number}`);
                 return false;
@@ -1396,17 +1565,13 @@ export class MatterbridgeEndpoint extends Endpoint {
                 return false;
             }
             if (event === 'Press') {
-                cluster.setCurrentPositionAttribute(1);
-                log?.info(`${db}Update endpoint ${or}${endpoint.id}:${endpoint.number}${db} attribute ${hk}${cluster.name}.CurrentPosition${db} to ${YELLOW}1${db}`);
-                if (cluster.triggerSwitchLatchedEvent)
-                    cluster.triggerSwitchLatchedEvent({ newPosition: 1 });
+                await endpoint.setAttribute(cluster.id, 'currentPosition', 1, log);
+                endpoint.triggerEvent(cluster.id, 'switchLatched', { newPosition: 1 }, log);
                 log?.info(`${db}Trigger endpoint ${or}${endpoint.id}:${endpoint.number}${db} event ${hk}${cluster.name}.Press${db}`);
             }
             if (event === 'Release') {
-                cluster.setCurrentPositionAttribute(0);
-                log?.info(`${db}Update endpoint ${or}${endpoint.id}:${endpoint.number}${db} attribute ${hk}${cluster.name}.CurrentPosition${db} to ${YELLOW}0${db}`);
-                if (cluster.triggerSwitchLatchedEvent)
-                    cluster.triggerSwitchLatchedEvent({ newPosition: 0 });
+                await endpoint.setAttribute(cluster.id, 'currentPosition', 0, log);
+                endpoint.triggerEvent(cluster.id, 'switchLatched', { newPosition: 0 }, log);
                 log?.info(`${db}Trigger endpoint ${or}${endpoint.id}:${endpoint.number}${db} event ${hk}${cluster.name}.Release${db}`);
             }
         }
@@ -1438,10 +1603,12 @@ export class MatterbridgeEndpoint extends Endpoint {
     /**
      * Creates a default mode select cluster server.
      *
-     * @remarks
-     * This method adds a cluster server for a mode select cluster with default settings.
-     *
+     * @param description - The description of the cluster server.
+     * @param supportedModes - The supported modes for the cluster server.
+     * @param currentMode - The current mode of the cluster server. Defaults to 0.
+     * @param startUpMode - The startup mode of the cluster server. Defaults to 0.
      * @param endpoint - The endpoint to add the cluster server to. Defaults to `this` if not provided.
+     *
      */
     createDefaultModeSelectClusterServer(description, supportedModes, currentMode = 0, startUpMode = 0, endpoint) {
         if (!endpoint)
@@ -1493,7 +1660,7 @@ export class MatterbridgeEndpoint extends Endpoint {
     /**
      * Get a default flow measurement cluster server.
      *
-     * @param measuredValue - The measured value of the temperature.
+     * @param measuredValue - The measured value of the flow in 10 x m/h.
      */
     getDefaultFlowMeasurementClusterServer(measuredValue = 0) {
         return ClusterServer(FlowMeasurementCluster, {
@@ -1506,7 +1673,7 @@ export class MatterbridgeEndpoint extends Endpoint {
     /**
      * Creates a default flow measurement cluster server.
      *
-     * @param measuredValue - The measured value of the temperature.
+     * @param measuredValue - The measured value of the flow in 10 x m/h.
      */
     createDefaultFlowMeasurementClusterServer(measuredValue = 0) {
         this.addClusterServer(this.getDefaultFlowMeasurementClusterServer(measuredValue));
@@ -1514,7 +1681,7 @@ export class MatterbridgeEndpoint extends Endpoint {
     /**
      * Get a default temperature measurement cluster server.
      *
-     * @param measuredValue - The measured value of the temperature.
+     * @param measuredValue - The measured value of the temperature x 100.
      */
     getDefaultTemperatureMeasurementClusterServer(measuredValue = 0) {
         return ClusterServer(TemperatureMeasurementCluster, {
@@ -1527,7 +1694,7 @@ export class MatterbridgeEndpoint extends Endpoint {
     /**
      * Creates a default temperature measurement cluster server.
      *
-     * @param measuredValue - The measured value of the temperature.
+     * @param measuredValue - The measured value of the temperature x 100.
      */
     createDefaultTemperatureMeasurementClusterServer(measuredValue = 0) {
         this.addClusterServer(this.getDefaultTemperatureMeasurementClusterServer(measuredValue));
@@ -1535,7 +1702,7 @@ export class MatterbridgeEndpoint extends Endpoint {
     /**
      * Get a default RelativeHumidityMeasurementCluster server.
      *
-     * @param measuredValue - The measured value of the relative humidity.
+     * @param measuredValue - The measured value of the relative humidity x 100.
      */
     getDefaultRelativeHumidityMeasurementClusterServer(measuredValue = 0) {
         return ClusterServer(RelativeHumidityMeasurementCluster, {
@@ -1548,7 +1715,7 @@ export class MatterbridgeEndpoint extends Endpoint {
     /**
      * Creates a default RelativeHumidityMeasurementCluster server.
      *
-     * @param measuredValue - The measured value of the relative humidity.
+     * @param measuredValue - The measured value of the relative humidity x 100.
      */
     createDefaultRelativeHumidityMeasurementClusterServer(measuredValue = 0) {
         this.addClusterServer(this.getDefaultRelativeHumidityMeasurementClusterServer(measuredValue));
@@ -1769,6 +1936,80 @@ export class MatterbridgeEndpoint extends Endpoint {
     createDefaultTvocMeasurementClusterServer(measuredValue = 0, measurementUnit = ConcentrationMeasurement.MeasurementUnit.Ppm, measurementMedium = ConcentrationMeasurement.MeasurementMedium.Air) {
         this.addClusterServer(this.getDefaultTvocMeasurementClusterServer(measuredValue, measurementUnit, measurementMedium));
     }
+    /**
+     * Get a default heating thermostat cluster server with the specified parameters.
+     * @param {number} [localTemperature] - The local temperature value in degrees Celsius. Defaults to 23°.
+     * @param {number} [occupiedHeatingSetpoint] - The occupied heating setpoint value in degrees Celsius. Defaults to 21°.
+     * @param {number} [minHeatSetpointLimit] - The minimum heat setpoint limit value. Defaults to 0°.
+     * @param {number} [maxHeatSetpointLimit] - The maximum heat setpoint limit value. Defaults to 50°.
+     * @returns {ThermostatClusterServer} A default thermostat cluster server configured with the specified parameters.
+     */
+    getDefaultHeatingThermostatClusterServer(localTemperature = 23, occupiedHeatingSetpoint = 21, minHeatSetpointLimit = 0, maxHeatSetpointLimit = 50) {
+        return ClusterServer(ThermostatCluster.with(Thermostat.Feature.Heating), {
+            localTemperature: localTemperature * 100,
+            systemMode: Thermostat.SystemMode.Heat,
+            controlSequenceOfOperation: Thermostat.ControlSequenceOfOperation.HeatingOnly,
+            // Thermostat.Feature.Heating
+            occupiedHeatingSetpoint: occupiedHeatingSetpoint * 100,
+            minHeatSetpointLimit: minHeatSetpointLimit * 100,
+            maxHeatSetpointLimit: maxHeatSetpointLimit * 100,
+            absMinHeatSetpointLimit: minHeatSetpointLimit * 100,
+            absMaxHeatSetpointLimit: maxHeatSetpointLimit * 100,
+        }, {
+            setpointRaiseLower: async (data) => {
+                this.log.debug('Matter command: setpointRaiseLower', data.request);
+                await this.commandHandler.executeHandler('setpointRaiseLower', data);
+            },
+        }, {});
+    }
+    /**
+     * Creates and adds a default heating thermostat cluster server to the device.
+     *
+     * @param {number} [localTemperature] - The local temperature value in degrees Celsius. Defaults to 23°.
+     * @param {number} [occupiedHeatingSetpoint] - The occupied heating setpoint value in degrees Celsius. Defaults to 21°.
+     * @param {number} [minHeatSetpointLimit] - The minimum heat setpoint limit value. Defaults to 0°.
+     * @param {number} [maxHeatSetpointLimit] - The maximum heat setpoint limit value. Defaults to 50°.
+     */
+    createDefaultHeatingThermostatClusterServer(localTemperature = 23, occupiedHeatingSetpoint = 25, minHeatSetpointLimit = 0, maxHeatSetpointLimit = 50) {
+        this.addClusterServer(this.getDefaultHeatingThermostatClusterServer(localTemperature, occupiedHeatingSetpoint, minHeatSetpointLimit, maxHeatSetpointLimit));
+    }
+    /**
+     * Get a default cooling thermostat cluster server with the specified parameters.
+     * @param {number} [localTemperature] - The local temperature value in degrees Celsius. Defaults to 23°.
+     * @param {number} [occupiedCoolingSetpoint] - The occupied cooling setpoint value in degrees Celsius. Defaults to 25°.
+     * @param {number} [minCoolSetpointLimit] - The minimum cool setpoint limit value. Defaults to 0°.
+     * @param {number} [maxCoolSetpointLimit] - The maximum cool setpoint limit value. Defaults to 50°.
+     * @returns {ThermostatClusterServer} A default thermostat cluster server configured with the specified parameters.
+     */
+    getDefaultCoolingThermostatClusterServer(localTemperature = 23, occupiedCoolingSetpoint = 25, minCoolSetpointLimit = 0, maxCoolSetpointLimit = 50) {
+        return ClusterServer(ThermostatCluster.with(Thermostat.Feature.Cooling), {
+            localTemperature: localTemperature * 100,
+            systemMode: Thermostat.SystemMode.Cool,
+            controlSequenceOfOperation: Thermostat.ControlSequenceOfOperation.CoolingOnly,
+            // Thermostat.Feature.Cooling
+            occupiedCoolingSetpoint: occupiedCoolingSetpoint * 100,
+            minCoolSetpointLimit: minCoolSetpointLimit * 100,
+            maxCoolSetpointLimit: maxCoolSetpointLimit * 100,
+            absMinCoolSetpointLimit: minCoolSetpointLimit * 100,
+            absMaxCoolSetpointLimit: maxCoolSetpointLimit * 100,
+        }, {
+            setpointRaiseLower: async (data) => {
+                this.log.debug('Matter command: setpointRaiseLower', data.request);
+                await this.commandHandler.executeHandler('setpointRaiseLower', data);
+            },
+        }, {});
+    }
+    /**
+     * Creates and adds a default cooling thermostat cluster server to the device.
+     *
+     * @param {number} [localTemperature] - The local temperature value in degrees Celsius. Defaults to 23°.
+     * @param {number} [occupiedCoolingSetpoint] - The occupied cooling setpoint value in degrees Celsius. Defaults to 25°.
+     * @param {number} [minCoolSetpointLimit] - The minimum cool setpoint limit value. Defaults to 0°.
+     * @param {number} [maxCoolSetpointLimit] - The maximum cool setpoint limit value. Defaults to 50°.
+     */
+    createDefaultCoolingThermostatClusterServer(localTemperature = 23, occupiedCoolingSetpoint = 25, minCoolSetpointLimit = 0, maxCoolSetpointLimit = 50) {
+        this.addClusterServer(this.getDefaultCoolingThermostatClusterServer(localTemperature, occupiedCoolingSetpoint, minCoolSetpointLimit, maxCoolSetpointLimit));
+    }
     /**
      * Get a default thermostat cluster server with the specified parameters.
      *
@@ -1785,19 +2026,22 @@ export class MatterbridgeEndpoint extends Endpoint {
     getDefaultThermostatClusterServer(localTemperature = 23, occupiedHeatingSetpoint = 21, occupiedCoolingSetpoint = 25, minSetpointDeadBand = 1, minHeatSetpointLimit = 0, maxHeatSetpointLimit = 50, minCoolSetpointLimit = 0, maxCoolSetpointLimit = 50) {
         return ClusterServer(ThermostatCluster.with(Thermostat.Feature.Heating, Thermostat.Feature.Cooling, Thermostat.Feature.AutoMode), {
             localTemperature: localTemperature * 100,
+            systemMode: Thermostat.SystemMode.Auto,
+            controlSequenceOfOperation: Thermostat.ControlSequenceOfOperation.CoolingAndHeating,
+            // Thermostat.Feature.Heating
             occupiedHeatingSetpoint: occupiedHeatingSetpoint * 100,
-            occupiedCoolingSetpoint: occupiedCoolingSetpoint * 100,
             minHeatSetpointLimit: minHeatSetpointLimit * 100,
             maxHeatSetpointLimit: maxHeatSetpointLimit * 100,
             absMinHeatSetpointLimit: minHeatSetpointLimit * 100,
             absMaxHeatSetpointLimit: maxHeatSetpointLimit * 100,
+            // Thermostat.Feature.Cooling
+            occupiedCoolingSetpoint: occupiedCoolingSetpoint * 100,
             minCoolSetpointLimit: minCoolSetpointLimit * 100,
             maxCoolSetpointLimit: maxCoolSetpointLimit * 100,
             absMinCoolSetpointLimit: minCoolSetpointLimit * 100,
             absMaxCoolSetpointLimit: maxCoolSetpointLimit * 100,
+            // Thermostat.Feature.AutoMode
             minSetpointDeadBand: minSetpointDeadBand * 100,
-            systemMode: Thermostat.SystemMode.Off,
-            controlSequenceOfOperation: Thermostat.ControlSequenceOfOperation.CoolingAndHeating,
             thermostatRunningMode: Thermostat.ThermostatRunningMode.Off,
         }, {
             setpointRaiseLower: async (data) => {
@@ -1821,46 +2065,6 @@ export class MatterbridgeEndpoint extends Endpoint {
     createDefaultThermostatClusterServer(localTemperature = 23, occupiedHeatingSetpoint = 21, occupiedCoolingSetpoint = 25, minSetpointDeadBand = 1, minHeatSetpointLimit = 0, maxHeatSetpointLimit = 50, minCoolSetpointLimit = 0, maxCoolSetpointLimit = 50) {
         this.addClusterServer(this.getDefaultThermostatClusterServer(localTemperature, occupiedHeatingSetpoint, occupiedCoolingSetpoint, minSetpointDeadBand, minHeatSetpointLimit, maxHeatSetpointLimit, minCoolSetpointLimit, maxCoolSetpointLimit));
     }
-    /**
-     * Get a default dummy time sync cluster server. Only needed to create a thermostat.
-     */
-    getDefaultTimeSyncClusterServer() {
-        return ClusterServer(TimeSynchronizationCluster.with(TimeSynchronization.Feature.TimeZone), {
-            utcTime: null,
-            granularity: TimeSynchronization.Granularity.NoTimeGranularity,
-            timeZone: [{ offset: 0, validAt: 0 }],
-            dstOffset: [],
-            localTime: null,
-            timeZoneDatabase: TimeSynchronization.TimeZoneDatabase.None,
-            timeZoneListMaxSize: 1,
-            dstOffsetListMaxSize: 1,
-        }, {
-            setTimeZone: async (data) => {
-                this.log.debug('Matter command: setTimeZone', data.request);
-                await this.commandHandler.executeHandler('setTimeZone', data);
-                return { dstOffsetsRequired: false };
-            },
-            setDstOffset: async (data) => {
-                this.log.debug('Matter command: setDstOffset', data.request);
-                await this.commandHandler.executeHandler('setDstOffset', data);
-            },
-            setUtcTime: async (data) => {
-                this.log.debug('Matter command: setUtcTime', data.request);
-                await this.commandHandler.executeHandler('setUtcTime', data);
-            },
-        }, {
-            dstTableEmpty: true,
-            dstStatus: true,
-            timeZoneStatus: true,
-            timeFailure: true,
-        });
-    }
-    /**
-     * Creates a default dummy time sync cluster server. Only needed to create a thermostat.
-     */
-    createDefaultTimeSyncClusterServer() {
-        this.addClusterServer(this.getDefaultTimeSyncClusterServer());
-    }
     /**
      * Returns the default SmokeCOAlarm Cluster Server.
      *