matterbridge 2.0.0 → 2.1.0-dev.2

package/dist/matterbridgeEndpoint.js

@@ -1,120 +1,323 @@
-/**
- * This file contains the class MatterbridgeEndpoint that extends the Endpoint class from the Matter.js library.
- *
- * @file matterbridgeEndpoint.ts
- * @author Luca Liguori
- * @date 2024-10-01
- * @version 1.0.0
- *
- * 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.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License. *
- */
-/* eslint-disable @typescript-eslint/no-unused-vars */
-// Node.js modules
 import { createHash } from 'crypto';
-// AnsiLogger module
-import { AnsiLogger, BLUE, CYAN, YELLOW, db, debugStringify, er, hk, or, rs, zb } from './logger/export.js';
-// Matterbridge behaviors
-import { MatterbridgeBehavior, MatterbridgeBehaviorDevice, MatterbridgeBooleanStateConfigurationServer, MatterbridgeColorControlServer, MatterbridgeDoorLockServer, MatterbridgeFanControlServer, MatterbridgeIdentifyServer, MatterbridgeLevelControlServer, MatterbridgeOnOffServer, MatterbridgeThermostatServer, MatterbridgeValveConfigurationAndControlServer, MatterbridgeWindowCoveringServer, } from './matterbridgeBehaviors.js';
+import { AnsiLogger, BLUE, CYAN, YELLOW, db, debugStringify, er, hk, or, zb } from './logger/export.js';
 import { bridgedNode } from './matterbridgeDeviceTypes.js';
 import { deepCopy, isValidNumber } from './utils/utils.js';
-// @matter
-import { Endpoint, MutableEndpoint, SupportedBehaviors, NamedHandler, Lifecycle, VendorId } from '@matter/main';
-import { MeasurementType, getClusterNameById } from '@matter/main/types';
-import { Specification } from '@matter/main/model';
-// @matter clusters
-import { BasicInformation, BasicInformationCluster } from '@matter/main/clusters/basic-information';
-import { BooleanState, BooleanStateCluster } from '@matter/main/clusters/boolean-state';
-import { BooleanStateConfiguration, BooleanStateConfigurationCluster } from '@matter/main/clusters/boolean-state-configuration';
-import { BridgedDeviceBasicInformation, BridgedDeviceBasicInformationCluster } from '@matter/main/clusters/bridged-device-basic-information';
-import { CarbonDioxideConcentrationMeasurement, CarbonDioxideConcentrationMeasurementCluster } from '@matter/main/clusters/carbon-dioxide-concentration-measurement';
-import { CarbonMonoxideConcentrationMeasurement, CarbonMonoxideConcentrationMeasurementCluster } from '@matter/main/clusters/carbon-monoxide-concentration-measurement';
-import { ColorControl, ColorControlCluster } from '@matter/main/clusters/color-control';
-import { ConcentrationMeasurement } from '@matter/main/clusters/concentration-measurement';
+import { MatterbridgeBehavior, MatterbridgeBehaviorDevice, MatterbridgeIdentifyServer, MatterbridgeOnOffServer, MatterbridgeLevelControlServer, MatterbridgeColorControlServer, MatterbridgeWindowCoveringServer, MatterbridgeThermostatServer, MatterbridgeFanControlServer, MatterbridgeDoorLockServer, MatterbridgeModeSelectServer, MatterbridgeValveConfigurationAndControlServer, MatterbridgeSmokeCoAlarmServer, MatterbridgeBooleanStateConfigurationServer, } from './matterbridgeBehaviors.js';
+import { Endpoint, Lifecycle, MutableEndpoint, NamedHandler, SupportedBehaviors, VendorId } from '@matter/main';
+import { getClusterNameById, MeasurementType } from '@matter/main/types';
 import { Descriptor } from '@matter/main/clusters/descriptor';
-import { DoorLock, DoorLockCluster } from '@matter/main/clusters/door-lock';
-import { ElectricalEnergyMeasurement, ElectricalEnergyMeasurementCluster } from '@matter/main/clusters/electrical-energy-measurement';
-import { ElectricalPowerMeasurement, ElectricalPowerMeasurementCluster } from '@matter/main/clusters/electrical-power-measurement';
-import { FanControl, FanControlCluster } from '@matter/main/clusters/fan-control';
-import { FixedLabel, FixedLabelCluster } from '@matter/main/clusters/fixed-label';
-import { FlowMeasurement, FlowMeasurementCluster } from '@matter/main/clusters/flow-measurement';
-import { FormaldehydeConcentrationMeasurement, FormaldehydeConcentrationMeasurementCluster } from '@matter/main/clusters/formaldehyde-concentration-measurement';
-import { Groups, GroupsCluster } from '@matter/main/clusters/groups';
-import { Identify, IdentifyCluster } from '@matter/main/clusters/identify';
-import { IlluminanceMeasurement, IlluminanceMeasurementCluster } from '@matter/main/clusters/illuminance-measurement';
-import { LevelControl, LevelControlCluster } from '@matter/main/clusters/level-control';
-import { ModeSelect, ModeSelectCluster } from '@matter/main/clusters/mode-select';
-import { NitrogenDioxideConcentrationMeasurement, NitrogenDioxideConcentrationMeasurementCluster } from '@matter/main/clusters/nitrogen-dioxide-concentration-measurement';
-import { OccupancySensing, OccupancySensingCluster } from '@matter/main/clusters/occupancy-sensing';
-import { OnOff, OnOffCluster } from '@matter/main/clusters/on-off';
-import { OzoneConcentrationMeasurement, OzoneConcentrationMeasurementCluster } from '@matter/main/clusters/ozone-concentration-measurement';
-import { Pm10ConcentrationMeasurement, Pm10ConcentrationMeasurementCluster } from '@matter/main/clusters/pm10-concentration-measurement';
-import { Pm1ConcentrationMeasurement, Pm1ConcentrationMeasurementCluster } from '@matter/main/clusters/pm1-concentration-measurement';
-import { Pm25ConcentrationMeasurement, Pm25ConcentrationMeasurementCluster } from '@matter/main/clusters/pm25-concentration-measurement';
-import { PowerSource, PowerSourceCluster } from '@matter/main/clusters/power-source';
-import { PowerTopology, PowerTopologyCluster } from '@matter/main/clusters/power-topology';
-import { PressureMeasurement, PressureMeasurementCluster } from '@matter/main/clusters/pressure-measurement';
-import { PumpConfigurationAndControl, PumpConfigurationAndControlCluster } from '@matter/main/clusters/pump-configuration-and-control';
-import { RadonConcentrationMeasurement, RadonConcentrationMeasurementCluster } from '@matter/main/clusters/radon-concentration-measurement';
-import { RelativeHumidityMeasurement, RelativeHumidityMeasurementCluster } from '@matter/main/clusters/relative-humidity-measurement';
-import { SmokeCoAlarm, SmokeCoAlarmCluster } from '@matter/main/clusters/smoke-co-alarm';
-import { Switch, SwitchCluster } from '@matter/main/clusters/switch';
-import { TemperatureMeasurement, TemperatureMeasurementCluster } from '@matter/main/clusters/temperature-measurement';
-import { Thermostat, ThermostatCluster } from '@matter/main/clusters/thermostat';
-import { TotalVolatileOrganicCompoundsConcentrationMeasurement, TotalVolatileOrganicCompoundsConcentrationMeasurementCluster } from '@matter/main/clusters/total-volatile-organic-compounds-concentration-measurement';
-import { UserLabel, UserLabelCluster } from '@matter/main/clusters/user-label';
-import { ValveConfigurationAndControl, ValveConfigurationAndControlCluster } from '@matter/main/clusters/valve-configuration-and-control';
-import { WindowCovering, WindowCoveringCluster } from '@matter/main/clusters/window-covering';
-import { AirQuality, AirQualityCluster } from '@matter/main/clusters/air-quality';
-// @matter behaviors
-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 } from '@matter/main/behaviors/air-quality';
+import { PowerSource } from '@matter/main/clusters/power-source';
+import { UserLabel } from '@matter/main/clusters/user-label';
+import { FixedLabel } from '@matter/main/clusters/fixed-label';
+import { BasicInformation } from '@matter/main/clusters/basic-information';
+import { BridgedDeviceBasicInformation } from '@matter/main/clusters/bridged-device-basic-information';
+import { Identify } from '@matter/main/clusters/identify';
+import { Groups } from '@matter/main/clusters/groups';
+import { OnOff } from '@matter/main/clusters/on-off';
+import { LevelControl } from '@matter/main/clusters/level-control';
+import { ColorControl } from '@matter/main/clusters/color-control';
+import { WindowCovering } from '@matter/main/clusters/window-covering';
+import { Thermostat } from '@matter/main/clusters/thermostat';
+import { FanControl } from '@matter/main/clusters/fan-control';
+import { DoorLock } from '@matter/main/clusters/door-lock';
+import { ModeSelect } from '@matter/main/clusters/mode-select';
+import { ValveConfigurationAndControl } from '@matter/main/clusters/valve-configuration-and-control';
+import { PumpConfigurationAndControl } from '@matter/main/clusters/pump-configuration-and-control';
+import { SmokeCoAlarm } from '@matter/main/clusters/smoke-co-alarm';
+import { Switch } from '@matter/main/clusters/switch';
+import { BooleanState } from '@matter/main/clusters/boolean-state';
+import { BooleanStateConfiguration } from '@matter/main/clusters/boolean-state-configuration';
+import { PowerTopology } from '@matter/main/clusters/power-topology';
+import { ElectricalPowerMeasurement } from '@matter/main/clusters/electrical-power-measurement';
+import { ElectricalEnergyMeasurement } from '@matter/main/clusters/electrical-energy-measurement';
+import { TemperatureMeasurement } from '@matter/main/clusters/temperature-measurement';
+import { RelativeHumidityMeasurement } from '@matter/main/clusters/relative-humidity-measurement';
+import { PressureMeasurement } from '@matter/main/clusters/pressure-measurement';
+import { FlowMeasurement } from '@matter/main/clusters/flow-measurement';
+import { IlluminanceMeasurement } from '@matter/main/clusters/illuminance-measurement';
+import { OccupancySensing } from '@matter/main/clusters/occupancy-sensing';
+import { AirQuality } from '@matter/main/clusters/air-quality';
+import { CarbonMonoxideConcentrationMeasurement } from '@matter/main/clusters/carbon-monoxide-concentration-measurement';
+import { CarbonDioxideConcentrationMeasurement } from '@matter/main/clusters/carbon-dioxide-concentration-measurement';
+import { NitrogenDioxideConcentrationMeasurement } from '@matter/main/clusters/nitrogen-dioxide-concentration-measurement';
+import { OzoneConcentrationMeasurement } from '@matter/main/clusters/ozone-concentration-measurement';
+import { FormaldehydeConcentrationMeasurement } from '@matter/main/clusters/formaldehyde-concentration-measurement';
+import { Pm1ConcentrationMeasurement } from '@matter/main/clusters/pm1-concentration-measurement';
+import { Pm25ConcentrationMeasurement } from '@matter/main/clusters/pm25-concentration-measurement';
+import { Pm10ConcentrationMeasurement } from '@matter/main/clusters/pm10-concentration-measurement';
+import { RadonConcentrationMeasurement } from '@matter/main/clusters/radon-concentration-measurement';
+import { TotalVolatileOrganicCompoundsConcentrationMeasurement } from '@matter/main/clusters/total-volatile-organic-compounds-concentration-measurement';
+import { ConcentrationMeasurement } from '@matter/main/clusters/concentration-measurement';
+import { DescriptorServer } from '@matter/main/behaviors/descriptor';
+import { PowerSourceServer } from '@matter/main/behaviors/power-source';
+import { UserLabelServer } from '@matter/main/behaviors/user-label';
+import { FixedLabelServer } from '@matter/main/behaviors/fixed-label';
 import { BasicInformationServer } from '@matter/main/behaviors/basic-information';
-import { CarbonDioxideConcentrationMeasurementServer } from '@matter/main/behaviors/carbon-dioxide-concentration-measurement';
-import { CarbonMonoxideConcentrationMeasurementServer } from '@matter/main/behaviors/carbon-monoxide-concentration-measurement';
-import { ElectricalEnergyMeasurementServer } from '@matter/main/behaviors/electrical-energy-measurement';
+import { BridgedDeviceBasicInformationServer } from '@matter/main/behaviors/bridged-device-basic-information';
+import { GroupsServer } from '@matter/main/behaviors/groups';
+import { ScenesManagementServer } from '@matter/main/behaviors/scenes-management';
+import { PumpConfigurationAndControlServer } from '@matter/main/behaviors/pump-configuration-and-control';
+import { SwitchServer } from '@matter/main/behaviors/switch';
+import { BooleanStateServer } from '@matter/main/behaviors/boolean-state';
+import { PowerTopologyServer } from '@matter/main/behaviors/power-topology';
 import { ElectricalPowerMeasurementServer } from '@matter/main/behaviors/electrical-power-measurement';
-import { FixedLabelServer } from '@matter/main/behaviors/fixed-label';
-import { FormaldehydeConcentrationMeasurementServer } from '@matter/main/behaviors/formaldehyde-concentration-measurement';
-import { ModeSelectServer } from '@matter/main/behaviors/mode-select';
+import { ElectricalEnergyMeasurementServer } from '@matter/main/behaviors/electrical-energy-measurement';
+import { TemperatureMeasurementServer } from '@matter/main/behaviors/temperature-measurement';
+import { RelativeHumidityMeasurementServer } from '@matter/main/behaviors/relative-humidity-measurement';
+import { PressureMeasurementServer } from '@matter/main/behaviors/pressure-measurement';
+import { FlowMeasurementServer } from '@matter/main/behaviors/flow-measurement';
+import { IlluminanceMeasurementServer } from '@matter/main/behaviors/illuminance-measurement';
+import { OccupancySensingServer } from '@matter/main/behaviors/occupancy-sensing';
+import { AirQualityServer } from '@matter/main/behaviors/air-quality';
+import { CarbonMonoxideConcentrationMeasurementServer } from '@matter/main/behaviors/carbon-monoxide-concentration-measurement';
+import { CarbonDioxideConcentrationMeasurementServer } from '@matter/main/behaviors/carbon-dioxide-concentration-measurement';
 import { NitrogenDioxideConcentrationMeasurementServer } from '@matter/main/behaviors/nitrogen-dioxide-concentration-measurement';
 import { OzoneConcentrationMeasurementServer } from '@matter/main/behaviors/ozone-concentration-measurement';
-import { Pm10ConcentrationMeasurementServer } from '@matter/main/behaviors/pm10-concentration-measurement';
+import { FormaldehydeConcentrationMeasurementServer } from '@matter/main/behaviors/formaldehyde-concentration-measurement';
 import { Pm1ConcentrationMeasurementServer } from '@matter/main/behaviors/pm1-concentration-measurement';
 import { Pm25ConcentrationMeasurementServer } from '@matter/main/behaviors/pm25-concentration-measurement';
-import { PowerSourceServer } from '@matter/main/behaviors/power-source';
-import { PowerTopologyServer } from '@matter/main/behaviors/power-topology';
+import { Pm10ConcentrationMeasurementServer } from '@matter/main/behaviors/pm10-concentration-measurement';
 import { RadonConcentrationMeasurementServer } from '@matter/main/behaviors/radon-concentration-measurement';
-import { SmokeCoAlarmServer } from '@matter/main/behaviors/smoke-co-alarm';
-import { SwitchServer } from '@matter/main/behaviors/switch';
 import { TotalVolatileOrganicCompoundsConcentrationMeasurementServer } from '@matter/main/behaviors/total-volatile-organic-compounds-concentration-measurement';
-import { UserLabelServer } from '@matter/main/behaviors/user-label';
-// @project-chip
-import { ClusterServer, GroupsClusterHandler } from '@project-chip/matter.js/cluster';
+function capitalizeFirstLetter(name) {
+    if (!name)
+        return name;
+    return name.charAt(0).toUpperCase() + name.slice(1);
+}
+function lowercaseFirstLetter(name) {
+    if (!name)
+        return name;
+    return name.charAt(0).toLowerCase() + name.slice(1);
+}
+function createUniqueId(param1, param2, param3, param4) {
+    const hash = createHash('md5');
+    hash.update(param1 + param2 + param3 + param4);
+    return hash.digest('hex');
+}
+function getBehaviourTypesFromClusterServerIds(clusterServerList) {
+    const behaviorTypes = [];
+    clusterServerList.forEach((clusterId) => {
+        behaviorTypes.push(getBehaviourTypeFromClusterServerId(clusterId));
+    });
+    return behaviorTypes;
+}
+function getBehaviourTypesFromClusterClientIds(clusterClientList) {
+    const behaviorTypes = [];
+    clusterClientList.forEach((clusterId) => {
+    });
+    return behaviorTypes;
+}
+function getBehaviourTypeFromClusterServerId(clusterId) {
+    if (clusterId === PowerSource.Cluster.id)
+        return PowerSourceServer.with(PowerSource.Feature.Wired);
+    if (clusterId === UserLabel.Cluster.id)
+        return UserLabelServer;
+    if (clusterId === FixedLabel.Cluster.id)
+        return FixedLabelServer;
+    if (clusterId === BasicInformation.Cluster.id)
+        return BasicInformationServer;
+    if (clusterId === BridgedDeviceBasicInformation.Cluster.id)
+        return BridgedDeviceBasicInformationServer;
+    if (clusterId === Identify.Cluster.id)
+        return MatterbridgeIdentifyServer;
+    if (clusterId === Groups.Cluster.id)
+        return GroupsServer;
+    if (clusterId === OnOff.Cluster.id)
+        return MatterbridgeOnOffServer.with('Lighting');
+    if (clusterId === LevelControl.Cluster.id)
+        return MatterbridgeLevelControlServer.with('OnOff', 'Lighting');
+    if (clusterId === ColorControl.Cluster.id)
+        return MatterbridgeColorControlServer;
+    if (clusterId === WindowCovering.Cluster.id)
+        return MatterbridgeWindowCoveringServer.with('Lift', 'PositionAwareLift');
+    if (clusterId === Thermostat.Cluster.id)
+        return MatterbridgeThermostatServer.with('AutoMode', 'Heating', 'Cooling');
+    if (clusterId === FanControl.Cluster.id)
+        return MatterbridgeFanControlServer;
+    if (clusterId === DoorLock.Cluster.id)
+        return MatterbridgeDoorLockServer;
+    if (clusterId === ModeSelect.Cluster.id)
+        return MatterbridgeModeSelectServer;
+    if (clusterId === ValveConfigurationAndControl.Cluster.id)
+        return MatterbridgeValveConfigurationAndControlServer.with('Level');
+    if (clusterId === PumpConfigurationAndControl.Cluster.id)
+        return PumpConfigurationAndControlServer.with('ConstantSpeed');
+    if (clusterId === SmokeCoAlarm.Cluster.id)
+        return MatterbridgeSmokeCoAlarmServer.with('SmokeAlarm', 'CoAlarm');
+    if (clusterId === Switch.Cluster.id)
+        return SwitchServer.with('MomentarySwitch', 'MomentarySwitchRelease', 'MomentarySwitchLongPress', 'MomentarySwitchMultiPress');
+    if (clusterId === BooleanState.Cluster.id)
+        return BooleanStateServer.enable({ events: { stateChange: true } });
+    if (clusterId === BooleanStateConfiguration.Cluster.id)
+        return MatterbridgeBooleanStateConfigurationServer;
+    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 === TemperatureMeasurement.Cluster.id)
+        return TemperatureMeasurementServer;
+    if (clusterId === RelativeHumidityMeasurement.Cluster.id)
+        return RelativeHumidityMeasurementServer;
+    if (clusterId === PressureMeasurement.Cluster.id)
+        return PressureMeasurementServer;
+    if (clusterId === FlowMeasurement.Cluster.id)
+        return FlowMeasurementServer;
+    if (clusterId === IlluminanceMeasurement.Cluster.id)
+        return IlluminanceMeasurementServer;
+    if (clusterId === OccupancySensing.Cluster.id)
+        return OccupancySensingServer;
+    if (clusterId === AirQuality.Cluster.id)
+        return AirQualityServer.with('Fair', 'Moderate', 'VeryPoor', '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');
+    return MatterbridgeIdentifyServer;
+}
+function getBehaviourTypeFromClusterClientId(clusterId) {
+}
+function getBehavior(endpoint, cluster) {
+    let behavior;
+    if (typeof cluster === 'string') {
+        behavior = endpoint.behaviors.supported[lowercaseFirstLetter(cluster)];
+    }
+    else if (typeof cluster === 'number') {
+        behavior = endpoint.behaviors.supported[lowercaseFirstLetter(getClusterNameById(cluster))];
+    }
+    else if (typeof cluster === 'object') {
+        behavior = endpoint.behaviors.supported[lowercaseFirstLetter(cluster.name)];
+    }
+    else if (typeof cluster === 'function') {
+        behavior = cluster;
+    }
+    return behavior;
+}
+function addRequiredClusterServers(endpoint) {
+    const requiredServerList = [];
+    endpoint.log.debug(`addRequiredClusterServers for ${CYAN}${endpoint.maybeId}${db}`);
+    endpoint.deviceTypes.values().forEach((deviceType) => {
+        endpoint.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.hasClusterServer(clusterId)) {
+                requiredServerList.push(clusterId);
+                endpoint.log.debug(`- cluster: ${hk}${'0x' + clusterId.toString(16).padStart(4, '0')}${db}-${hk}${getClusterNameById(clusterId)}${db}`);
+            }
+        });
+    });
+    addClusterServers(endpoint, requiredServerList);
+}
+function addOptionalClusterServers(endpoint) {
+    const optionalServerList = [];
+    endpoint.log.debug(`addOptionalClusterServers for ${CYAN}${endpoint.maybeId}${db}`);
+    endpoint.deviceTypes.values().forEach((deviceType) => {
+        endpoint.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.hasClusterServer(clusterId)) {
+                optionalServerList.push(clusterId);
+                endpoint.log.debug(`- cluster: ${hk}${'0x' + clusterId.toString(16).padStart(4, '0')}${db}-${hk}${getClusterNameById(clusterId)}${db}`);
+            }
+        });
+    });
+    addClusterServers(endpoint, optionalServerList);
+}
+function addClusterServers(endpoint, serverList) {
+    if (serverList.includes(PowerSource.Cluster.id))
+        endpoint.createDefaultPowerSourceWiredClusterServer();
+    if (serverList.includes(Identify.Cluster.id))
+        endpoint.createDefaultIdentifyClusterServer();
+    if (serverList.includes(Groups.Cluster.id))
+        endpoint.createDefaultGroupsClusterServer();
+    if (serverList.includes(OnOff.Cluster.id))
+        endpoint.createDefaultOnOffClusterServer();
+    if (serverList.includes(LevelControl.Cluster.id))
+        endpoint.createDefaultLevelControlClusterServer();
+    if (serverList.includes(ColorControl.Cluster.id))
+        endpoint.createDefaultColorControlClusterServer();
+    if (serverList.includes(WindowCovering.Cluster.id))
+        endpoint.createDefaultWindowCoveringClusterServer();
+    if (serverList.includes(Thermostat.Cluster.id))
+        endpoint.createDefaultThermostatClusterServer();
+    if (serverList.includes(FanControl.Cluster.id))
+        endpoint.createDefaultFanControlClusterServer();
+    if (serverList.includes(DoorLock.Cluster.id))
+        endpoint.createDefaultDoorLockClusterServer();
+    if (serverList.includes(ValveConfigurationAndControl.Cluster.id))
+        endpoint.createDefaultValveConfigurationAndControlClusterServer();
+    if (serverList.includes(PumpConfigurationAndControl.Cluster.id))
+        endpoint.createDefaultPumpConfigurationAndControlClusterServer();
+    if (serverList.includes(SmokeCoAlarm.Cluster.id))
+        endpoint.createDefaultSmokeCOAlarmClusterServer();
+    if (serverList.includes(Switch.Cluster.id))
+        endpoint.createDefaultSwitchClusterServer();
+    if (serverList.includes(BooleanState.Cluster.id))
+        endpoint.createDefaultBooleanStateClusterServer();
+    if (serverList.includes(BooleanStateConfiguration.Cluster.id))
+        endpoint.createDefaultBooleanStateConfigurationClusterServer();
+    if (serverList.includes(PowerTopology.Cluster.id))
+        endpoint.createDefaultPowerTopologyClusterServer();
+    if (serverList.includes(ElectricalPowerMeasurement.Cluster.id))
+        endpoint.createDefaultElectricalPowerMeasurementClusterServer();
+    if (serverList.includes(ElectricalEnergyMeasurement.Cluster.id))
+        endpoint.createDefaultElectricalEnergyMeasurementClusterServer();
+    if (serverList.includes(TemperatureMeasurement.Cluster.id))
+        endpoint.createDefaultTemperatureMeasurementClusterServer();
+    if (serverList.includes(RelativeHumidityMeasurement.Cluster.id))
+        endpoint.createDefaultRelativeHumidityMeasurementClusterServer();
+    if (serverList.includes(PressureMeasurement.Cluster.id))
+        endpoint.createDefaultPressureMeasurementClusterServer();
+    if (serverList.includes(FlowMeasurement.Cluster.id))
+        endpoint.createDefaultFlowMeasurementClusterServer();
+    if (serverList.includes(IlluminanceMeasurement.Cluster.id))
+        endpoint.createDefaultIlluminanceMeasurementClusterServer();
+    if (serverList.includes(OccupancySensing.Cluster.id))
+        endpoint.createDefaultOccupancySensingClusterServer();
+    if (serverList.includes(AirQuality.Cluster.id))
+        endpoint.createDefaultAirQualityClusterServer();
+    if (serverList.includes(CarbonMonoxideConcentrationMeasurement.Cluster.id))
+        endpoint.createDefaultCarbonMonoxideConcentrationMeasurementClusterServer();
+    if (serverList.includes(CarbonDioxideConcentrationMeasurement.Cluster.id))
+        endpoint.createDefaultCarbonDioxideConcentrationMeasurementClusterServer();
+    if (serverList.includes(NitrogenDioxideConcentrationMeasurement.Cluster.id))
+        endpoint.createDefaultNitrogenDioxideConcentrationMeasurementClusterServer();
+    if (serverList.includes(OzoneConcentrationMeasurement.Cluster.id))
+        endpoint.createDefaultOzoneConcentrationMeasurementClusterServer();
+    if (serverList.includes(FormaldehydeConcentrationMeasurement.Cluster.id))
+        endpoint.createDefaultFormaldehydeConcentrationMeasurementClusterServer();
+    if (serverList.includes(Pm1ConcentrationMeasurement.Cluster.id))
+        endpoint.createDefaultPm1ConcentrationMeasurementClusterServer();
+    if (serverList.includes(Pm25ConcentrationMeasurement.Cluster.id))
+        endpoint.createDefaultPm25ConcentrationMeasurementClusterServer();
+    if (serverList.includes(Pm10ConcentrationMeasurement.Cluster.id))
+        endpoint.createDefaultPm10ConcentrationMeasurementClusterServer();
+    if (serverList.includes(RadonConcentrationMeasurement.Cluster.id))
+        endpoint.createDefaultRadonConcentrationMeasurementClusterServer();
+    if (serverList.includes(TotalVolatileOrganicCompoundsConcentrationMeasurement.Cluster.id))
+        endpoint.createDefaultTvocMeasurementClusterServer();
+}
+export function optionsFor(type, options) {
+    return options;
+}
 export class MatterbridgeEndpoint extends Endpoint {
     static bridgeMode = '';
-    static logLevel = "info" /* LogLevel.INFO */;
+    static logLevel = "info";
     log;
     plugin = undefined;
     configUrl = undefined;
@@ -135,21 +338,10 @@ export class MatterbridgeEndpoint extends Endpoint {
     uniqueStorageKey = undefined;
     tagList = undefined;
     subType = '';
-    // Maps matter deviceTypes and endpoints
     deviceTypes = new Map();
-    clusterServers = new Map();
-    clusterClients = new Map();
     commandHandler = new NamedHandler();
-    /**
-     * Represents a MatterbridgeEndpoint.
-     * @constructor
-     * @param {DeviceTypeDefinition | AtLeastOne<DeviceTypeDefinition>} definition - The DeviceTypeDefinition(s) of the endpoint.
-     * @param {MatterbridgeEndpointOptions} [options={}] - The options for the device.
-     * @param {boolean} [debug=false] - Debug flag.
-     */
     constructor(definition, options = {}, debug = false) {
         let deviceTypeList = [];
-        // Get the first DeviceTypeDefinition
         let firstDefinition;
         if (Array.isArray(definition)) {
             firstDefinition = definition[0];
@@ -162,7 +354,6 @@ export class MatterbridgeEndpoint extends Endpoint {
             firstDefinition = definition;
             deviceTypeList = [{ deviceType: firstDefinition.code, revision: firstDefinition.revision }];
         }
-        // Convert the first DeviceTypeDefinition to an EndpointType.Options
         const deviceTypeDefinitionV8 = {
             name: firstDefinition.name.replace('-', '_'),
             deviceType: firstDefinition.code,
@@ -170,18 +361,17 @@ export class MatterbridgeEndpoint extends Endpoint {
             deviceClass: firstDefinition.deviceClass.toLowerCase(),
             requirements: {
                 server: {
-                    mandatory: SupportedBehaviors(...MatterbridgeEndpoint.getBehaviourTypesFromClusterServerIds(firstDefinition.requiredServerClusters)),
-                    optional: SupportedBehaviors(...MatterbridgeEndpoint.getBehaviourTypesFromClusterServerIds(firstDefinition.optionalServerClusters)),
+                    mandatory: SupportedBehaviors(...getBehaviourTypesFromClusterServerIds(firstDefinition.requiredServerClusters)),
+                    optional: SupportedBehaviors(...getBehaviourTypesFromClusterServerIds(firstDefinition.optionalServerClusters)),
                 },
                 client: {
-                    mandatory: SupportedBehaviors(...MatterbridgeEndpoint.getBehaviourTypesFromClusterClientIds(firstDefinition.requiredClientClusters)),
-                    optional: SupportedBehaviors(...MatterbridgeEndpoint.getBehaviourTypesFromClusterClientIds(firstDefinition.optionalClientClusters)),
+                    mandatory: SupportedBehaviors(...getBehaviourTypesFromClusterClientIds(firstDefinition.requiredClientClusters)),
+                    optional: SupportedBehaviors(...getBehaviourTypesFromClusterClientIds(firstDefinition.optionalClientClusters)),
                 },
             },
             behaviors: options.tagList ? SupportedBehaviors(DescriptorServer.with(Descriptor.Feature.TagList)) : {},
         };
         const endpointV8 = MutableEndpoint(deviceTypeDefinitionV8);
-        // Convert the options to an Endpoint.Options
         const optionsV8 = {
             id: options.uniqueStorageKey?.replace(/[ .]/g, ''),
             number: options.endpointId,
@@ -199,294 +389,181 @@ export class MatterbridgeEndpoint extends Endpoint {
         }
         else
             this.deviceTypes.set(firstDefinition.code, firstDefinition);
-        // console.log('MatterbridgeEndpoint.option', options);
-        // console.log('MatterbridgeEndpoint.endpointV8', endpointV8);
-        // console.log('MatterbridgeEndpoint.optionsV8', optionsV8);
-        // Create the logger
-        this.log = new AnsiLogger({ logName: 'MatterbridgeEndpoint', logTimestampFormat: 4 /* TimestampFormat.TIME_MILLIS */, logLevel: debug === true ? "debug" /* LogLevel.DEBUG */ : MatterbridgeEndpoint.logLevel });
+        this.log = new AnsiLogger({ logName: 'MatterbridgeEndpoint', logTimestampFormat: 4, logLevel: debug === true ? "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}${options.uniqueStorageKey}${db} number: ${CYAN}${options.endpointId}${db} taglist: ${CYAN}${options.tagList ? debugStringify(options.tagList) : 'undefined'}${db}`);
-        // Add MatterbridgeBehavior with MatterbridgeBehaviorDevice
         this.behaviors.require(MatterbridgeBehavior, { deviceCommand: new MatterbridgeBehaviorDevice(this.log, this.commandHandler, undefined) });
     }
-    /**
-     * Loads an instance of the MatterbridgeEndpoint class.
-     *
-     * @param {DeviceTypeDefinition | AtLeastOne<DeviceTypeDefinition>} definition - The DeviceTypeDefinition(s) of the device.
-     * @param {MatterbridgeEndpointOptions} [options={}] - The options for the device.
-     * @param {boolean} [debug=false] - Debug flag.
-     * @returns {Promise<MatterbridgeEndpoint>} MatterbridgeEndpoint instance.
-     */
     static async loadInstance(definition, options = {}, debug = false) {
         return new MatterbridgeEndpoint(definition, options, debug);
     }
-    static getBehaviourTypesFromClusterServerIds(clusterServerList) {
-        // Map Server ClusterId to Behavior.Type
-        const behaviorTypes = [];
-        clusterServerList.forEach((clusterId) => {
-            behaviorTypes.push(MatterbridgeEndpoint.getBehaviourTypeFromClusterServerId(clusterId));
-        });
-        return behaviorTypes;
+    getDeviceTypes() {
+        return Array.from(this.deviceTypes.values());
     }
-    static getBehaviourTypesFromClusterClientIds(clusterClientList) {
-        // Map Client ClusterId to Behavior.Type
-        const behaviorTypes = [];
-        clusterClientList.forEach((clusterId) => {
-            // behaviorTypes.push(MatterbridgeEndpoint.getBehaviourTypeFromClusterClientId(clusterId));
-        });
-        return behaviorTypes;
-    }
-    static getBehaviourTypeFromClusterServerId(clusterId, subType) {
-        // Map ClusterId to Behavior.Type
-        if (clusterId === Identify.Cluster.id)
-            return MatterbridgeIdentifyServer;
-        if (clusterId === Groups.Cluster.id)
-            return GroupsServer;
-        if (clusterId === OnOff.Cluster.id && subType === undefined)
-            return MatterbridgeOnOffServer.with('Lighting');
-        if (clusterId === OnOff.Cluster.id && subType === '')
-            return MatterbridgeOnOffServer;
-        if (clusterId === OnOff.Cluster.id && subType === 'LightingOnOff')
-            return MatterbridgeOnOffServer.with('Lighting');
-        if (clusterId === OnOff.Cluster.id && subType === 'DeadFrontBehaviorOnOff')
-            return MatterbridgeOnOffServer.with('DeadFrontBehavior');
-        if (clusterId === LevelControl.Cluster.id)
-            return MatterbridgeLevelControlServer.with('OnOff', 'Lighting');
-        if (clusterId === ColorControl.Cluster.id && subType === undefined)
-            return MatterbridgeColorControlServer;
-        if (clusterId === ColorControl.Cluster.id && subType === 'CompleteColorControl')
-            return MatterbridgeColorControlServer;
-        if (clusterId === ColorControl.Cluster.id && subType === 'XyColorControl')
-            return MatterbridgeColorControlServer.with('Xy', 'ColorTemperature');
-        if (clusterId === ColorControl.Cluster.id && subType === 'HueSaturationColorControl')
-            return MatterbridgeColorControlServer.with('HueSaturation', 'ColorTemperature');
-        if (clusterId === ColorControl.Cluster.id && subType === 'ColorTemperatureColorControl')
-            return MatterbridgeColorControlServer.with('ColorTemperature');
-        if (clusterId === DoorLock.Cluster.id)
-            return MatterbridgeDoorLockServer;
-        if (clusterId === Thermostat.Cluster.id && subType === undefined)
-            return MatterbridgeThermostatServer.with('AutoMode', 'Heating', 'Cooling');
-        if (clusterId === Thermostat.Cluster.id && subType === 'AutoModeThermostat')
-            return MatterbridgeThermostatServer.with('AutoMode', 'Heating', 'Cooling');
-        if (clusterId === Thermostat.Cluster.id && subType === 'HeatingThermostat')
-            return MatterbridgeThermostatServer.with('Heating');
-        if (clusterId === Thermostat.Cluster.id && subType === 'CoolingThermostat')
-            return MatterbridgeThermostatServer.with('Cooling');
-        if (clusterId === WindowCovering.Cluster.id)
-            return MatterbridgeWindowCoveringServer;
-        if (clusterId === FanControl.Cluster.id)
-            return MatterbridgeFanControlServer;
-        if (clusterId === Switch.Cluster.id && subType === undefined)
-            return SwitchServer.with('MomentarySwitch', 'MomentarySwitchRelease', 'MomentarySwitchLongPress', 'MomentarySwitchMultiPress');
-        if (clusterId === Switch.Cluster.id && subType === 'MomentarySwitch')
-            return SwitchServer.with('MomentarySwitch', 'MomentarySwitchRelease', 'MomentarySwitchLongPress', 'MomentarySwitchMultiPress');
-        if (clusterId === Switch.Cluster.id && subType === '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;
-        if (clusterId === FlowMeasurement.Cluster.id)
-            return FlowMeasurementServer;
-        if (clusterId === BooleanState.Cluster.id)
-            return BooleanStateServer.enable({ events: { stateChange: true } });
-        if (clusterId === BooleanStateConfiguration.Cluster.id)
-            return MatterbridgeBooleanStateConfigurationServer;
-        if (clusterId === OccupancySensing.Cluster.id)
-            return OccupancySensingServer;
-        if (clusterId === IlluminanceMeasurement.Cluster.id)
-            return IlluminanceMeasurementServer;
-        if (clusterId === SmokeCoAlarm.Cluster.id)
-            return SmokeCoAlarmServer.with('SmokeAlarm', 'CoAlarm');
-        if (clusterId === ValveConfigurationAndControl.Cluster.id)
-            return MatterbridgeValveConfigurationAndControlServer.with('Level');
-        if (clusterId === AirQuality.Cluster.id)
-            return AirQualityServer.with('Fair', 'Moderate', 'VeryPoor', '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 && subType === undefined)
-            return PowerSourceServer;
-        if (clusterId === PowerSource.Cluster.id && subType === 'WiredPowerSource')
-            return PowerSourceServer.with(PowerSource.Feature.Wired);
-        if (clusterId === PowerSource.Cluster.id && subType === 'BatteryReplaceablePowerSource')
-            return PowerSourceServer.with(PowerSource.Feature.Battery, PowerSource.Feature.Replaceable);
-        if (clusterId === PowerSource.Cluster.id && subType === '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 MatterbridgeIdentifyServer;
+    hasClusterServer(cluster) {
+        const behavior = getBehavior(this, cluster);
+        if (behavior)
+            return this.behaviors.supported[behavior.id] !== undefined;
+        else
+            return false;
     }
-    static getBehaviourTypeFromClusterClientId(clusterId) {
-        // Map ClusterId to Behavior.Type
-        return IdentifyBehavior;
-    }
-    /**
-     * Adds a device type to the list of device types.
-     * If the device type is not already present in the list, it will be added.
-     *
-     * @param {DeviceTypeDefinition} deviceType - The device type to add.
-     *
-     * @deprecated This method is deprecated and will be removed in future versions. Use the constructor options instead.
-     */
-    addDeviceType(deviceType) {
-        if (!this.deviceTypes.has(deviceType.code)) {
-            // Keep the Matterbridge internal map
-            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,
-            }));
-            if (this.tagList) {
-                this.behaviors.require(DescriptorServer.with(Descriptor.Feature.TagList), {
-                    tagList: this.tagList,
-                    deviceTypeList,
-                });
-            }
-            else {
-                this.behaviors.require(DescriptorServer, {
-                    deviceTypeList,
-                });
-            }
+    hasAttributeServer(cluster, attribute) {
+        const behavior = getBehavior(this, cluster);
+        if (!behavior || !this.behaviors.supported[behavior.id])
+            return false;
+        const options = this.behaviors.optionsFor(behavior);
+        return lowercaseFirstLetter(attribute) in options;
+    }
+    getClusterServerOptions(cluster) {
+        const behavior = getBehavior(this, cluster);
+        if (!behavior)
+            return undefined;
+        return this.behaviors.optionsFor(behavior);
+    }
+    getAttribute(clusterId, attribute, log) {
+        const clusterName = lowercaseFirstLetter(getClusterNameById(clusterId));
+        if (this.construction.status !== Lifecycle.Status.Active) {
+            this.log.error(`getAttribute ${hk}${clusterName}.${attribute}${er} error: Endpoint ${or}${this.maybeId}${er}:${or}${this.maybeNumber}${er} is in the ${BLUE}${this.construction.status}${er} state`);
+            return undefined;
+        }
+        const state = this.state;
+        if (!(clusterName in state)) {
+            this.log.error(`getAttribute error: Cluster ${'0x' + clusterId.toString(16).padStart(4, '0')}:${clusterName} not found on endpoint ${or}${this.id}${er}:${or}${this.number}${er}`);
+            return undefined;
+        }
+        attribute = lowercaseFirstLetter(attribute);
+        if (!(attribute in state[clusterName])) {
+            this.log.error(`getAttribute error: Attribute ${hk}${attribute}${er} not found on Cluster ${'0x' + clusterId.toString(16).padStart(4, '0')}:${clusterName} on endpoint ${or}${this.id}${er}:${or}${this.number}${er}`);
+            return undefined;
         }
+        const value = state[clusterName][attribute];
+        log?.info(`${db}Get endpoint ${or}${this.id}${db}:${or}${this.number}${db} attribute ${hk}${capitalizeFirstLetter(clusterName)}${db}.${hk}${attribute}${db} value ${YELLOW}${value !== null && typeof value === 'object' ? debugStringify(value) : value}${db}`);
+        return value;
     }
-    /**
-     * Adds one or more device types with the required cluster servers and the specified cluster servers.
-     *
-     * @param {AtLeastOne<DeviceTypeDefinition>} deviceTypes - The device types to add.
-     * @param {ClusterId[]} includeServerList - The list of cluster IDs to include.
-     *
-     * @deprecated This method is deprecated and will be removed in future versions. Use the constructor options instead.
-     */
-    addDeviceTypeWithClusterServer(deviceTypes, includeServerList) {
-        this.log.debug('addDeviceTypeWithClusterServer:');
-        deviceTypes.forEach((deviceType) => {
-            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) => {
-            if (!this.getClusterServerById(clusterId)) {
-                this.log.debug(`- with cluster: ${hk}${'0x' + clusterId.toString(16).padStart(4, '0')}${db}-${hk}${getClusterNameById(clusterId)}${db}`);
-            }
-            else {
-                includeServerList.splice(includeServerList.indexOf(clusterId), 1);
-            }
-        });
-        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.maybeId}${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);
+    async setAttribute(clusterId, attribute, value, log) {
+        const clusterName = lowercaseFirstLetter(getClusterNameById(clusterId));
+        if (this.construction.status !== Lifecycle.Status.Active) {
+            this.log.error(`setAttribute ${hk}${clusterName}.${attribute}${er} error: Endpoint ${or}${this.maybeId}${er}:${or}${this.maybeNumber}${er} is in the ${BLUE}${this.construction.status}${er} state`);
+            return false;
+        }
+        const state = this.state;
+        if (!(clusterName in state)) {
+            this.log.error(`setAttribute ${hk}${attribute}${er} error: Cluster ${'0x' + clusterId.toString(16).padStart(4, '0')}:${clusterName} not found on endpoint ${or}${this.id}${er}:${or}${this.number}${er}`);
+            return false;
+        }
+        attribute = lowercaseFirstLetter(attribute);
+        if (!(attribute in state[clusterName])) {
+            this.log.error(`setAttribute error: Attribute ${hk}${attribute}${er} not found on Cluster ${'0x' + clusterId.toString(16).padStart(4, '0')}:${clusterName} on endpoint ${or}${this.id}${er}:${or}${this.number}${er}`);
+            return false;
+        }
+        let oldValue = state[clusterName][attribute];
+        if (typeof oldValue === 'object')
+            oldValue = deepCopy(oldValue);
+        await this.setStateOf(this.behaviors.supported[clusterName], { [attribute]: value });
+        log?.info(`${db}Set endpoint ${or}${this.id}${db}:${or}${this.number}${db} attribute ${hk}${capitalizeFirstLetter(clusterName)}${db}.${hk}${attribute}${db} ` +
+            `from ${YELLOW}${oldValue !== null && typeof oldValue === 'object' ? debugStringify(oldValue) : oldValue}${db} ` +
+            `to ${YELLOW}${value !== null && typeof value === 'object' ? debugStringify(value) : value}${db}`);
+        return true;
+    }
+    async subscribeAttribute(clusterId, attribute, listener, log) {
+        const clusterName = lowercaseFirstLetter(getClusterNameById(clusterId));
+        if (this.construction.status !== Lifecycle.Status.Active) {
+            await this.construction.ready;
+        }
+        const events = this.events;
+        if (!(clusterName in events)) {
+            this.log.error(`subscribeAttribute ${hk}${attribute}${er} error: Cluster ${'0x' + clusterId.toString(16).padStart(4, '0')}:${clusterName} not found on endpoint ${or}${this.maybeId}${er}:${or}${this.maybeNumber}${er}`);
+            return false;
+        }
+        attribute = lowercaseFirstLetter(attribute) + '$Changed';
+        if (!(attribute in events[clusterName])) {
+            this.log.error(`subscribeAttribute error: Attribute ${hk}${attribute}${er} not found on Cluster ${'0x' + clusterId.toString(16).padStart(4, '0')}:${clusterName} on endpoint ${or}${this.maybeId}${er}:${or}${this.maybeNumber}${er}`);
+            return false;
+        }
+        events[clusterName][attribute].on(listener);
+        log?.info(`${db}Subscribed endpoint ${or}${this.id}${db}:${or}${this.number}${db} attribute ${hk}${capitalizeFirstLetter(clusterName)}${db}.${hk}${attribute}${db}`);
+        return true;
+    }
+    async triggerEvent(clusterId, event, payload, log, endpoint) {
+        if (!endpoint)
+            endpoint = this;
+        const clusterName = lowercaseFirstLetter(getClusterNameById(clusterId));
+        if (endpoint.construction.status !== Lifecycle.Status.Active) {
+            this.log.error(`triggerEvent ${hk}${clusterName}.${event}${er} error: Endpoint ${or}${endpoint.maybeId}${er}:${or}${endpoint.maybeNumber}${er} is in the ${BLUE}${endpoint.construction.status}${er} state`);
+            return false;
+        }
+        const events = endpoint.events;
+        if (!(clusterName in events) || !(event in events[clusterName])) {
+            this.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;
+        }
+        await endpoint.act((agent) => agent[clusterName].events[event].emit(payload, agent.context));
+        log?.info(`${db}Trigger event ${hk}${capitalizeFirstLetter(clusterName)}${db}.${hk}${event}${db} with ${debugStringify(payload)}${db} on endpoint ${or}${endpoint.id}${db}:${or}${endpoint.number}${db} `);
+        return true;
+    }
+    addClusterServers(serverList) {
+        addClusterServers(this, serverList);
+    }
+    async addFixedLabel(label, value) {
+        if (!this.hasClusterServer(FixedLabel.Cluster.id)) {
+            this.log.debug(`addFixedLabel: add cluster ${hk}FixedLabel${db}:${hk}fixedLabel${db} with label ${CYAN}${label}${db} value ${CYAN}${value}${db}`);
+            this.behaviors.require(FixedLabelServer, {
+                labelList: [{ label, value }],
             });
-        });
-        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);
+            return this;
+        }
+        this.log.debug(`addFixedLabel: add label ${CYAN}${label}${db} value ${CYAN}${value}${db}`);
+        const labelList = (this.getAttribute(FixedLabel.Cluster.id, 'labelList', this.log) ?? []).filter((entryLabel) => entryLabel.label !== label);
+        labelList.push({ label, value });
+        await this.setAttribute(FixedLabel.Cluster.id, 'labelList', labelList, this.log);
+        return this;
+    }
+    async addUserLabel(label, value) {
+        if (!this.hasClusterServer(UserLabel.Cluster.id)) {
+            this.log.debug(`addUserLabel: add cluster ${hk}UserLabel${db}:${hk}userLabel${db} with label ${CYAN}${label}${db} value ${CYAN}${value}${db}`);
+            this.behaviors.require(UserLabelServer, {
+                labelList: [{ label, value }],
             });
-        });
-        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 the specified device types and options.
-     * If the child endpoint is not already present, it will be created and added.
-     * If the child endpoint is already present, the device types will be added to the existing child endpoint.
-     *
-     * @param {string} endpointName - The name of the new endpoint to add.
-     * @param {DeviceTypeDefinition | AtLeastOne<DeviceTypeDefinition>} definition - The device types to add.
-     * @param {MatterbridgeEndpointOptions} [options={}] - The options for the endpoint.
-     * @param {boolean} [debug=false] - Whether to enable debug logging.
-     * @returns {MatterbridgeEndpoint} - The child endpoint that was found or added.
-     *
-     * @example
-     * ```typescript
-     * const endpoint = device.addChildDeviceType('Temperature', [temperatureSensor], { tagList: [{ mfgCode: null, namespaceId: LocationTag.Indoor.namespaceId, tag: LocationTag.Indoor.tag, label: null }] }, true);
-     * ```
-     */
+            return this;
+        }
+        this.log.debug(`addUserLabel: add label ${CYAN}${label}${db} value ${CYAN}${value}${db}`);
+        const labelList = (this.getAttribute(UserLabel.Cluster.id, 'labelList', this.log) ?? []).filter((entryLabel) => entryLabel.label !== label);
+        labelList.push({ label, value });
+        await this.setAttribute(UserLabel.Cluster.id, 'labelList', labelList, this.log);
+        return this;
+    }
+    addCommandHandler(command, handler) {
+        this.commandHandler.addHandler(command, handler);
+        return this;
+    }
+    async executeCommandHandler(command, request) {
+        await this.commandHandler.executeHandler(command, { request });
+    }
+    addRequiredClusterServers() {
+        addRequiredClusterServers(this);
+        return this;
+    }
+    addOptionalClusterServers() {
+        addOptionalClusterServers(this);
+        return this;
+    }
     addChildDeviceType(endpointName, definition, options = {}, debug = false) {
         this.log.debug(`addChildDeviceType: ${CYAN}${endpointName}${db}`);
+        let alreadyAdded = false;
         let child = this.getChildEndpointByName(endpointName);
-        if (!child) {
+        if (child) {
+            this.log.debug(`****- endpoint ${CYAN}${endpointName}${db} already added!`);
+            alreadyAdded = true;
+        }
+        else {
             if ('tagList' in options) {
                 for (const tag of options.tagList) {
                     this.log.debug(`- with tagList: mfgCode ${CYAN}${tag.mfgCode}${db} namespaceId ${CYAN}${tag.namespaceId}${db} tag ${CYAN}${tag.tag}${db} label ${CYAN}${tag.label}${db}`);
                 }
-                child = new MatterbridgeEndpoint(definition, { uniqueStorageKey: endpointName, tagList: options.tagList }, debug);
+                child = new MatterbridgeEndpoint(definition, { uniqueStorageKey: endpointName, endpointId: options.endpointId, tagList: options.tagList }, debug);
             }
             else {
-                child = new MatterbridgeEndpoint(definition, { uniqueStorageKey: endpointName }, debug);
+                child = new MatterbridgeEndpoint(definition, { uniqueStorageKey: endpointName, endpointId: options.endpointId }, debug);
             }
         }
         if (Array.isArray(definition)) {
@@ -497,6 +574,8 @@ export class MatterbridgeEndpoint extends Endpoint {
         else {
             this.log.debug(`- with deviceType: ${zb}${'0x' + definition.code.toString(16).padStart(4, '0')}${db}-${zb}${definition.name}${db}`);
         }
+        if (alreadyAdded)
+            return child;
         if (this.lifecycle.isInstalled) {
             this.log.debug(`- with lifecycle installed`);
             this.add(child);
@@ -507,62 +586,58 @@ export class MatterbridgeEndpoint extends Endpoint {
         }
         return child;
     }
-    /**
-     * 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.
-     * If the child endpoint is already present in the childEndpoints, the device types and cluster servers will be added to the existing child endpoint.
-     *
-     * @param {string} endpointName - The name of the new enpoint to add.
-     * @param {DeviceTypeDefinition | AtLeastOne<DeviceTypeDefinition>} definition - The device types to add.
-     * @param {ClusterId[]} [includeServerList=[]] - The list of cluster IDs to include.
-     * @param {MatterbridgeEndpointOptions} [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.
-     *
-     * @example
-     * ```typescript
-     * const endpoint = device.addChildDeviceTypeWithClusterServer('Temperature', [temperatureSensor], [], { tagList: [{ mfgCode: null, namespaceId: LocationTag.Indoor.namespaceId, tag: LocationTag.Indoor.tag, label: null }] }, true);
-     * ```
-     */
-    addChildDeviceTypeWithClusterServer(endpointName, definition, includeServerList = [], options = {}, debug = false) {
+    addChildDeviceTypeWithClusterServer(endpointName, definition, serverList = [], options = {}, debug = false) {
         this.log.debug(`addChildDeviceTypeWithClusterServer: ${CYAN}${endpointName}${db}`);
+        let alreadyAdded = false;
         let child = this.getChildEndpointByName(endpointName);
-        if (!child) {
+        if (child) {
+            this.log.debug(`****- endpoint ${CYAN}${endpointName}${db} already added!`);
+            alreadyAdded = true;
+        }
+        else {
             if ('tagList' in options) {
                 for (const tag of options.tagList) {
                     this.log.debug(`- with tagList: mfgCode ${CYAN}${tag.mfgCode}${db} namespaceId ${CYAN}${tag.namespaceId}${db} tag ${CYAN}${tag.tag}${db} label ${CYAN}${tag.label}${db}`);
                 }
-                child = new MatterbridgeEndpoint(definition, { uniqueStorageKey: endpointName, tagList: options.tagList }, debug);
+                child = new MatterbridgeEndpoint(definition, { uniqueStorageKey: endpointName, endpointId: options.endpointId, tagList: options.tagList }, debug);
             }
             else {
-                child = new MatterbridgeEndpoint(definition, { uniqueStorageKey: endpointName }, debug);
+                child = new MatterbridgeEndpoint(definition, { uniqueStorageKey: endpointName, endpointId: options.endpointId }, debug);
             }
         }
         if (Array.isArray(definition)) {
             definition.forEach((deviceType) => {
                 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);
+                    if (!serverList.includes(clusterId))
+                        serverList.push(clusterId);
                 });
             });
         }
         else {
             this.log.debug(`- with deviceType: ${zb}${'0x' + definition.code.toString(16).padStart(4, '0')}${db}-${zb}${definition.name}${db}`);
             definition.requiredServerClusters.forEach((clusterId) => {
-                if (!includeServerList.includes(clusterId))
-                    includeServerList.push(clusterId);
+                if (!serverList.includes(clusterId))
+                    serverList.push(clusterId);
             });
         }
-        includeServerList.forEach((clusterId) => {
-            if (!child.getClusterServerById(clusterId)) {
+        serverList.forEach((clusterId) => {
+            if (!child.hasClusterServer(clusterId)) {
                 this.log.debug(`- with cluster: ${hk}${'0x' + clusterId.toString(16).padStart(4, '0')}${db}-${hk}${getClusterNameById(clusterId)}${db}`);
             }
             else {
-                includeServerList.splice(includeServerList.indexOf(clusterId), 1);
+                serverList.splice(serverList.indexOf(clusterId), 1);
             }
         });
-        this.addClusterServerFromList(child, includeServerList);
+        if (alreadyAdded) {
+            serverList.forEach((clusterId) => {
+                if (child.hasClusterServer(clusterId))
+                    serverList.splice(serverList.indexOf(clusterId), 1);
+            });
+        }
+        addClusterServers(child, serverList);
+        if (alreadyAdded)
+            return child;
         if (this.lifecycle.isInstalled) {
             this.log.debug(`- with lifecycle installed`);
             this.add(child);
@@ -573,596 +648,108 @@ export class MatterbridgeEndpoint extends Endpoint {
         }
         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);
     }
-    /**
-     * Retrieves a child endpoint by its EndpointNumber.
-     *
-     * @param {EndpointNumber} endpointNumber - The EndpointNumber of the endpoint to retrieve.
-     * @returns {MatterbridgeEndpoint | undefined} The child endpoint with the specified EndpointNumber, or undefined if not found.
-     */
     getChildEndpoint(endpointNumber) {
         return this.parts.find((part) => part.number === endpointNumber);
     }
-    /**
-     * Get all the child endpoints of this endpoint.
-     *
-     * @returns {MatterbridgeEndpoint[]} The child endpoints.
-     */
     getChildEndpoints() {
         return Array.from(this.parts);
     }
-    /**
-     * Get all the device types of this endpoint.
-     *
-     * @returns {DeviceTypeDefinition[]} The device types of this endpoint.
-     */
-    getDeviceTypes() {
-        return Array.from(this.deviceTypes.values());
-    }
-    /**
-     * Sets the device types.
-     *
-     * @param {AtLeastOne<DeviceTypeDefinition>} deviceTypes - The device types to set.
-     *
-     * @deprecated This method is deprecated and will be removed in future versions.
-     */
-    setDeviceTypes(deviceTypes) {
-        deviceTypes.forEach((deviceType) => {
-            this.addDeviceType(deviceType);
-        });
-    }
-    /**
-     * Sets the device reachable attribute and trigger the event.
-     *
-     * @param {boolean} reachable - The device types to set.
-     *
-     * @deprecated This method is deprecated and will be removed in future versions.
-     */
-    async setBridgedDeviceReachability(reachable) {
-        // await this.setAttribute(BridgedDeviceBasicInformationCluster.id, 'reachable', reachable, this.log);
-        // await this.triggerEvent(BridgedDeviceBasicInformationCluster.id, 'reachableChanged', { reachableNewValue: reachable }, this.log);
-    }
-    /**
-     * @deprecated This method is deprecated and will be removed in future versions.
-     */
-    hasClusterServer(cluster) {
-        // const clusterName = this.lowercaseFirstLetter(getClusterNameById(cluster.id));
-        // return this.behaviors.supported[clusterName] !== undefined;
-        return this.clusterServers.has(cluster.id);
-    }
-    /**
-     * @deprecated This method is deprecated and will be removed in future versions.
-     */
-    getClusterServer(cluster) {
-        const clusterServer = this.clusterServers.get(cluster.id);
-        if (clusterServer !== undefined) {
-            return clusterServer;
-        }
-    }
-    /**
-     * @deprecated This method is deprecated and will be removed in future versions.
-     */
-    getClusterServerById(clusterId) {
-        return this.clusterServers.get(clusterId);
-    }
-    /**
-     * @deprecated This method is deprecated and will be removed in future versions.
-     */
-    getAllClusterServers() {
-        return [...this.clusterServers.values()];
-    }
-    /**
-     * Add a tagList.
-     *
-     * @deprecated This method is deprecated and will be removed in future versions. Use the constructor options instead.
-     */
-    addTagList(endpoint, mfgCode, namespaceId, tag, label) {
-        // Do nothing here only for old api compatibility
-    }
-    addClusterServer(cluster) {
-        // console.log('addClusterServer:', cluster.id, cluster.name, cluster.attributes, cluster.events, cluster.commands);
-        let features = {};
-        // 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.name === 'featureMap') {
-                // eslint-disable-next-line @typescript-eslint/no-explicit-any
-                features = attribute.value;
-                // console.log('Cluster', cluster.name, 'FeatureMap:', features);
-                // options[(attribute as any).name] = (attribute as any).value;
-            }
-            // eslint-disable-next-line @typescript-eslint/no-explicit-any
-            if (attribute.id < 0xfff0) {
-                // eslint-disable-next-line @typescript-eslint/no-explicit-any
-                options[attribute.name] = attribute.value;
-            }
-        }
-        this.log.debug(`addClusterServer: ${hk}${'0x' + cluster.id.toString(16).padStart(4, '0')}${db}-${hk}${getClusterNameById(cluster.id)}${db} with options: ${debugStringify(options)}${rs}`);
-        if (this.clusterServers.has(cluster.id)) {
-            this.log.debug(`****cluster ${hk}${'0x' + cluster.id.toString(16).padStart(4, '0')}${db}-${hk}${getClusterNameById(cluster.id)}${db} already added`);
-        }
-        this.subType = '';
-        if (cluster.id === OnOffCluster.id && features['lighting'])
-            this.subType = 'LightingOnOff';
-        if (cluster.id === OnOffCluster.id && features['deadFrontBehavior'])
-            this.subType = 'DeadFrontBehaviorOnOff';
-        if (cluster.id === ColorControl.Cluster.id && cluster.isAttributeSupportedByName('currentX') && !cluster.isAttributeSupportedByName('currentHue'))
-            this.subType = 'XyColorControl';
-        else if (cluster.id === ColorControl.Cluster.id && cluster.isAttributeSupportedByName('currentHue') && !cluster.isAttributeSupportedByName('currentX'))
-            this.subType = 'HueSaturationColorControl';
-        else if (cluster.id === ColorControl.Cluster.id && cluster.isAttributeSupportedByName('colorTemperatureMireds') && !cluster.isAttributeSupportedByName('currentHue') && !cluster.isAttributeSupportedByName('currentX'))
-            this.subType = 'ColorTemperatureColorControl';
-        else if (cluster.id === ColorControl.Cluster.id)
-            this.subType = 'CompleteColorControl';
-        if (cluster.id === SwitchCluster.id && cluster.isEventSupportedByName('multiPressComplete'))
-            this.subType = 'MomentarySwitch';
-        if (cluster.id === SwitchCluster.id && cluster.isEventSupportedByName('switchLatched'))
-            this.subType = 'LatchingSwitch';
-        if (cluster.id === PowerSourceCluster.id && cluster.isAttributeSupportedByName('wiredCurrentType'))
-            this.subType = 'WiredPowerSource';
-        if (cluster.id === PowerSourceCluster.id && cluster.isAttributeSupportedByName('batReplacementDescription'))
-            this.subType = 'BatteryReplaceablePowerSource';
-        if (cluster.id === PowerSourceCluster.id && cluster.isAttributeSupportedByName('batChargeState'))
-            this.subType = 'BatteryRechargeablePowerSource';
-        if (cluster.id === ThermostatCluster.id && cluster.isAttributeSupportedByName('occupiedCoolingSetpoint'))
-            this.subType = 'CoolingThermostat';
-        if (cluster.id === ThermostatCluster.id && cluster.isAttributeSupportedByName('occupiedHeatingSetpoint'))
-            this.subType = 'HeatingThermostat';
-        if (cluster.id === ThermostatCluster.id && cluster.isAttributeSupportedByName('minSetpointDeadBand'))
-            this.subType = 'AutoModeThermostat';
-        const behavior = MatterbridgeEndpoint.getBehaviourTypeFromClusterServerId(cluster.id, this.subType);
-        this.clusterServers.set(cluster.id, cluster);
-        if (cluster.id === BasicInformationCluster.id)
-            return; // Not used in Matterbridge edge for devices. Only on server node.
-        this.behaviors.require(behavior, options);
-    }
-    /**
-     * Adds cluster servers to the specified endpoint based on the provided server list.
-     *
-     * @param {MatterbridgeEndpoint} endpoint - The endpoint to add cluster servers to.
-     * @param {ClusterId[]} includeServerList - The list of cluster IDs to include.
-     * @returns void
-     */
-    addClusterServerFromList(endpoint, includeServerList) {
-        if (includeServerList.includes(Identify.Cluster.id))
-            endpoint.addClusterServer(this.getDefaultIdentifyClusterServer());
-        if (includeServerList.includes(Groups.Cluster.id))
-            endpoint.addClusterServer(this.getDefaultGroupsClusterServer());
-        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.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(WindowCovering.Cluster.id))
-            endpoint.addClusterServer(this.getDefaultWindowCoveringClusterServer());
-        if (includeServerList.includes(FanControl.Cluster.id))
-            endpoint.addClusterServer(this.getDefaultFanControlClusterServer());
-        if (includeServerList.includes(TemperatureMeasurement.Cluster.id))
-            endpoint.addClusterServer(this.getDefaultTemperatureMeasurementClusterServer());
-        if (includeServerList.includes(RelativeHumidityMeasurement.Cluster.id))
-            endpoint.addClusterServer(this.getDefaultRelativeHumidityMeasurementClusterServer());
-        if (includeServerList.includes(PressureMeasurement.Cluster.id))
-            endpoint.addClusterServer(this.getDefaultPressureMeasurementClusterServer());
-        if (includeServerList.includes(FlowMeasurement.Cluster.id))
-            endpoint.addClusterServer(this.getDefaultFlowMeasurementClusterServer());
-        if (includeServerList.includes(BooleanState.Cluster.id))
-            endpoint.addClusterServer(this.getDefaultBooleanStateClusterServer());
-        if (includeServerList.includes(BooleanStateConfiguration.Cluster.id))
-            endpoint.addClusterServer(this.getDefaultBooleanStateConfigurationClusterServer());
-        if (includeServerList.includes(OccupancySensing.Cluster.id))
-            endpoint.addClusterServer(this.getDefaultOccupancySensingClusterServer());
-        if (includeServerList.includes(IlluminanceMeasurement.Cluster.id))
-            endpoint.addClusterServer(this.getDefaultIlluminanceMeasurementClusterServer());
-        if (includeServerList.includes(PowerSource.Cluster.id))
-            endpoint.addClusterServer(this.getDefaultPowerSourceWiredClusterServer());
-        if (includeServerList.includes(PowerTopology.Cluster.id))
-            endpoint.addClusterServer(this.getDefaultPowerTopologyClusterServer());
-        if (includeServerList.includes(ElectricalPowerMeasurement.Cluster.id))
-            endpoint.addClusterServer(this.getDefaultElectricalPowerMeasurementClusterServer());
-        if (includeServerList.includes(ElectricalEnergyMeasurement.Cluster.id))
-            endpoint.addClusterServer(this.getDefaultElectricalEnergyMeasurementClusterServer());
-        if (includeServerList.includes(SmokeCoAlarm.Cluster.id))
-            endpoint.addClusterServer(this.getDefaultSmokeCOAlarmClusterServer());
-        if (includeServerList.includes(AirQuality.Cluster.id))
-            endpoint.addClusterServer(this.getDefaultAirQualityClusterServer());
-        if (includeServerList.includes(CarbonMonoxideConcentrationMeasurement.Cluster.id))
-            endpoint.addClusterServer(this.getDefaultCarbonMonoxideConcentrationMeasurementClusterServer());
-        if (includeServerList.includes(CarbonDioxideConcentrationMeasurement.Cluster.id))
-            endpoint.addClusterServer(this.getDefaultCarbonDioxideConcentrationMeasurementClusterServer());
-        if (includeServerList.includes(NitrogenDioxideConcentrationMeasurement.Cluster.id))
-            endpoint.addClusterServer(this.getDefaultNitrogenDioxideConcentrationMeasurementClusterServer());
-        if (includeServerList.includes(OzoneConcentrationMeasurement.Cluster.id))
-            endpoint.addClusterServer(this.getDefaultOzoneConcentrationMeasurementClusterServer());
-        if (includeServerList.includes(FormaldehydeConcentrationMeasurement.Cluster.id))
-            endpoint.addClusterServer(this.getDefaultFormaldehydeConcentrationMeasurementClusterServer());
-        if (includeServerList.includes(Pm1ConcentrationMeasurement.Cluster.id))
-            endpoint.addClusterServer(this.getDefaultPm1ConcentrationMeasurementClusterServer());
-        if (includeServerList.includes(Pm25ConcentrationMeasurement.Cluster.id))
-            endpoint.addClusterServer(this.getDefaultPm25ConcentrationMeasurementClusterServer());
-        if (includeServerList.includes(Pm10ConcentrationMeasurement.Cluster.id))
-            endpoint.addClusterServer(this.getDefaultPm10ConcentrationMeasurementClusterServer());
-        if (includeServerList.includes(RadonConcentrationMeasurement.Cluster.id))
-            endpoint.addClusterServer(this.getDefaultRadonConcentrationMeasurementClusterServer());
-        if (includeServerList.includes(TotalVolatileOrganicCompoundsConcentrationMeasurement.Cluster.id))
-            endpoint.addClusterServer(this.getDefaultTvocMeasurementClusterServer());
-        // if (includeServerList.includes(DeviceEnergyManagement.Cluster.id)) endpoint.addClusterServer(this.getDefaultDeviceEnergyManagementClusterServer());
-        // if (includeServerList.includes(DeviceEnergyManagementMode.Cluster.id)) endpoint.addClusterServer(this.getDefaultDeviceEnergyManagementModeClusterServer());
-    }
-    async addFixedLabel(label, value) {
-        if (!this.clusterServers.get(FixedLabelCluster.id)) {
-            this.log.debug(`addFixedLabel: add cluster ${hk}FixedLabelCluster${db} with label ${CYAN}${label}${db} value ${CYAN}${value}${db}`);
-            this.addClusterServer(ClusterServer(FixedLabelCluster, {
-                labelList: [{ label, value }],
-            }, {}));
-            return;
-        }
-        this.log.debug(`addFixedLabel: add label ${CYAN}${label}${db} value ${CYAN}${value}${db}`);
-        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.log.debug(`addUserLabel: add cluster ${hk}UserLabelCluster${db} with label ${CYAN}${label}${db} value ${CYAN}${value}${db}`);
-            this.addClusterServer(ClusterServer(UserLabelCluster, {
-                labelList: [{ label, value }],
-            }, {}));
+    static serialize(device) {
+        if (!device.serialNumber || !device.deviceName || !device.uniqueId)
             return;
-        }
-        this.log.debug(`addUserLabel: add label ${CYAN}${label}${db} value ${CYAN}${value}${db}`);
-        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.
-     *
-     * @param {ClusterId} clusterId - The ID of the cluster to retrieve the attribute from.
-     * @param {string} attribute - The name of the attribute to retrieve.
-     * @param {AnsiLogger} [log] - Optional logger for error and info messages.
-     * @param {MatterbridgeEndpoint} [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.
-     */
-    // 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) {
-            this.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)) {
-            this.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])) {
-            this.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.
-     *
-     * @param {ClusterId} clusterId - The ID of the cluster.
-     * @param {string} attribute - The name of the attribute.
-     * @param {any} value - The value to set for the attribute.
-     * @param {AnsiLogger} [log] - (Optional) The logger to use for logging errors and information.
-     * @param {MatterbridgeEndpoint} [endpoint] - (Optional) The endpoint to set the attribute on. If not provided, the attribute will be set on the current endpoint.
-     * @returns {Promise<boolean>} - A promise that resolves to a boolean indicating whether the attribute was successfully set.
-     */
-    // 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) {
-            this.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)) {
-            this.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])) {
-            this.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 });
-        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.
-     *
-     * @param {ClusterId} clusterId - The ID of the cluster.
-     * @param {string} attribute - The name of the attribute to subscribe to.
-     * @param {(newValue: any, oldValue: any) => void} listener - A callback function that will be called when the attribute value changes.
-     * @param {AnsiLogger} [log] - Optional logger for logging errors and information.
-     * @param {MatterbridgeEndpoint} [endpoint] - Optional endpoint to subscribe the attribute on. Defaults to the current endpoint.
-     * @returns {boolean} - A boolean indicating whether the subscription was successful.
-     */
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    async subscribeAttribute(clusterId, attribute, listener, log, endpoint) {
-        if (!endpoint)
-            endpoint = this;
-        const clusterName = this.lowercaseFirstLetter(getClusterNameById(clusterId));
-        if (endpoint.construction.status !== Lifecycle.Status.Active) {
-            // this.log.error(`subscribeAttribute ${hk}${clusterName}.${attribute}${er} error: Endpoint ${or}${endpoint.id}${er} is in the ${BLUE}${endpoint.construction.status}${er} state`);
-            await endpoint.construction.ready;
-        }
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        const events = endpoint.events;
-        if (!(clusterName in events)) {
-            this.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])) {
-            this.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;
-        }
-        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;
-    }
-    /**
-     * Triggers an event on the specified cluster.
-     *
-     * @param {ClusterId} clusterId - The ID of the cluster.
-     * @param {string} event - The name of the event to trigger.
-     * @param {Record<string, boolean | number | bigint | string | object | undefined | null>} payload - The payload to pass to the event.
-     * @param {AnsiLogger} [log] - Optional logger for logging information.
-     * @param {MatterbridgeEndpoint} [endpoint] - Optional endpoint to trigger the event on. Defaults to the current endpoint.
-     * @returns {Promise<boolean>} - A promise that resolves to a boolean indicating whether the event was successfully triggered.
-     */
-    async triggerEvent(clusterId, event, payload, log, endpoint) {
-        if (!endpoint)
-            endpoint = this;
-        const clusterName = this.lowercaseFirstLetter(getClusterNameById(clusterId));
-        if (endpoint.construction.status !== Lifecycle.Status.Active) {
-            // this.log.error(`triggerEvent ${hk}${clusterName}.${event}${er} error: Endpoint ${or}${endpoint.id}${er} is in the ${BLUE}${endpoint.construction.status}${er} state`);
-            await endpoint.construction.ready;
-            // return false;
-        }
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        const events = endpoint.events;
-        if (!(clusterName in events) || !(event in events[clusterName])) {
-            this.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;
-        }
-        // 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;
-    }
-    /**
-     * Adds a command handler for the specified command.
-     *
-     * @param {keyof MatterbridgeEndpointCommands} command - The command to add the handler for.
-     * @param {(data: any) => void} handler - The handler function to execute when the command is received.
-     * @returns {void}
-     */
-    // 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.
-     *
-     * @param pluginName - The name of the plugin.
-     * @returns The serialized Matterbridge device object.
-     */
-    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: [],
+        const serialized = {
+            pluginName: device.plugin ?? '',
+            deviceName: device.deviceName,
+            serialNumber: device.serialNumber,
+            uniqueId: device.uniqueId,
+            productId: device.productId,
+            productName: device.productName,
+            vendorId: device.vendorId,
+            vendorName: device.vendorName,
+            deviceTypes: Array.from(device.deviceTypes.values()),
+            endpoint: device.maybeNumber,
+            endpointName: device.maybeId ?? device.deviceName,
+            clusterServersId: [],
         };
-        this.getAllClusterServers().forEach((clusterServer) => {
-          serialized.clusterServersId.push(clusterServer.id);
+        Object.keys(device.behaviors.supported).forEach((behaviorName) => {
+            if (behaviorName === 'bridgedDeviceBasicInformation')
+                serialized.clusterServersId.push(BridgedDeviceBasicInformation.Cluster.id);
+            if (behaviorName === 'powerSource')
+                serialized.clusterServersId.push(PowerSource.Cluster.id);
         });
         return serialized;
-        */
     }
-    /**
-     * Deserializes the device into a serialized object.
-     *
-     * @returns The deserialized MatterbridgeDevice.
-     */
     static deserialize(serializedDevice) {
-        return undefined;
-        /*
-        const device = new MatterbridgeDevice(serializedDevice.deviceTypes);
-        device.serialNumber = serializedDevice.serialNumber;
+        const device = new MatterbridgeEndpoint(serializedDevice.deviceTypes, { uniqueStorageKey: serializedDevice.endpointName, endpointId: serializedDevice.endpoint }, false);
+        device.plugin = serializedDevice.pluginName;
         device.deviceName = serializedDevice.deviceName;
+        device.serialNumber = serializedDevice.serialNumber;
         device.uniqueId = serializedDevice.uniqueId;
+        device.vendorId = serializedDevice.vendorId;
+        device.vendorName = serializedDevice.vendorName;
+        device.productId = serializedDevice.productId;
+        device.productName = serializedDevice.productName;
         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]);
+            if (clusterId === BridgedDeviceBasicInformation.Cluster.id)
+                device.createDefaultBridgedDeviceBasicInformationClusterServer(serializedDevice.deviceName, serializedDevice.serialNumber, serializedDevice.vendorId ?? 0xfff1, serializedDevice.vendorName ?? 'Matterbridge', serializedDevice.productName ?? 'Matterbridge device');
+            else if (clusterId === PowerSource.Cluster.id)
+                device.createDefaultPowerSourceWiredClusterServer();
         }
         return device;
-        */
-    }
-    /**
-     * From here copy paste from MatterbridgeDevice
-     */
-    /**
-     * Get a default IdentifyCluster server.
-     */
-    getDefaultIdentifyClusterServer(identifyTime = 0, identifyType = Identify.IdentifyType.None) {
-        return ClusterServer(IdentifyCluster, {
-            identifyTime,
-            identifyType,
-        }, {
-            identify: async (data) => {
-                // Never called in edge
-            },
-            triggerEffect: async (data) => {
-                // Never called in edge
-            },
-        });
     }
-    /**
-     * Creates a default IdentifyCluster server.
-     */
-    createDefaultIdentifyClusterServer(identifyTime = 0, identifyType = Identify.IdentifyType.None) {
-        this.addClusterServer(this.getDefaultIdentifyClusterServer(identifyTime, identifyType));
+    createDefaultPowerSourceWiredClusterServer(wiredCurrentType = PowerSource.WiredCurrentType.Ac) {
+        this.behaviors.require(PowerSourceServer.with(PowerSource.Feature.Wired), {
+            wiredCurrentType,
+            description: wiredCurrentType === PowerSource.WiredCurrentType.Ac ? 'AC Power' : 'DC Power',
+            status: PowerSource.PowerSourceStatus.Active,
+            order: 0,
+            endpointList: [],
+        });
         return this;
     }
-    /**
-     * Get a default IdentifyCluster server.
-     */
-    getDefaultGroupsClusterServer() {
-        return ClusterServer(GroupsCluster, {
-            nameSupport: {
-                nameSupport: true,
-            },
-        }, GroupsClusterHandler());
-    }
-    /**
-     * Creates a default groups cluster server and adds it to the device.
-     */
-    createDefaultGroupsClusterServer() {
-        this.addClusterServer(this.getDefaultGroupsClusterServer());
+    createDefaultPowerSourceReplaceableBatteryClusterServer(batPercentRemaining = 100, batChargeLevel = PowerSource.BatChargeLevel.Ok, batVoltage = 1500, batReplacementDescription = 'Battery type', batQuantity = 1) {
+        this.behaviors.require(PowerSourceServer.with(PowerSource.Feature.Battery, PowerSource.Feature.Replaceable), {
+            status: PowerSource.PowerSourceStatus.Active,
+            order: 0,
+            description: 'Primary battery',
+            batVoltage,
+            batPercentRemaining: Math.min(Math.max(batPercentRemaining * 2, 0), 200),
+            batChargeLevel,
+            batReplacementNeeded: false,
+            batReplaceability: PowerSource.BatReplaceability.UserReplaceable,
+            activeBatFaults: undefined,
+            batReplacementDescription,
+            batQuantity,
+            endpointList: [],
+        });
         return this;
     }
-    /**
-     * Get a default scenes cluster server and adds it to the current instance.
-     * @deprecated This method is deprecated.
-     *
-     */
-    getDefaultScenesClusterServer() {
-        /*
-        return ClusterServer(
-          ScenesCluster,
-          {
-            sceneCount: 0,
-            currentScene: 0,
-            currentGroup: GroupId(0),
-            sceneValid: false,
-            nameSupport: {
-              nameSupport: true,
-            },
-            lastConfiguredBy: null,
-          },
-          {},
-        );
-        */
-    }
-    /**
-     * Creates a default scenes cluster server and adds it to the current instance.
-     * @deprecated This method is deprecated.
-     */
-    createDefaultScenesClusterServer() {
-        /*
-        this.addClusterServer(this.getDefaultScenesClusterServer());
-        */
+    createDefaultPowerSourceRechargeableBatteryClusterServer(batPercentRemaining = 100, batChargeLevel = PowerSource.BatChargeLevel.Ok, batVoltage = 1500) {
+        this.behaviors.require(PowerSourceServer.with(PowerSource.Feature.Battery, PowerSource.Feature.Rechargeable), {
+            status: PowerSource.PowerSourceStatus.Active,
+            order: 0,
+            description: 'Primary battery',
+            batVoltage,
+            batPercentRemaining: Math.min(Math.max(batPercentRemaining * 2, 0), 200),
+            batTimeRemaining: 1,
+            batChargeLevel,
+            batReplacementNeeded: false,
+            batReplaceability: PowerSource.BatReplaceability.Unspecified,
+            activeBatFaults: undefined,
+            batChargeState: PowerSource.BatChargeState.IsNotCharging,
+            batFunctionalWhileCharging: true,
+            endpointList: [],
+        });
         return this;
     }
-    /**
-     * Creates a unique identifier based on the provided parameters.
-     * @param param1 - The first parameter.
-     * @param param2 - The second parameter.
-     * @param param3 - The third parameter.
-     * @param param4 - The fourth parameter.
-     * @returns A unique identifier generated using the MD5 hash algorithm.
-     */
-    createUniqueId(param1, param2, param3, param4) {
-        const hash = createHash('md5');
-        hash.update(param1 + param2 + param3 + param4);
-        return hash.digest('hex');
-    }
-    /**
-     * Get a default Basic Information Cluster Server.
-     *
-     * @param deviceName - The name of the device.
-     * @param serialNumber - The serial number of the device.
-     * @param vendorId - The vendor ID of the device.
-     * @param vendorName - The vendor name of the device.
-     * @param productId - The product ID of the device.
-     * @param productName - The product name of the device.
-     * @param softwareVersion - The software version of the device. Default is 1.
-     * @param softwareVersionString - The software version string of the device. Default is 'v.1.0.0'.
-     * @param hardwareVersion - The hardware version of the device. Default is 1.
-     * @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') {
+    createDefaultBasicInformationClusterServer(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.uniqueId = createUniqueId(deviceName, serialNumber, vendorName, productName);
         this.productId = productId;
         this.productName = productName;
         this.vendorId = vendorId;
@@ -1171,74 +758,21 @@ export class MatterbridgeEndpoint extends Endpoint {
         this.softwareVersionString = softwareVersionString;
         this.hardwareVersion = hardwareVersion;
         this.hardwareVersionString = hardwareVersionString;
-        return ClusterServer(BasicInformationCluster, {
-            dataModelRevision: 1,
-            location: 'XX',
-            vendorId: VendorId(vendorId),
-            vendorName: vendorName.slice(0, 32),
-            productId: productId,
-            productName: productName.slice(0, 32),
-            productUrl: this.productUrl,
-            productLabel: deviceName.slice(0, 64),
-            nodeLabel: deviceName.slice(0, 32),
-            serialNumber: serialNumber.slice(0, 32),
-            uniqueId: this.createUniqueId(deviceName, serialNumber, vendorName, productName),
-            softwareVersion,
-            softwareVersionString: softwareVersionString.slice(0, 64),
-            hardwareVersion,
-            hardwareVersionString: hardwareVersionString.slice(0, 64),
-            reachable: true,
-            capabilityMinima: { caseSessionsPerFabric: 3, subscriptionsPerFabric: 3 },
-            specificationVersion: Specification.SPECIFICATION_VERSION,
-            maxPathsPerInvoke: 1,
-        }, {}, {
-            startUp: true,
-            shutDown: true,
-            leave: true,
-            reachableChanged: true,
-        });
-    }
-    /**
-     * Creates a default Basic Information Cluster Server.
-     *
-     * @param deviceName - The name of the device.
-     * @param serialNumber - The serial number of the device.
-     * @param vendorId - The vendor ID of the device.
-     * @param vendorName - The vendor name of the device.
-     * @param productId - The product ID of the device.
-     * @param productName - The product name of the device.
-     * @param softwareVersion - The software version of the device. Default is 1.
-     * @param softwareVersionString - The software version string of the device. Default is 'v.1.0.0'.
-     * @param hardwareVersion - The hardware version of the device. Default is 1.
-     * @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') {
         if (MatterbridgeEndpoint.bridgeMode === 'bridge') {
-            this.addDeviceType(bridgedNode);
+            const options = this.getClusterServerOptions(Descriptor.Cluster.id);
+            if (options) {
+                const deviceTypeList = options.deviceTypeList;
+                deviceTypeList.push({ deviceType: bridgedNode.code, revision: bridgedNode.revision });
+            }
             this.createDefaultBridgedDeviceBasicInformationClusterServer(deviceName, serialNumber, vendorId, vendorName, productName, softwareVersion, softwareVersionString, hardwareVersion, hardwareVersionString);
-            return;
         }
-        this.addClusterServer(this.getDefaultBasicInformationClusterServer(deviceName, serialNumber, vendorId, vendorName, productId, productName, softwareVersion, softwareVersionString, hardwareVersion, hardwareVersionString));
         return this;
     }
-    /**
-     * Get a default BridgedDeviceBasicInformationClusterServer.
-     *
-     * @param deviceName - The name of the device.
-     * @param serialNumber - The serial number of the device.
-     * @param vendorId - The vendor ID of the device.
-     * @param vendorName - The name of the vendor.
-     * @param productName - The name of the product.
-     * @param softwareVersion - The software version of the device. Default is 1.
-     * @param softwareVersionString - The software version string of the device. Default is 'v.1.0.0'.
-     * @param hardwareVersion - The hardware version of the device. Default is 1.
-     * @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') {
+    createDefaultBridgedDeviceBasicInformationClusterServer(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.uniqueId = createUniqueId(deviceName, serialNumber, vendorName, productName);
         this.productId = undefined;
         this.productName = productName;
         this.vendorId = vendorId;
@@ -1247,248 +781,64 @@ export class MatterbridgeEndpoint extends Endpoint {
         this.softwareVersionString = softwareVersionString;
         this.hardwareVersion = hardwareVersion;
         this.hardwareVersionString = hardwareVersionString;
-        return ClusterServer(BridgedDeviceBasicInformationCluster, {
-            vendorId: vendorId !== undefined ? VendorId(vendorId) : undefined, // 4874
+        this.behaviors.require(BridgedDeviceBasicInformationServer.enable({
+            events: { leave: true, reachableChanged: true },
+        }), {
+            vendorId: vendorId !== undefined ? VendorId(vendorId) : undefined,
             vendorName: vendorName.slice(0, 32),
             productName: productName.slice(0, 32),
             productUrl: this.productUrl,
             productLabel: deviceName.slice(0, 64),
             nodeLabel: deviceName.slice(0, 32),
             serialNumber: serialNumber.slice(0, 32),
-            uniqueId: this.createUniqueId(deviceName, serialNumber, vendorName, productName),
+            uniqueId: this.uniqueId,
             softwareVersion,
             softwareVersionString: softwareVersionString.slice(0, 64),
             hardwareVersion,
             hardwareVersionString: hardwareVersionString.slice(0, 64),
             reachable: true,
-        }, {}, {
-            startUp: true,
-            shutDown: true,
-            leave: true,
-            reachableChanged: true,
         });
-    }
-    /**
-     * Creates a default BridgedDeviceBasicInformationClusterServer.
-     *
-     * @param deviceName - The name of the device.
-     * @param serialNumber - The serial number of the device.
-     * @param vendorId - The vendor ID of the device.
-     * @param vendorName - The name of the vendor.
-     * @param productName - The name of the product.
-     * @param softwareVersion - The software version of the device. Default is 1.
-     * @param softwareVersionString - The software version string of the device. Default is 'v.1.0.0'.
-     * @param hardwareVersion - The hardware version of the device. Default is 1.
-     * @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.addClusterServer(this.getDefaultBridgedDeviceBasicInformationClusterServer(deviceName, serialNumber, vendorId, vendorName, productName, softwareVersion, softwareVersionString, hardwareVersion, hardwareVersionString));
         return this;
     }
-    /**
-     * Get a default Power Topology Cluster Server. Only needed for an electricalSensor device type.
-     *
-     * @returns {ClusterServer} - The configured Power Topology Cluster Server.
-     */
-    getDefaultPowerTopologyClusterServer() {
-        return ClusterServer(PowerTopologyCluster.with(PowerTopology.Feature.TreeTopology), {}, {}, {});
-    }
-    /**
-     * Get a default Electrical Energy Measurement Cluster Server.
-     *
-     * @param {number} energy - The total consumption value in mW/h.
-     * @returns {ClusterServer} - The configured Electrical Energy Measurement Cluster Server.
-     */
-    getDefaultElectricalEnergyMeasurementClusterServer(energy = null) {
-        return ClusterServer(ElectricalEnergyMeasurementCluster.with(ElectricalEnergyMeasurement.Feature.ImportedEnergy, ElectricalEnergyMeasurement.Feature.ExportedEnergy, ElectricalEnergyMeasurement.Feature.CumulativeEnergy), {
-            accuracy: {
-                measurementType: MeasurementType.ElectricalEnergy,
-                measured: true,
-                minMeasuredValue: Number.MIN_SAFE_INTEGER,
-                maxMeasuredValue: Number.MAX_SAFE_INTEGER,
-                accuracyRanges: [{ rangeMin: Number.MIN_SAFE_INTEGER, rangeMax: Number.MAX_SAFE_INTEGER, fixedMax: 1 }],
-            },
-            cumulativeEnergyReset: null,
-            cumulativeEnergyImported: energy ? { energy } : null,
-            cumulativeEnergyExported: null,
-        }, {}, {
-            cumulativeEnergyMeasured: true,
+    createDefaultIdentifyClusterServer(identifyTime = 0, identifyType = Identify.IdentifyType.None) {
+        this.behaviors.require(MatterbridgeIdentifyServer, {
+            identifyTime,
+            identifyType,
         });
+        return this;
     }
-    /**
-     * Get a default Electrical Power Measurement Cluster Server.
-     *
-     * @param {number} voltage - The voltage value in millivolts.
-     * @param {number} current - The current value in milliamperes.
-     * @param {number} power - The power value in milliwatts.
-     * @param {number} frequency - The frequency value in millihertz.
-     * @returns {ClusterServer} - The configured Electrical Power Measurement Cluster Server.
-     */
-    getDefaultElectricalPowerMeasurementClusterServer(voltage = null, current = null, power = null, frequency = null) {
-        return ClusterServer(ElectricalPowerMeasurementCluster.with(ElectricalPowerMeasurement.Feature.AlternatingCurrent), {
-            powerMode: ElectricalPowerMeasurement.PowerMode.Ac,
-            numberOfMeasurementTypes: 4,
-            accuracy: [
-                {
-                    measurementType: MeasurementType.Voltage,
-                    measured: true,
-                    minMeasuredValue: Number.MIN_SAFE_INTEGER,
-                    maxMeasuredValue: Number.MAX_SAFE_INTEGER,
-                    accuracyRanges: [{ rangeMin: Number.MIN_SAFE_INTEGER, rangeMax: Number.MAX_SAFE_INTEGER, fixedMax: 1 }],
-                },
-                {
-                    measurementType: MeasurementType.ActiveCurrent,
-                    measured: true,
-                    minMeasuredValue: Number.MIN_SAFE_INTEGER,
-                    maxMeasuredValue: Number.MAX_SAFE_INTEGER,
-                    accuracyRanges: [{ rangeMin: Number.MIN_SAFE_INTEGER, rangeMax: Number.MAX_SAFE_INTEGER, fixedMax: 1 }],
-                },
-                {
-                    measurementType: MeasurementType.ActivePower,
-                    measured: true,
-                    minMeasuredValue: Number.MIN_SAFE_INTEGER,
-                    maxMeasuredValue: Number.MAX_SAFE_INTEGER,
-                    accuracyRanges: [{ rangeMin: Number.MIN_SAFE_INTEGER, rangeMax: Number.MAX_SAFE_INTEGER, fixedMax: 1 }],
-                },
-                {
-                    measurementType: MeasurementType.Frequency,
-                    measured: true,
-                    minMeasuredValue: Number.MIN_SAFE_INTEGER,
-                    maxMeasuredValue: Number.MAX_SAFE_INTEGER,
-                    accuracyRanges: [{ rangeMin: Number.MIN_SAFE_INTEGER, rangeMax: Number.MAX_SAFE_INTEGER, fixedMax: 1 }],
-                },
-            ],
-            voltage: voltage,
-            activeCurrent: current,
-            activePower: power,
-            frequency: frequency,
-        }, {}, {});
-    }
-    /**
-     * Get a default OnOff cluster server for light devices.
-     *
-     * @param {boolean} [onOff=false] - The initial state of the OnOff cluster.
-     * @param {boolean} [globalSceneControl=false] - The global scene control state.
-     * @param {number} [onTime=0] - The on time value.
-     * @param {number} [offWaitTime=0] - The off wait time value.
-     * @param {OnOff.StartUpOnOff | null} [startUpOnOff=null] - The start-up OnOff state. Null means previous state.
-     * @returns {ClusterServer} - The configured OnOff cluster server.
-     */
-    getDefaultOnOffClusterServer(onOff = false, globalSceneControl = false, onTime = 0, offWaitTime = 0, startUpOnOff = null) {
-        return ClusterServer(OnOffCluster.with(OnOff.Feature.Lighting), {
+    createDefaultGroupsClusterServer() {
+        this.behaviors.require(GroupsServer);
+        return this;
+    }
+    createDefaultScenesClusterServer() {
+        this.behaviors.require(ScenesManagementServer);
+        return this;
+    }
+    createDefaultOnOffClusterServer(onOff = false, globalSceneControl = false, onTime = 0, offWaitTime = 0, startUpOnOff = null) {
+        this.behaviors.require(MatterbridgeOnOffServer.with(OnOff.Feature.Lighting), {
             onOff,
             globalSceneControl,
             onTime,
             offWaitTime,
             startUpOnOff,
-        }, {
-            on: async (data) => {
-                // Never called in edge
-            },
-            off: async (data) => {
-                // Never called in edge
-            },
-            toggle: async (data) => {
-                // Never called in edge
-            },
-            offWithEffect: async () => {
-                // Never called in edge
-            },
-            onWithRecallGlobalScene: async () => {
-                // Never called in edge
-            },
-            onWithTimedOff: async () => {
-                // Never called in edge
-            },
-        }, {});
-    }
-    /**
-     * Creates a default OnOff cluster server for light devices.
-     *
-     * @param {boolean} [onOff=false] - The initial state of the OnOff cluster.
-     * @param {boolean} [globalSceneControl=false] - The global scene control state.
-     * @param {number} [onTime=0] - The on time value.
-     * @param {number} [offWaitTime=0] - The off wait time value.
-     * @param {OnOff.StartUpOnOff | null} [startUpOnOff=null] - The start-up OnOff state. Null means previous state.
-     * @returns {void}
-     */
-    createDefaultOnOffClusterServer(onOff = false, globalSceneControl = false, onTime = 0, offWaitTime = 0, startUpOnOff = null) {
-        this.addClusterServer(this.getDefaultOnOffClusterServer(onOff, globalSceneControl, onTime, offWaitTime, startUpOnOff));
+        });
         return this;
     }
-    /**
-     * Get an OnOff cluster server without features.
-     *
-     * @param {boolean} [onOff=false] - The initial state of the OnOff cluster.
-     *
-     * @returns {ClusterServer} - The configured OnOff cluster server.
-     */
-    getOnOffClusterServer(onOff = false) {
-        return ClusterServer(OnOffCluster, {
-            onOff,
-        }, {
-            on: async (data) => {
-                // Never called in edge
-            },
-            off: async (data) => {
-                // Never called in edge
-            },
-            toggle: async (data) => {
-                // Never called in edge
-            },
-        }, {});
-    }
-    /**
-     * Creates an OnOff cluster server without features.
-     *
-     * @param {boolean} [onOff=false] - The initial state of the OnOff cluster.
-     */
     createOnOffClusterServer(onOff = false) {
-        this.addClusterServer(this.getOnOffClusterServer(onOff));
-        return this;
-    }
-    /**
-     * Get a DeadFront OnOff cluster server.
-     *
-     * @param {boolean} [onOff=false] - The initial state of the OnOff cluster.
-     *
-     * @returns {ClusterServer} - The configured OnOff cluster server.
-     */
-    getDeadFrontOnOffClusterServer(onOff = false) {
-        return ClusterServer(OnOffCluster.with(OnOff.Feature.DeadFrontBehavior), {
+        this.behaviors.require(MatterbridgeOnOffServer, {
             onOff,
-        }, {
-            on: async (data) => {
-                // Never called in edge
-            },
-            off: async (data) => {
-                // Never called in edge
-            },
-            toggle: async (data) => {
-                // Never called in edge
-            },
-        }, {});
+        });
+        return this;
     }
-    /**
-     * Creates a DeadFront OnOff cluster server.
-     *
-     * @param {boolean} [onOff=false] - The initial state of the OnOff cluster.
-     */
     createDeadFrontOnOffClusterServer(onOff = false) {
-        this.addClusterServer(this.getDeadFrontOnOffClusterServer(onOff));
+        this.behaviors.require(MatterbridgeOnOffServer.with(OnOff.Feature.DeadFrontBehavior), {
+            onOff,
+        });
         return this;
     }
-    /**
-     * Get a default level control cluster server.
-     *
-     * @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).
-     * @param startUpCurrentLevel - The startUp on level (default: null).
-     */
-    getDefaultLevelControlClusterServer(currentLevel = 254, minLevel = 1, maxLevel = 254, onLevel = null, startUpCurrentLevel = null) {
-        return ClusterServer(LevelControlCluster.with(LevelControl.Feature.OnOff, LevelControl.Feature.Lighting), {
+    createDefaultLevelControlClusterServer(currentLevel = 254, minLevel = 1, maxLevel = 254, onLevel = null, startUpCurrentLevel = null) {
+        this.behaviors.require(MatterbridgeLevelControlServer.with(LevelControl.Feature.OnOff, LevelControl.Feature.Lighting), {
             currentLevel,
             minLevel,
             maxLevel,
@@ -1499,59 +849,11 @@ export class MatterbridgeEndpoint extends Endpoint {
                 executeIfOff: false,
                 coupleColorTempToLevel: false,
             },
-        }, {
-            moveToLevel: async (data) => {
-                // Never called in edge
-            },
-            move: async () => {
-                // Never called in edge
-            },
-            step: async () => {
-                // Never called in edge
-            },
-            stop: async () => {
-                // Never called in edge
-            },
-            moveToLevelWithOnOff: async (data) => {
-                // Never called in edge
-            },
-            moveWithOnOff: async () => {
-                // Never called in edge
-            },
-            stepWithOnOff: async () => {
-                // Never called in edge
-            },
-            stopWithOnOff: async () => {
-                // Never called in edge
-            },
         });
-    }
-    /**
-     * Creates a default level control cluster server.
-     *
-     * @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).
-     * @param startUpCurrentLevel - The startUp on level (default: null).
-     */
-    createDefaultLevelControlClusterServer(currentLevel = 254, minLevel = 1, maxLevel = 254, onLevel = null, startUpCurrentLevel = null) {
-        this.addClusterServer(this.getDefaultLevelControlClusterServer(currentLevel, minLevel, maxLevel, onLevel, startUpCurrentLevel));
         return this;
     }
-    /**
-     * Get a default color control cluster server with Xy, HueSaturation and ColorTemperature.
-     *
-     * @param currentX - The current X value.
-     * @param currentY - The current Y value.
-     * @param currentHue - The current hue value.
-     * @param currentSaturation - The current saturation value.
-     * @param colorTemperatureMireds - The color temperature in mireds.
-     * @param colorTempPhysicalMinMireds - The physical minimum color temperature in mireds.
-     * @param colorTempPhysicalMaxMireds - The physical maximum color temperature in mireds.
-     */
-    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), {
+    createDefaultColorControlClusterServer(currentX = 0, currentY = 0, currentHue = 0, currentSaturation = 0, colorTemperatureMireds = 500, colorTempPhysicalMinMireds = 147, colorTempPhysicalMaxMireds = 500) {
+        this.behaviors.require(MatterbridgeColorControlServer.with(ColorControl.Feature.Xy, ColorControl.Feature.HueSaturation, ColorControl.Feature.ColorTemperature), {
             colorMode: ColorControl.ColorMode.CurrentHueAndCurrentSaturation,
             enhancedColorMode: ColorControl.EnhancedColorMode.CurrentHueAndCurrentSaturation,
             colorCapabilities: { xy: true, hueSaturation: true, colorLoop: false, enhancedHue: false, colorTemperature: true },
@@ -1569,77 +871,11 @@ export class MatterbridgeEndpoint extends Endpoint {
             coupleColorTempToLevelMinMireds: colorTempPhysicalMinMireds,
             remainingTime: 0,
             startUpColorTemperatureMireds: null,
-        }, {
-            moveToColor: async (data) => {
-                // Never called in edge
-            },
-            moveColor: async () => {
-                // Never called in edge
-            },
-            stepColor: async () => {
-                // Never called in edge
-            },
-            moveToHue: async (data) => {
-                // Never called in edge
-            },
-            moveHue: async () => {
-                // Never called in edge
-            },
-            stepHue: async () => {
-                // Never called in edge
-            },
-            moveToSaturation: async (data) => {
-                // Never called in edge
-            },
-            moveSaturation: async () => {
-                // Never called in edge
-            },
-            stepSaturation: async () => {
-                // Never called in edge
-            },
-            moveToHueAndSaturation: async (data) => {
-                // Never called in edge
-            },
-            stopMoveStep: async () => {
-                // Never called in edge
-            },
-            moveToColorTemperature: async (data) => {
-                // Never called in edge
-            },
-            moveColorTemperature: async () => {
-                // Never called in edge
-            },
-            stepColorTemperature: async () => {
-                // Never called in edge
-            },
-        }, {});
-    }
-    /**
-     * Creates a default color control cluster server with Xy, HueSaturation and ColorTemperature.
-     *
-     * @param currentX - The current X value.
-     * @param currentY - The current Y value.
-     * @param currentHue - The current hue value.
-     * @param currentSaturation - The current saturation value.
-     * @param colorTemperatureMireds - The color temperature in mireds.
-     * @param colorTempPhysicalMinMireds - The physical minimum color temperature in mireds.
-     * @param colorTempPhysicalMaxMireds - The physical maximum color temperature in mireds.
-     */
-    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));
+        });
         return this;
     }
-    /**
-     * Get a Xy color control cluster server with Xy and ColorTemperature.
-     *
-     * @param currentX - The current X value.
-     * @param currentY - The current Y value.
-     * @param colorTemperatureMireds - The color temperature in mireds.
-     * @param colorTempPhysicalMinMireds - The physical minimum color temperature in mireds.
-     * @param colorTempPhysicalMaxMireds - The physical maximum color temperature in mireds.
-     */
-    getXyColorControlClusterServer(currentX = 0, currentY = 0, colorTemperatureMireds = 500, colorTempPhysicalMinMireds = 147, colorTempPhysicalMaxMireds = 500) {
-        return ClusterServer(ColorControlCluster.with(ColorControl.Feature.Xy, ColorControl.Feature.ColorTemperature), {
+    createXyColorControlClusterServer(currentX = 0, currentY = 0, colorTemperatureMireds = 500, colorTempPhysicalMinMireds = 147, colorTempPhysicalMaxMireds = 500) {
+        this.behaviors.require(MatterbridgeColorControlServer.with(ColorControl.Feature.Xy, ColorControl.Feature.ColorTemperature), {
             colorMode: ColorControl.ColorMode.CurrentXAndCurrentY,
             enhancedColorMode: ColorControl.EnhancedColorMode.CurrentXAndCurrentY,
             colorCapabilities: { xy: true, hueSaturation: false, colorLoop: false, enhancedHue: false, colorTemperature: true },
@@ -1655,54 +891,11 @@ export class MatterbridgeEndpoint extends Endpoint {
             coupleColorTempToLevelMinMireds: colorTempPhysicalMinMireds,
             startUpColorTemperatureMireds: null,
             remainingTime: 0,
-        }, {
-            moveToColor: async () => {
-                // Never called in edge
-            },
-            moveColor: async () => {
-                // Never called in edge
-            },
-            stepColor: async () => {
-                // Never called in edge
-            },
-            stopMoveStep: async () => {
-                // Never called in edge
-            },
-            moveToColorTemperature: async () => {
-                // Never called in edge
-            },
-            moveColorTemperature: async () => {
-                // Never called in edge
-            },
-            stepColorTemperature: async () => {
-                // Never called in edge
-            },
-        }, {});
-    }
-    /**
-     * Creates a Xy color control cluster server with Xy and ColorTemperature.
-     *
-     * @param currentX - The current X value.
-     * @param currentY - The current Y value.
-     * @param colorTemperatureMireds - The color temperature in mireds.
-     * @param colorTempPhysicalMinMireds - The physical minimum color temperature in mireds.
-     * @param colorTempPhysicalMaxMireds - The physical maximum color temperature in mireds.
-     */
-    createXyColorControlClusterServer(currentX = 0, currentY = 0, colorTemperatureMireds = 500, colorTempPhysicalMinMireds = 147, colorTempPhysicalMaxMireds = 500) {
-        this.addClusterServer(this.getXyColorControlClusterServer(currentX, currentY, colorTemperatureMireds, colorTempPhysicalMinMireds, colorTempPhysicalMaxMireds));
+        });
         return this;
     }
-    /**
-     * Get a default hue and saturation control cluster server with HueSaturation and ColorTemperature.
-     *
-     * @param currentHue - The current hue value.
-     * @param currentSaturation - The current saturation value.
-     * @param colorTemperatureMireds - The color temperature in mireds.
-     * @param colorTempPhysicalMinMireds - The physical minimum color temperature in mireds.
-     * @param colorTempPhysicalMaxMireds - The physical maximum color temperature in mireds.
-     */
-    getHsColorControlClusterServer(currentHue = 0, currentSaturation = 0, colorTemperatureMireds = 500, colorTempPhysicalMinMireds = 147, colorTempPhysicalMaxMireds = 500) {
-        return ClusterServer(ColorControlCluster.with(ColorControl.Feature.HueSaturation, ColorControl.Feature.ColorTemperature), {
+    createHsColorControlClusterServer(currentHue = 0, currentSaturation = 0, colorTemperatureMireds = 500, colorTempPhysicalMinMireds = 147, colorTempPhysicalMaxMireds = 500) {
+        this.behaviors.require(MatterbridgeColorControlServer.with(ColorControl.Feature.HueSaturation, ColorControl.Feature.ColorTemperature), {
             colorMode: ColorControl.ColorMode.CurrentHueAndCurrentSaturation,
             enhancedColorMode: ColorControl.EnhancedColorMode.CurrentHueAndCurrentSaturation,
             colorCapabilities: { xy: false, hueSaturation: true, colorLoop: false, enhancedHue: false, colorTemperature: true },
@@ -1718,64 +911,11 @@ export class MatterbridgeEndpoint extends Endpoint {
             coupleColorTempToLevelMinMireds: colorTempPhysicalMinMireds,
             startUpColorTemperatureMireds: null,
             remainingTime: 0,
-        }, {
-            moveToHue: async () => {
-                // Never called in edge
-            },
-            moveHue: async () => {
-                // Never called in edge
-            },
-            stepHue: async () => {
-                // Never called in edge
-            },
-            moveToSaturation: async () => {
-                // Never called in edge
-            },
-            moveSaturation: async () => {
-                // Never called in edge
-            },
-            stepSaturation: async () => {
-                // Never called in edge
-            },
-            moveToHueAndSaturation: async () => {
-                // Never called in edge
-            },
-            stopMoveStep: async () => {
-                // Never called in edge
-            },
-            moveToColorTemperature: async () => {
-                // Never called in edge
-            },
-            moveColorTemperature: async () => {
-                // Never called in edge
-            },
-            stepColorTemperature: async () => {
-                // Never called in edge
-            },
-        }, {});
-    }
-    /**
-     * Creates a hue and saturation color control cluster server with HueSaturation and ColorTemperature.
-     *
-     * @param currentHue - The current hue value.
-     * @param currentSaturation - The current saturation value.
-     * @param colorTemperatureMireds - The color temperature in mireds.
-     * @param colorTempPhysicalMinMireds - The physical minimum color temperature in mireds.
-     * @param colorTempPhysicalMaxMireds - The physical maximum color temperature in mireds.
-     */
-    createHsColorControlClusterServer(currentHue = 0, currentSaturation = 0, colorTemperatureMireds = 500, colorTempPhysicalMinMireds = 147, colorTempPhysicalMaxMireds = 500) {
-        this.addClusterServer(this.getHsColorControlClusterServer(currentHue, currentSaturation, colorTemperatureMireds, colorTempPhysicalMinMireds, colorTempPhysicalMaxMireds));
+        });
         return this;
     }
-    /**
-     * Get a color temperature color control cluster server.
-     *
-     * @param colorTemperatureMireds - The color temperature in mireds.
-     * @param colorTempPhysicalMinMireds - The physical minimum color temperature in mireds.
-     * @param colorTempPhysicalMaxMireds - The physical maximum color temperature in mireds.
-     */
-    getCtColorControlClusterServer(colorTemperatureMireds = 500, colorTempPhysicalMinMireds = 147, colorTempPhysicalMaxMireds = 500) {
-        return ClusterServer(ColorControlCluster.with(ColorControl.Feature.ColorTemperature), {
+    createCtColorControlClusterServer(colorTemperatureMireds = 500, colorTempPhysicalMinMireds = 147, colorTempPhysicalMaxMireds = 500) {
+        this.behaviors.require(MatterbridgeColorControlServer.with(ColorControl.Feature.ColorTemperature), {
             colorMode: ColorControl.ColorMode.ColorTemperatureMireds,
             enhancedColorMode: ColorControl.EnhancedColorMode.ColorTemperatureMireds,
             colorCapabilities: { xy: false, hueSaturation: false, colorLoop: false, enhancedHue: false, colorTemperature: true },
@@ -1789,92 +929,18 @@ export class MatterbridgeEndpoint extends Endpoint {
             coupleColorTempToLevelMinMireds: colorTempPhysicalMinMireds,
             remainingTime: 0,
             startUpColorTemperatureMireds: null,
-        }, {
-            stopMoveStep: async () => {
-                // Never called in edge
-            },
-            moveToColorTemperature: async () => {
-                // Never called in edge
-            },
-            moveColorTemperature: async () => {
-                // Never called in edge
-            },
-            stepColorTemperature: async () => {
-                // Never called in edge
-            },
-        }, {});
-    }
-    /**
-     * Creates a color temperature color control cluster server.
-     *
-     * @param colorTemperatureMireds - The color temperature in mireds.
-     * @param colorTempPhysicalMinMireds - The physical minimum color temperature in mireds.
-     * @param colorTempPhysicalMaxMireds - The physical maximum color temperature in mireds.
-     */
-    createCtColorControlClusterServer(colorTemperatureMireds = 500, colorTempPhysicalMinMireds = 147, colorTempPhysicalMaxMireds = 500) {
-        this.addClusterServer(this.getCtColorControlClusterServer(colorTemperatureMireds, colorTempPhysicalMinMireds, colorTempPhysicalMaxMireds));
-        return this;
-    }
-    isColorControlConfigured = false;
-    /**
-     * Configures the color control cluster for a device.
-     *
-     * @remark This method must be called only after creating the cluster with getDefaultColorControlClusterServer or createDefaultColorControlClusterServer
-     * and before starting the matter node.
-     *
-     * @deprecated Use configureColorControlMode instead.
-     *
-     * @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.
-     * @param {boolean} colorTemperature - A boolean indicating whether the device supports color temperature control.
-     * @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.
-     */
-    async configureColorControlCluster(hueSaturation, xy, colorTemperature, colorMode, endpoint) {
-        if (!endpoint)
-            endpoint = this;
-        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;
+        });
         return this;
     }
-    /**
-     * Configures the color control mode for the device.
-     *
-     * @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.
-     */
-    async configureColorControlMode(colorMode, endpoint) {
-        if (!endpoint)
-            endpoint = this;
+    async configureColorControlMode(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);
+            await this.setAttribute(ColorControl.Cluster.id, 'colorMode', colorMode, this.log);
+            await this.setAttribute(ColorControl.Cluster.id, 'enhancedColorMode', colorMode, this.log);
         }
         return this;
     }
-    /**
-     * Get a default window covering cluster server.
-     *
-     * @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), {
+    createDefaultWindowCoveringClusterServer(positionPercent100ths) {
+        this.behaviors.require(MatterbridgeWindowCoveringServer.with(WindowCovering.Feature.Lift, WindowCovering.Feature.PositionAwareLift), {
             type: WindowCovering.WindowCoveringType.Rollershade,
             configStatus: {
                 operational: true,
@@ -1888,1138 +954,518 @@ export class MatterbridgeEndpoint extends Endpoint {
             operationalStatus: { global: WindowCovering.MovementStatus.Stopped, lift: WindowCovering.MovementStatus.Stopped, tilt: WindowCovering.MovementStatus.Stopped },
             endProductType: WindowCovering.EndProductType.RollerShade,
             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
-        }, {
-            upOrOpen: async (data) => {
-                // Never called in edge
-            },
-            downOrClose: async (data) => {
-                // Never called in edge
-            },
-            stopMotion: async (data) => {
-                // Never called in edge
-            },
-            goToLiftPercentage: async (data) => {
-                // Never called in edge
-            },
-        }, {});
-    }
-    /**
-     * Creates a default window covering cluster server.
-     *
-     * @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));
+            targetPositionLiftPercent100ths: positionPercent100ths ?? 0,
+            currentPositionLiftPercent100ths: positionPercent100ths ?? 0,
+        });
+        return this;
     }
-    /**
-     * 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).
-     */
-    async setWindowCoveringTargetAsCurrentAndStopped(endpoint) {
-        if (!endpoint)
-            endpoint = this;
-        const position = endpoint.getAttribute(WindowCoveringCluster.id, 'currentPositionLiftPercent100ths', this.log, endpoint);
+    async setWindowCoveringTargetAsCurrentAndStopped() {
+        const position = this.getAttribute(WindowCovering.Cluster.id, 'currentPositionLiftPercent100ths', this.log);
         if (position !== null) {
-            await endpoint.setAttribute(WindowCoveringCluster.id, 'targetPositionLiftPercent100ths', position, this.log, endpoint);
-            await endpoint.setAttribute(WindowCoveringCluster.id, 'operationalStatus', {
+            await this.setAttribute(WindowCovering.Cluster.id, 'targetPositionLiftPercent100ths', position, this.log);
+            await this.setAttribute(WindowCovering.Cluster.id, 'operationalStatus', {
                 global: WindowCovering.MovementStatus.Stopped,
                 lift: WindowCovering.MovementStatus.Stopped,
                 tilt: WindowCovering.MovementStatus.Stopped,
-            }, this.log, endpoint);
+            }, this.log);
         }
         this.log.debug(`Set WindowCovering currentPositionLiftPercent100ths and targetPositionLiftPercent100ths to ${position} and operationalStatus to Stopped.`);
     }
-    /**
-     * Sets the current and target status of a window covering.
-     * @param {number} current - The current position of the window covering.
-     * @param {number} target - The target position of the window covering.
-     * @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).
-     */
-    async setWindowCoveringCurrentTargetStatus(current, target, status, endpoint) {
-        if (!endpoint)
-            endpoint = this;
-        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', {
+    async setWindowCoveringCurrentTargetStatus(current, target, status) {
+        await this.setAttribute(WindowCovering.Cluster.id, 'currentPositionLiftPercent100ths', current, this.log);
+        await this.setAttribute(WindowCovering.Cluster.id, 'targetPositionLiftPercent100ths', target, this.log);
+        await this.setAttribute(WindowCovering.Cluster.id, 'operationalStatus', {
             global: status,
             lift: status,
             tilt: status,
-        }, this.log, endpoint);
+        }, this.log);
         this.log.debug(`Set WindowCovering currentPositionLiftPercent100ths: ${current}, targetPositionLiftPercent100ths: ${target} and operationalStatus: ${status}.`);
     }
-    /**
-     * Sets the status of the window covering.
-     * @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).
-     */
-    async setWindowCoveringStatus(status, endpoint) {
-        if (!endpoint)
-            endpoint = this;
-        await endpoint.setAttribute(WindowCoveringCluster.id, 'operationalStatus', {
+    async setWindowCoveringStatus(status) {
+        await this.setAttribute(WindowCovering.Cluster.id, 'operationalStatus', {
             global: status,
             lift: status,
             tilt: status,
-        }, this.log, endpoint);
+        }, this.log);
         this.log.debug(`Set WindowCovering operationalStatus: ${status}`);
     }
-    /**
-     * Retrieves the status of the window covering.
-     * @param {Endpoint} endpoint - The endpoint on which to get the window covering (default the device endpoint).
-     *
-     * @returns The global operational status of the window covering.
-     */
-    getWindowCoveringStatus(endpoint) {
-        if (!endpoint)
-            endpoint = this;
-        const status = endpoint.getAttribute(WindowCoveringCluster.id, 'operationalStatus', this.log, endpoint);
+    getWindowCoveringStatus() {
+        const status = this.getAttribute(WindowCovering.Cluster.id, 'operationalStatus', this.log);
         this.log.debug(`Get WindowCovering operationalStatus: ${status.global}`);
         return status.global;
     }
-    /**
-     * Sets the target and current position of the window covering.
-     *
-     * @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).
-     */
-    async setWindowCoveringTargetAndCurrentPosition(position, endpoint) {
-        if (!endpoint)
-            endpoint = this;
-        await endpoint.setAttribute(WindowCoveringCluster.id, 'currentPositionLiftPercent100ths', position, this.log, endpoint);
-        await endpoint.setAttribute(WindowCoveringCluster.id, 'targetPositionLiftPercent100ths', position, this.log, endpoint);
+    async setWindowCoveringTargetAndCurrentPosition(position) {
+        await this.setAttribute(WindowCovering.Cluster.id, 'currentPositionLiftPercent100ths', position, this.log);
+        await this.setAttribute(WindowCovering.Cluster.id, 'targetPositionLiftPercent100ths', position, this.log);
         this.log.debug(`Set WindowCovering currentPositionLiftPercent100ths: ${position} and targetPositionLiftPercent100ths: ${position}.`);
     }
-    /**
-     * Get a default door lock cluster server.
-     *
-     * @remarks
-     * This method adds a cluster server for a door lock cluster with default settings.
-     *
-     */
-    getDefaultDoorLockClusterServer(lockState = DoorLock.LockState.Locked, lockType = DoorLock.LockType.DeadBolt) {
-        return ClusterServer(DoorLockCluster, {
-            operatingMode: DoorLock.OperatingMode.Normal,
-            lockState,
-            lockType,
-            actuatorEnabled: false,
-            supportedOperatingModes: { normal: true, vacation: false, privacy: false, noRemoteLockUnlock: false, passage: false },
-        }, {
-            lockDoor: async (data) => {
-                // Never called in edge
-            },
-            unlockDoor: async (data) => {
-                // Never called in edge
-            },
-        }, {
-            doorLockAlarm: true,
-            lockOperation: true,
-            lockOperationError: true,
+    createDefaultThermostatClusterServer(localTemperature = 23, occupiedHeatingSetpoint = 21, occupiedCoolingSetpoint = 25, minSetpointDeadBand = 1, minHeatSetpointLimit = 0, maxHeatSetpointLimit = 50, minCoolSetpointLimit = 0, maxCoolSetpointLimit = 50) {
+        this.behaviors.require(MatterbridgeThermostatServer.with(Thermostat.Feature.Heating, Thermostat.Feature.Cooling, Thermostat.Feature.AutoMode), {
+            localTemperature: localTemperature * 100,
+            systemMode: Thermostat.SystemMode.Auto,
+            controlSequenceOfOperation: Thermostat.ControlSequenceOfOperation.CoolingAndHeating,
+            occupiedHeatingSetpoint: occupiedHeatingSetpoint * 100,
+            minHeatSetpointLimit: minHeatSetpointLimit * 100,
+            maxHeatSetpointLimit: maxHeatSetpointLimit * 100,
+            absMinHeatSetpointLimit: minHeatSetpointLimit * 100,
+            absMaxHeatSetpointLimit: maxHeatSetpointLimit * 100,
+            occupiedCoolingSetpoint: occupiedCoolingSetpoint * 100,
+            minCoolSetpointLimit: minCoolSetpointLimit * 100,
+            maxCoolSetpointLimit: maxCoolSetpointLimit * 100,
+            absMinCoolSetpointLimit: minCoolSetpointLimit * 100,
+            absMaxCoolSetpointLimit: maxCoolSetpointLimit * 100,
+            minSetpointDeadBand: minSetpointDeadBand * 100,
+            thermostatRunningMode: Thermostat.ThermostatRunningMode.Off,
         });
+        return this;
     }
-    /**
-     * Creates a default door lock cluster server.
-     *
-     * @remarks
-     * This method adds a cluster server for a door lock cluster with default settings.
-     *
-     */
-    createDefaultDoorLockClusterServer(lockState = DoorLock.LockState.Locked, lockType = DoorLock.LockType.DeadBolt) {
-        this.addClusterServer(this.getDefaultDoorLockClusterServer(lockState, lockType));
-    }
-    /**
-     * Get a default momentary switch cluster server.
-     *
-     * @remarks
-     * This method adds a cluster server with default momentary switch features and configurations suitable for (AppleHome) Single Double Long automations.
-     */
-    getDefaultSwitchClusterServer() {
-        return ClusterServer(SwitchCluster.with(Switch.Feature.MomentarySwitch, Switch.Feature.MomentarySwitchRelease, Switch.Feature.MomentarySwitchLongPress, Switch.Feature.MomentarySwitchMultiPress), {
-            numberOfPositions: 2,
-            currentPosition: 0,
-            multiPressMax: 2,
-        }, {}, {
-            initialPress: true,
-            longPress: true,
-            shortRelease: true,
-            longRelease: true,
-            multiPressOngoing: true,
-            multiPressComplete: true,
+    createDefaultHeatingThermostatClusterServer(localTemperature = 23, occupiedHeatingSetpoint = 21, minHeatSetpointLimit = 0, maxHeatSetpointLimit = 50) {
+        this.behaviors.require(MatterbridgeThermostatServer.with(Thermostat.Feature.Heating), {
+            localTemperature: localTemperature * 100,
+            systemMode: Thermostat.SystemMode.Heat,
+            controlSequenceOfOperation: Thermostat.ControlSequenceOfOperation.HeatingOnly,
+            occupiedHeatingSetpoint: occupiedHeatingSetpoint * 100,
+            minHeatSetpointLimit: minHeatSetpointLimit * 100,
+            maxHeatSetpointLimit: maxHeatSetpointLimit * 100,
+            absMinHeatSetpointLimit: minHeatSetpointLimit * 100,
+            absMaxHeatSetpointLimit: maxHeatSetpointLimit * 100,
         });
+        return this;
+    }
+    createDefaultCoolingThermostatClusterServer(localTemperature = 23, occupiedCoolingSetpoint = 25, minCoolSetpointLimit = 0, maxCoolSetpointLimit = 50) {
+        this.behaviors.require(MatterbridgeThermostatServer.with(Thermostat.Feature.Cooling), {
+            localTemperature: localTemperature * 100,
+            systemMode: Thermostat.SystemMode.Cool,
+            controlSequenceOfOperation: Thermostat.ControlSequenceOfOperation.CoolingOnly,
+            occupiedCoolingSetpoint: occupiedCoolingSetpoint * 100,
+            minCoolSetpointLimit: minCoolSetpointLimit * 100,
+            maxCoolSetpointLimit: maxCoolSetpointLimit * 100,
+            absMinCoolSetpointLimit: minCoolSetpointLimit * 100,
+            absMaxCoolSetpointLimit: maxCoolSetpointLimit * 100,
+        });
+        return this;
+    }
+    createDefaultFanControlClusterServer(fanMode = FanControl.FanMode.Off) {
+        this.behaviors.require(MatterbridgeFanControlServer.with(FanControl.Feature.MultiSpeed, FanControl.Feature.Auto, FanControl.Feature.Step), {
+            fanMode,
+            fanModeSequence: FanControl.FanModeSequence.OffLowMedHighAuto,
+            percentSetting: 0,
+            percentCurrent: 0,
+            speedMax: 100,
+            speedSetting: 0,
+            speedCurrent: 0,
+        });
+        return this;
+    }
+    createDefaultDoorLockClusterServer(lockState = DoorLock.LockState.Locked, lockType = DoorLock.LockType.DeadBolt) {
+        this.behaviors.require(MatterbridgeDoorLockServer.enable({ events: { doorLockAlarm: true, lockOperation: true, lockOperationError: true } }), {
+            operatingMode: DoorLock.OperatingMode.Normal,
+            lockState,
+            lockType,
+            actuatorEnabled: false,
+            supportedOperatingModes: { normal: true, vacation: false, privacy: false, noRemoteLockUnlock: false, passage: false },
+        });
+        return this;
+    }
+    createDefaultModeSelectClusterServer(description, supportedModes, currentMode = 0, startUpMode = 0) {
+        this.behaviors.require(MatterbridgeModeSelectServer, {
+            description: description,
+            standardNamespace: null,
+            supportedModes: supportedModes,
+            currentMode: currentMode,
+            startUpMode: startUpMode,
+        });
+        return this;
+    }
+    createDefaultValveConfigurationAndControlClusterServer(valveState = ValveConfigurationAndControl.ValveState.Closed, valveLevel = 0) {
+        this.behaviors.require(MatterbridgeValveConfigurationAndControlServer.with(ValveConfigurationAndControl.Feature.Level), {
+            currentState: valveState,
+            targetState: valveState,
+            currentLevel: valveLevel,
+            targetLevel: valveLevel,
+            openDuration: null,
+            defaultOpenDuration: null,
+            remainingDuration: null,
+        });
+        return this;
+    }
+    createDefaultPumpConfigurationAndControlClusterServer(pumpMode = PumpConfigurationAndControl.OperationMode.Normal) {
+        this.behaviors.require(PumpConfigurationAndControlServer.with(PumpConfigurationAndControl.Feature.ConstantSpeed), {
+            minConstSpeed: null,
+            maxConstSpeed: null,
+            maxPressure: null,
+            maxSpeed: null,
+            maxFlow: null,
+            effectiveOperationMode: pumpMode,
+            effectiveControlMode: PumpConfigurationAndControl.ControlMode.ConstantSpeed,
+            capacity: null,
+            operationMode: pumpMode,
+        });
+        return this;
+    }
+    createDefaultSmokeCOAlarmClusterServer(smokeState = SmokeCoAlarm.AlarmState.Normal, coState = SmokeCoAlarm.AlarmState.Normal) {
+        this.behaviors.require(MatterbridgeSmokeCoAlarmServer.with(SmokeCoAlarm.Feature.SmokeAlarm, SmokeCoAlarm.Feature.CoAlarm).enable({
+            events: { smokeAlarm: true, interconnectSmokeAlarm: true, coAlarm: true, interconnectCoAlarm: true, lowBattery: true, hardwareFault: true, endOfService: true, selfTestComplete: true, alarmMuted: true, muteEnded: true, allClear: true },
+        }), {
+            smokeState,
+            coState,
+            expressedState: SmokeCoAlarm.ExpressedState.Normal,
+            batteryAlert: SmokeCoAlarm.AlarmState.Normal,
+            deviceMuted: SmokeCoAlarm.MuteState.NotMuted,
+            testInProgress: false,
+            hardwareFaultAlert: false,
+            endOfServiceAlert: SmokeCoAlarm.EndOfService.Normal,
+            interconnectSmokeAlarm: SmokeCoAlarm.AlarmState.Normal,
+            interconnectCoAlarm: SmokeCoAlarm.AlarmState.Normal,
+        });
+        return this;
     }
-    /**
-     * Creates a default momentary switch cluster server.
-     *
-     * @remarks
-     * This method adds a cluster server with default momentary switch features and configurations.
-     */
     createDefaultSwitchClusterServer() {
-        this.addClusterServer(this.getDefaultSwitchClusterServer());
-    }
-    /**
-     * Get a default latching switch cluster server.
-     *
-     * @remarks
-     * This method adds a cluster server with default latching switch features and configuration.
-     */
-    getDefaultLatchingSwitchClusterServer() {
-        return ClusterServer(SwitchCluster.with(Switch.Feature.LatchingSwitch), {
+        this.behaviors.require(SwitchServer.with(Switch.Feature.MomentarySwitch, Switch.Feature.MomentarySwitchRelease, Switch.Feature.MomentarySwitchLongPress, Switch.Feature.MomentarySwitchMultiPress).enable({
+            events: { initialPress: true, longPress: true, shortRelease: true, longRelease: true, multiPressOngoing: true, multiPressComplete: true },
+        }), {
             numberOfPositions: 2,
             currentPosition: 0,
-        }, {}, {
-            switchLatched: true,
+            multiPressMax: 2,
         });
+        return this;
     }
-    /**
-     * Creates a default latching switch cluster server.
-     *
-     * @remarks
-     * This method adds a cluster server with default latching switch features and configuration.
-     */
     createDefaultLatchingSwitchClusterServer() {
-        this.addClusterServer(this.getDefaultLatchingSwitchClusterServer());
-    }
-    /**
-     * Triggers a switch event on the specified endpoint.
-     *
-     * @param {string} event - The type of event to trigger. Possible values are 'Single', 'Double', 'Long' for momentarySwitch and 'Press', 'Release' for latchingSwitch.
-     * @param {Endpoint} endpoint - The endpoint on which to trigger the event (default the device endpoint).
-     * @returns {void}
-     */
-    async triggerSwitchEvent(event, log, endpoint) {
-        if (!endpoint)
-            endpoint = this;
+        this.behaviors.require(SwitchServer.with(Switch.Feature.LatchingSwitch).enable({
+            events: { switchLatched: true },
+        }), {
+            numberOfPositions: 2,
+            currentPosition: 0,
+        });
+        return this;
+    }
+    async triggerSwitchEvent(event, log) {
+        if (this.maybeNumber === undefined) {
+            this.log.error(`triggerSwitchEvent ${event} error: Endpoint number not assigned on endpoint ${this.maybeId}:${this.maybeNumber}`);
+            return false;
+        }
         if (['Single', 'Double', 'Long'].includes(event)) {
-            const cluster = endpoint.getClusterServer(SwitchCluster.with(Switch.Feature.MomentarySwitch, Switch.Feature.MomentarySwitchRelease, Switch.Feature.MomentarySwitchLongPress, Switch.Feature.MomentarySwitchMultiPress));
-            if (!cluster || !cluster.getFeatureMapAttribute().momentarySwitch) {
-                log?.error(`triggerSwitchEvent ${event} error: Switch cluster with MomentarySwitch not found on endpoint ${endpoint.id}:${endpoint.number}`);
-                return false;
-            }
-            if (endpoint.number === undefined) {
-                log?.error(`triggerSwitchEvent ${event} error: Endpoint number not assigned on endpoint ${endpoint.id}:${endpoint.number}`);
+            if (!this.hasClusterServer(Switch.Cluster.id) || this.getAttribute(Switch.Cluster.id, 'featureMap').momentarySwitch === false) {
+                this.log.error(`triggerSwitchEvent ${event} error: Switch cluster with MomentarySwitch not found on endpoint ${this.maybeId}:${this.maybeNumber}`);
                 return false;
             }
             if (event === 'Single') {
-                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}`);
+                await this.setAttribute(Switch.Cluster.id, 'currentPosition', 1, log);
+                this.triggerEvent(Switch.Cluster.id, 'initialPress', { newPosition: 1 }, log);
+                await this.setAttribute(Switch.Cluster.id, 'currentPosition', 0, log);
+                this.triggerEvent(Switch.Cluster.id, 'shortRelease', { previousPosition: 1 }, log);
+                await this.setAttribute(Switch.Cluster.id, 'currentPosition', 0, log);
+                this.triggerEvent(Switch.Cluster.id, 'multiPressComplete', { previousPosition: 1, totalNumberOfPressesCounted: 1 }, log);
+                log?.info(`${db}Trigger endpoint ${or}${this.id}:${this.number}${db} event ${hk}Switch.SinglePress${db}`);
             }
             if (event === 'Double') {
-                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}`);
+                await this.setAttribute(Switch.Cluster.id, 'currentPosition', 1, log);
+                this.triggerEvent(Switch.Cluster.id, 'initialPress', { newPosition: 1 }, log);
+                await this.setAttribute(Switch.Cluster.id, 'currentPosition', 0, log);
+                this.triggerEvent(Switch.Cluster.id, 'shortRelease', { previousPosition: 1 }, log);
+                await this.setAttribute(Switch.Cluster.id, 'currentPosition', 1, log);
+                this.triggerEvent(Switch.Cluster.id, 'initialPress', { newPosition: 1 }, log);
+                this.triggerEvent(Switch.Cluster.id, 'multiPressOngoing', { newPosition: 1, currentNumberOfPressesCounted: 2 }, log);
+                await this.setAttribute(Switch.Cluster.id, 'currentPosition', 0, log);
+                this.triggerEvent(Switch.Cluster.id, 'shortRelease', { previousPosition: 1 }, log);
+                this.triggerEvent(Switch.Cluster.id, 'multiPressComplete', { previousPosition: 1, totalNumberOfPressesCounted: 2 }, log);
+                log?.info(`${db}Trigger endpoint ${or}${this.id}:${this.number}${db} event ${hk}Switch.DoublePress${db}`);
             }
             if (event === 'Long') {
-                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}`);
+                await this.setAttribute(Switch.Cluster.id, 'currentPosition', 1, log);
+                this.triggerEvent(Switch.Cluster.id, 'initialPress', { newPosition: 1 }, log);
+                this.triggerEvent(Switch.Cluster.id, 'longPress', { newPosition: 1 }, log);
+                await this.setAttribute(Switch.Cluster.id, 'currentPosition', 0, log);
+                this.triggerEvent(Switch.Cluster.id, 'longRelease', { previousPosition: 1 }, log);
+                log?.info(`${db}Trigger endpoint ${or}${this.id}:${this.number}${db} event ${hk}Switch.LongPress${db}`);
             }
         }
         if (['Press', 'Release'].includes(event)) {
-            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;
-            }
-            if (endpoint.number === undefined) {
-                log?.error(`triggerSwitchEvent ${event} error: Endpoint number not assigned on endpoint ${endpoint.id}:${endpoint.number}`);
+            if (!this.hasClusterServer(Switch.Cluster.id) || this.getAttribute(Switch.Cluster.id, 'featureMap').latchingSwitch === false) {
+                this.log.error(`triggerSwitchEvent ${event} error: Switch cluster with LatchingSwitch not found on endpoint ${this.maybeId}:${this.maybeNumber}`);
                 return false;
             }
             if (event === 'Press') {
-                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}`);
+                await this.setAttribute(Switch.Cluster.id, 'currentPosition', 1, log);
+                this.triggerEvent(Switch.Cluster.id, 'switchLatched', { newPosition: 1 }, log);
+                log?.info(`${db}Trigger endpoint ${or}${this.id}:${this.number}${db} event ${hk}Switch.Press${db}`);
             }
             if (event === 'Release') {
-                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}`);
+                await this.setAttribute(Switch.Cluster.id, 'currentPosition', 0, log);
+                this.triggerEvent(Switch.Cluster.id, 'switchLatched', { newPosition: 0 }, log);
+                log?.info(`${db}Trigger endpoint ${or}${this.id}:${this.number}${db} event ${hk}Switch.Release${db}`);
             }
         }
         return true;
     }
-    /**
-     * Retrieves the default mode select cluster server.
-     *
-     * @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.
-     * @returns The default mode select cluster server.
-     */
-    getDefaultModeSelectClusterServer(description, supportedModes, currentMode = 0, startUpMode = 0) {
-        return ClusterServer(ModeSelectCluster, {
-            description: description,
-            standardNamespace: null,
-            supportedModes: supportedModes,
-            currentMode: currentMode,
-            startUpMode: startUpMode,
-        }, {
-            changeToMode: async (data) => {
-                // Never called in edge
-            },
+    createDefaultBooleanStateClusterServer(contact) {
+        this.behaviors.require(BooleanStateServer.enable({
+            events: { stateChange: true },
+        }), {
+            stateValue: contact ?? true,
         });
+        return this;
     }
-    /**
-     * Creates a default mode select cluster server.
-     *
-     * @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)
-            endpoint = this;
-        endpoint.addClusterServer(this.getDefaultModeSelectClusterServer(description, supportedModes, currentMode, startUpMode));
+    createDefaultBooleanStateConfigurationClusterServer(sensorFault = false, currentSensitivityLevel = 0, supportedSensitivityLevels = 2, defaultSensitivityLevel = 0) {
+        this.behaviors.require(MatterbridgeBooleanStateConfigurationServer.with(BooleanStateConfiguration.Feature.Visual, BooleanStateConfiguration.Feature.Audible, BooleanStateConfiguration.Feature.SensitivityLevel).enable({
+            events: { alarmsStateChanged: true, sensorFault: true },
+        }), {
+            currentSensitivityLevel,
+            supportedSensitivityLevels,
+            defaultSensitivityLevel,
+            alarmsActive: { visual: false, audible: false },
+            alarmsEnabled: { visual: true, audible: true },
+            alarmsSupported: { visual: true, audible: true },
+            sensorFault: { generalFault: sensorFault },
+        });
+        return this;
     }
-    /**
-     * Get a default occupancy sensing cluster server.
-     *
-     * @param occupied - A boolean indicating whether the occupancy is occupied or not. Default is false.
-     */
-    getDefaultOccupancySensingClusterServer(occupied = false) {
-        return ClusterServer(OccupancySensingCluster, {
-            occupancy: { occupied },
-            occupancySensorType: OccupancySensing.OccupancySensorType.Pir,
-            occupancySensorTypeBitmap: { pir: true, ultrasonic: false, physicalContact: false },
-            pirOccupiedToUnoccupiedDelay: 30,
-        }, {});
+    createDefaultPowerTopologyClusterServer() {
+        this.behaviors.require(PowerTopologyServer.with(PowerTopology.Feature.TreeTopology));
+        return this;
     }
-    /**
-     * Creates a default occupancy sensing cluster server.
-     *
-     * @param occupied - A boolean indicating whether the occupancy is occupied or not. Default is false.
-     */
-    createDefaultOccupancySensingClusterServer(occupied = false) {
-        this.addClusterServer(this.getDefaultOccupancySensingClusterServer(occupied));
+    createDefaultElectricalEnergyMeasurementClusterServer(energy = null) {
+        this.behaviors.require(ElectricalEnergyMeasurementServer.with(ElectricalEnergyMeasurement.Feature.ImportedEnergy, ElectricalEnergyMeasurement.Feature.ExportedEnergy, ElectricalEnergyMeasurement.Feature.CumulativeEnergy), {
+            accuracy: {
+                measurementType: MeasurementType.ElectricalEnergy,
+                measured: true,
+                minMeasuredValue: Number.MIN_SAFE_INTEGER,
+                maxMeasuredValue: Number.MAX_SAFE_INTEGER,
+                accuracyRanges: [{ rangeMin: Number.MIN_SAFE_INTEGER, rangeMax: Number.MAX_SAFE_INTEGER, fixedMax: 1 }],
+            },
+            cumulativeEnergyReset: null,
+            cumulativeEnergyImported: energy ? { energy } : null,
+            cumulativeEnergyExported: null,
+        });
+        return this;
     }
-    /**
-     * Get a default Illuminance Measurement Cluster Server.
-     *
-     * @param measuredValue - The measured value of illuminance.
-     */
-    getDefaultIlluminanceMeasurementClusterServer(measuredValue = 0) {
-        return ClusterServer(IlluminanceMeasurementCluster, {
+    createDefaultElectricalPowerMeasurementClusterServer(voltage = null, current = null, power = null, frequency = null) {
+        this.behaviors.require(ElectricalPowerMeasurementServer.with(ElectricalPowerMeasurement.Feature.AlternatingCurrent), {
+            powerMode: ElectricalPowerMeasurement.PowerMode.Ac,
+            numberOfMeasurementTypes: 4,
+            accuracy: [
+                {
+                    measurementType: MeasurementType.Voltage,
+                    measured: true,
+                    minMeasuredValue: Number.MIN_SAFE_INTEGER,
+                    maxMeasuredValue: Number.MAX_SAFE_INTEGER,
+                    accuracyRanges: [{ rangeMin: Number.MIN_SAFE_INTEGER, rangeMax: Number.MAX_SAFE_INTEGER, fixedMax: 1 }],
+                },
+                {
+                    measurementType: MeasurementType.ActiveCurrent,
+                    measured: true,
+                    minMeasuredValue: Number.MIN_SAFE_INTEGER,
+                    maxMeasuredValue: Number.MAX_SAFE_INTEGER,
+                    accuracyRanges: [{ rangeMin: Number.MIN_SAFE_INTEGER, rangeMax: Number.MAX_SAFE_INTEGER, fixedMax: 1 }],
+                },
+                {
+                    measurementType: MeasurementType.ActivePower,
+                    measured: true,
+                    minMeasuredValue: Number.MIN_SAFE_INTEGER,
+                    maxMeasuredValue: Number.MAX_SAFE_INTEGER,
+                    accuracyRanges: [{ rangeMin: Number.MIN_SAFE_INTEGER, rangeMax: Number.MAX_SAFE_INTEGER, fixedMax: 1 }],
+                },
+                {
+                    measurementType: MeasurementType.Frequency,
+                    measured: true,
+                    minMeasuredValue: Number.MIN_SAFE_INTEGER,
+                    maxMeasuredValue: Number.MAX_SAFE_INTEGER,
+                    accuracyRanges: [{ rangeMin: Number.MIN_SAFE_INTEGER, rangeMax: Number.MAX_SAFE_INTEGER, fixedMax: 1 }],
+                },
+            ],
+            voltage: voltage,
+            activeCurrent: current,
+            activePower: power,
+            frequency: frequency,
+        });
+        return this;
+    }
+    getDefaultTemperatureMeasurementClusterServer(measuredValue = 0) {
+        return optionsFor(TemperatureMeasurementServer, {
             measuredValue,
             minMeasuredValue: null,
             maxMeasuredValue: null,
             tolerance: 0,
-        }, {}, {});
+        });
     }
-    /**
-     * Creates a default Illuminance Measurement Cluster Server.
-     *
-     * @param measuredValue - The measured value of illuminance.
-     */
-    createDefaultIlluminanceMeasurementClusterServer(measuredValue = 0) {
-        this.addClusterServer(this.getDefaultIlluminanceMeasurementClusterServer(measuredValue));
+    createDefaultTemperatureMeasurementClusterServer(measuredValue = 0) {
+        this.behaviors.require(TemperatureMeasurementServer, this.getDefaultTemperatureMeasurementClusterServer(measuredValue));
+        return this;
     }
-    /**
-     * Get a default flow measurement cluster server.
-     *
-     * @param measuredValue - The measured value of the flow in 10 x m/h.
-     */
-    getDefaultFlowMeasurementClusterServer(measuredValue = 0) {
-        return ClusterServer(FlowMeasurementCluster, {
+    getDefaultRelativeHumidityMeasurementClusterServer(measuredValue = 0) {
+        return optionsFor(RelativeHumidityMeasurementServer, {
             measuredValue,
             minMeasuredValue: null,
             maxMeasuredValue: null,
             tolerance: 0,
-        }, {}, {});
+        });
     }
-    /**
-     * Creates a default flow measurement cluster server.
-     *
-     * @param measuredValue - The measured value of the flow in 10 x m/h.
-     */
-    createDefaultFlowMeasurementClusterServer(measuredValue = 0) {
-        this.addClusterServer(this.getDefaultFlowMeasurementClusterServer(measuredValue));
+    createDefaultRelativeHumidityMeasurementClusterServer(measuredValue = 0) {
+        this.behaviors.require(RelativeHumidityMeasurementServer, this.getDefaultRelativeHumidityMeasurementClusterServer(measuredValue));
+        return this;
     }
-    /**
-     * Get a default temperature measurement cluster server.
-     *
-     * @param measuredValue - The measured value of the temperature x 100.
-     */
-    getDefaultTemperatureMeasurementClusterServer(measuredValue = 0) {
-        return ClusterServer(TemperatureMeasurementCluster, {
+    getDefaultPressureMeasurementClusterServer(measuredValue = 1000) {
+        return optionsFor(PressureMeasurementServer, {
             measuredValue,
             minMeasuredValue: null,
             maxMeasuredValue: null,
             tolerance: 0,
-        }, {}, {});
+        });
     }
-    /**
-     * Creates a default temperature measurement cluster server.
-     *
-     * @param measuredValue - The measured value of the temperature x 100.
-     */
-    createDefaultTemperatureMeasurementClusterServer(measuredValue = 0) {
-        this.addClusterServer(this.getDefaultTemperatureMeasurementClusterServer(measuredValue));
+    createDefaultPressureMeasurementClusterServer(measuredValue = 1000) {
+        this.behaviors.require(PressureMeasurementServer, this.getDefaultPressureMeasurementClusterServer(measuredValue));
+        return this;
     }
-    /**
-     * Get a default RelativeHumidityMeasurementCluster server.
-     *
-     * @param measuredValue - The measured value of the relative humidity x 100.
-     */
-    getDefaultRelativeHumidityMeasurementClusterServer(measuredValue = 0) {
-        return ClusterServer(RelativeHumidityMeasurementCluster, {
+    getDefaultIlluminanceMeasurementClusterServer(measuredValue = 0) {
+        return optionsFor(IlluminanceMeasurementServer, {
             measuredValue,
             minMeasuredValue: null,
             maxMeasuredValue: null,
             tolerance: 0,
-        }, {}, {});
+        });
     }
-    /**
-     * Creates a default RelativeHumidityMeasurementCluster server.
-     *
-     * @param measuredValue - The measured value of the relative humidity x 100.
-     */
-    createDefaultRelativeHumidityMeasurementClusterServer(measuredValue = 0) {
-        this.addClusterServer(this.getDefaultRelativeHumidityMeasurementClusterServer(measuredValue));
+    createDefaultIlluminanceMeasurementClusterServer(measuredValue = 0) {
+        this.behaviors.require(IlluminanceMeasurementServer, this.getDefaultIlluminanceMeasurementClusterServer(measuredValue));
+        return this;
     }
-    /**
-     * Get a default Pressure Measurement Cluster Server.
-     *
-     * @param measuredValue - The measured value for the pressure.
-     */
-    getDefaultPressureMeasurementClusterServer(measuredValue = 1000) {
-        return ClusterServer(PressureMeasurementCluster, {
+    getDefaultFlowMeasurementClusterServer(measuredValue = 0) {
+        return optionsFor(FlowMeasurementServer, {
             measuredValue,
             minMeasuredValue: null,
             maxMeasuredValue: null,
             tolerance: 0,
-        }, {}, {});
-    }
-    /**
-     * Creates a default Pressure Measurement Cluster Server.
-     *
-     * @param measuredValue - The measured value for the pressure.
-     */
-    createDefaultPressureMeasurementClusterServer(measuredValue = 1000) {
-        this.addClusterServer(this.getDefaultPressureMeasurementClusterServer(measuredValue));
-    }
-    /**
-     * Get a default boolean state cluster server.
-     *
-     * @param contact - Optional boolean value indicating the contact state. Defaults to `true` if not provided.
-     */
-    getDefaultBooleanStateClusterServer(contact) {
-        return ClusterServer(BooleanStateCluster, {
-            stateValue: contact ?? true, // true=contact false=no_contact
-        }, {}, {
-            stateChange: true,
         });
     }
-    /**
-     * Creates a default boolean state configuration cluster server.
-     *
-     * @param contact - Optional boolean value indicating the contact state. Defaults to `true` if not provided.
-     */
-    createDefaultBooleanStateClusterServer(contact) {
-        this.addClusterServer(this.getDefaultBooleanStateClusterServer(contact));
-    }
-    /**
-     * Get a default boolean state configuration cluster server.
-     *
-     * @param contact - Optional boolean value indicating the sensor fault state. Defaults to `false` if not provided.
-     */
-    getDefaultBooleanStateConfigurationClusterServer(sensorFault = false) {
-        return ClusterServer(BooleanStateConfigurationCluster.with(BooleanStateConfiguration.Feature.Visual, BooleanStateConfiguration.Feature.Audible, BooleanStateConfiguration.Feature.SensitivityLevel), {
-            currentSensitivityLevel: 0,
-            supportedSensitivityLevels: 2,
-            defaultSensitivityLevel: 0,
-            alarmsActive: { visual: false, audible: false },
-            alarmsEnabled: { visual: false, audible: false },
-            alarmsSupported: { visual: true, audible: true },
-            // alarmsSuppressed: { visual: false, audible: false },
-            sensorFault: { generalFault: sensorFault },
-        }, {
-            enableDisableAlarm: async (data) => {
-                // Never called in edge
-            },
-        }, {
-            alarmsStateChanged: true,
-            sensorFault: true,
+    createDefaultFlowMeasurementClusterServer(measuredValue = 0) {
+        this.behaviors.require(FlowMeasurementServer, this.getDefaultFlowMeasurementClusterServer(measuredValue));
+        return this;
+    }
+    getDefaultOccupancySensingClusterServer(occupied = false) {
+        return optionsFor(OccupancySensingServer, {
+            occupancy: { occupied },
+            occupancySensorType: OccupancySensing.OccupancySensorType.Pir,
+            occupancySensorTypeBitmap: { pir: true, ultrasonic: false, physicalContact: false },
+            pirOccupiedToUnoccupiedDelay: 30,
         });
     }
-    /**
-     * Creates a default boolean state configuration cluster server.
-     *
-     * @param contact - Optional boolean value indicating the sensor fault state. Defaults to `false` if not provided.
-     */
-    createDefaultBooleanStateConfigurationClusterServer(sensorFault = false) {
-        this.addClusterServer(this.getDefaultBooleanStateConfigurationClusterServer(sensorFault));
-    }
-    /**
-     * Get a default power source replaceable battery cluster server.
-     *
-     * @param batPercentRemaining - The remaining battery percentage (default: 100).
-     * @param batChargeLevel - The battery charge level (default: PowerSource.BatChargeLevel.Ok).
-     * @param batVoltage - The battery voltage (default: 1500).
-     * @param batReplacementDescription - The battery replacement description (default: 'Battery type').
-     * @param batQuantity - The battery quantity (default: 1).
-     */
-    getDefaultPowerSourceReplaceableBatteryClusterServer(batPercentRemaining = 100, batChargeLevel = PowerSource.BatChargeLevel.Ok, batVoltage = 1500, batReplacementDescription = 'Battery type', batQuantity = 1) {
-        return ClusterServer(PowerSourceCluster.with(PowerSource.Feature.Battery, PowerSource.Feature.Replaceable), {
-            status: PowerSource.PowerSourceStatus.Active,
-            order: 0,
-            description: 'Primary battery',
-            batVoltage,
-            batPercentRemaining: Math.min(Math.max(batPercentRemaining * 2, 0), 200),
-            batChargeLevel,
-            batReplacementNeeded: false,
-            batReplaceability: PowerSource.BatReplaceability.UserReplaceable,
-            activeBatFaults: undefined,
-            batReplacementDescription,
-            batQuantity,
-            endpointList: [],
-        }, {}, {});
-    }
-    /**
-     * Creates a default power source replaceable battery cluster server.
-     *
-     * @param batPercentRemaining - The remaining battery percentage (default: 100).
-     * @param batChargeLevel - The battery charge level (default: PowerSource.BatChargeLevel.Ok).
-     * @param batVoltage - The battery voltage (default: 1500).
-     * @param batReplacementDescription - The battery replacement description (default: 'Battery type').
-     * @param batQuantity - The battery quantity (default: 1).
-     */
-    createDefaultPowerSourceReplaceableBatteryClusterServer(batPercentRemaining = 100, batChargeLevel = PowerSource.BatChargeLevel.Ok, batVoltage = 1500, batReplacementDescription = 'Battery type', batQuantity = 1) {
-        this.addClusterServer(this.getDefaultPowerSourceReplaceableBatteryClusterServer(batPercentRemaining, batChargeLevel, batVoltage, batReplacementDescription, batQuantity));
-    }
-    /**
-     * Get a default power source rechargeable battery cluster server.
-     *
-     * @param batPercentRemaining - The remaining battery percentage (default: 100).
-     * @param batChargeLevel - The battery charge level (default: PowerSource.BatChargeLevel.Ok).
-     * @param batVoltage - The battery voltage (default: 1500).
-     */
-    getDefaultPowerSourceRechargeableBatteryClusterServer(batPercentRemaining = 100, batChargeLevel = PowerSource.BatChargeLevel.Ok, batVoltage = 1500) {
-        return ClusterServer(PowerSourceCluster.with(PowerSource.Feature.Battery, PowerSource.Feature.Rechargeable), {
-            status: PowerSource.PowerSourceStatus.Active,
-            order: 0,
-            description: 'Primary battery',
-            batVoltage,
-            batPercentRemaining: Math.min(Math.max(batPercentRemaining * 2, 0), 200),
-            batTimeRemaining: 1,
-            batChargeLevel,
-            batReplacementNeeded: false,
-            batReplaceability: PowerSource.BatReplaceability.Unspecified,
-            activeBatFaults: undefined,
-            batChargeState: PowerSource.BatChargeState.IsNotCharging,
-            batFunctionalWhileCharging: true,
-            endpointList: [],
-        }, {}, {});
-    }
-    /**
-     * Creates a default power source rechargeable battery cluster server.
-     *
-     * @param batPercentRemaining - The remaining battery percentage (default: 100).
-     * @param batChargeLevel - The battery charge level (default: PowerSource.BatChargeLevel.Ok).
-     * @param batVoltage - The battery voltage (default: 1500).
-     */
-    createDefaultPowerSourceRechargeableBatteryClusterServer(batPercentRemaining = 100, batChargeLevel = PowerSource.BatChargeLevel.Ok, batVoltage = 1500) {
-        this.addClusterServer(this.getDefaultPowerSourceRechargeableBatteryClusterServer(batPercentRemaining, batChargeLevel, batVoltage));
-    }
-    /**
-     * Get a default power source wired cluster server.
-     *
-     * @param wiredCurrentType - The type of wired current (default: PowerSource.WiredCurrentType.Ac)
-     */
-    getDefaultPowerSourceWiredClusterServer(wiredCurrentType = PowerSource.WiredCurrentType.Ac) {
-        return ClusterServer(PowerSourceCluster.with(PowerSource.Feature.Wired), {
-            wiredCurrentType,
-            description: wiredCurrentType === PowerSource.WiredCurrentType.Ac ? 'AC Power' : 'DC Power',
-            status: PowerSource.PowerSourceStatus.Active,
-            order: 0,
-            endpointList: [],
-        }, {}, {});
+    createDefaultOccupancySensingClusterServer(occupied = false) {
+        this.behaviors.require(OccupancySensingServer, this.getDefaultOccupancySensingClusterServer(occupied));
+        return this;
     }
-    /**
-     * Creates a default power source wired cluster server.
-     *
-     * @param wiredCurrentType - The type of wired current (default: PowerSource.WiredCurrentType.Ac)
-     */
-    createDefaultPowerSourceWiredClusterServer(wiredCurrentType = PowerSource.WiredCurrentType.Ac) {
-        this.addClusterServer(this.getDefaultPowerSourceWiredClusterServer(wiredCurrentType));
-    }
-    /**
-     * Get a default air quality cluster server.
-     *
-     * @param airQuality The air quality type. Defaults to `AirQuality.AirQualityType.Unknown`.
-     */
-    getDefaultAirQualityClusterServer(airQuality = AirQuality.AirQualityEnum.Unknown) {
-        return ClusterServer(AirQualityCluster.with(AirQuality.Feature.Fair, AirQuality.Feature.Moderate, AirQuality.Feature.VeryPoor, AirQuality.Feature.ExtremelyPoor), {
+    createDefaultAirQualityClusterServer(airQuality = AirQuality.AirQualityEnum.Unknown) {
+        this.behaviors.require(AirQualityServer.with(AirQuality.Feature.Fair, AirQuality.Feature.Moderate, AirQuality.Feature.VeryPoor, AirQuality.Feature.ExtremelyPoor), {
             airQuality,
-        }, {}, {});
+        });
+        return this;
     }
-    /**
-     * Creates a default air quality cluster server.
-     *
-     * @param airQuality The air quality type. Defaults to `AirQuality.AirQualityType.Unknown`.
-     */
-    createDefaultAirQualityClusterServer(airQuality = AirQuality.AirQualityEnum.Unknown) {
-        this.addClusterServer(this.getDefaultAirQualityClusterServer(airQuality));
-    }
-    /**
-     * Get a default TVOC measurement cluster server.
-     *
-     * @param measuredValue - The measured value for TVOC.
-     */
-    getDefaultTvocMeasurementClusterServer(measuredValue = 0, measurementUnit = ConcentrationMeasurement.MeasurementUnit.Ppm, measurementMedium = ConcentrationMeasurement.MeasurementMedium.Air) {
-        return ClusterServer(TotalVolatileOrganicCompoundsConcentrationMeasurementCluster.with('NumericMeasurement'), {
+    createDefaultTvocMeasurementClusterServer(measuredValue = 0, measurementUnit = ConcentrationMeasurement.MeasurementUnit.Ppm, measurementMedium = ConcentrationMeasurement.MeasurementMedium.Air) {
+        this.behaviors.require(TotalVolatileOrganicCompoundsConcentrationMeasurementServer.with(ConcentrationMeasurement.Feature.NumericMeasurement), {
             measuredValue,
             minMeasuredValue: null,
             maxMeasuredValue: null,
             uncertainty: 0,
             measurementUnit,
             measurementMedium,
-        }, {}, {});
-    }
-    /**
-     * Creates a default TVOC measurement cluster server.
-     *
-     * @param measuredValue - The measured value for TVOC.
-     */
-    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) => {
-                // Never called in edge
-            },
-        }, {});
-    }
-    /**
-     * 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) => {
-                // Never called in edge
-            },
-        }, {});
-    }
-    /**
-     * 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.
-     *
-     * @param {number} [localTemperature=23] - The local temperature value in degrees Celsius. Defaults to 23°.
-     * @param {number} [occupiedHeatingSetpoint=21] - The occupied heating setpoint value in degrees Celsius. Defaults to 21°.
-     * @param {number} [occupiedCoolingSetpoint=25] - The occupied cooling setpoint value in degrees Celsius. Defaults to 25°.
-     * @param {number} [minSetpointDeadBand=1] - The minimum setpoint dead band value. Defaults to 1°.
-     * @param {number} [minHeatSetpointLimit=0] - The minimum heat setpoint limit value. Defaults to 0°.
-     * @param {number} [maxHeatSetpointLimit=50] - The maximum heat setpoint limit value. Defaults to 50°.
-     * @param {number} [minCoolSetpointLimit=0] - The minimum cool setpoint limit value. Defaults to 0°.
-     * @param {number} [maxCoolSetpointLimit=50] - The maximum cool setpoint limit value. Defaults to 50°.
-     * @returns {ThermostatClusterServer} A default thermostat cluster server configured with the specified parameters.
-     */
-    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,
-            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,
-            thermostatRunningMode: Thermostat.ThermostatRunningMode.Off,
-        }, {
-            setpointRaiseLower: async (data) => {
-                // Never called in edge
-            },
-        }, {});
-    }
-    /**
-     * Creates and adds a default thermostat cluster server to the device.
-     *
-     * @param {number} [localTemperature=23] - The local temperature value in degrees Celsius. Defaults to 23°.
-     * @param {number} [occupiedHeatingSetpoint=21] - The occupied heating setpoint value in degrees Celsius. Defaults to 21°.
-     * @param {number} [occupiedCoolingSetpoint=25] - The occupied cooling setpoint value in degrees Celsius. Defaults to 25°.
-     * @param {number} [minSetpointDeadBand=1] - The minimum setpoint dead band value. Defaults to 1°.
-     * @param {number} [minHeatSetpointLimit=0] - The minimum heat setpoint limit value. Defaults to 0°.
-     * @param {number} [maxHeatSetpointLimit=50] - The maximum heat setpoint limit value. Defaults to 50°.
-     * @param {number} [minCoolSetpointLimit=0] - The minimum cool setpoint limit value. Defaults to 0°.
-     * @param {number} [maxCoolSetpointLimit=50] - The maximum cool setpoint limit value. Defaults to 50°.
-     */
-    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));
-    }
-    /**
-     * Returns the default SmokeCOAlarm Cluster Server.
-     *
-     * @param smokeState - The state of the smoke alarm. Defaults to SmokeCoAlarm.AlarmState.Normal.
-     * @param coState - The state of the CO alarm. Defaults to SmokeCoAlarm.AlarmState.Normal.
-     * @returns The default SmokeCOAlarmClusterServer.
-     */
-    getDefaultSmokeCOAlarmClusterServer(smokeState = SmokeCoAlarm.AlarmState.Normal, coState = SmokeCoAlarm.AlarmState.Normal) {
-        return ClusterServer(SmokeCoAlarmCluster.with(SmokeCoAlarm.Feature.SmokeAlarm, SmokeCoAlarm.Feature.CoAlarm), {
-            smokeState,
-            coState,
-            expressedState: SmokeCoAlarm.ExpressedState.Normal,
-            batteryAlert: SmokeCoAlarm.AlarmState.Normal,
-            deviceMuted: SmokeCoAlarm.MuteState.NotMuted,
-            testInProgress: false,
-            hardwareFaultAlert: false,
-            endOfServiceAlert: SmokeCoAlarm.EndOfService.Normal,
-            interconnectSmokeAlarm: SmokeCoAlarm.AlarmState.Normal,
-            interconnectCoAlarm: SmokeCoAlarm.AlarmState.Normal,
-        }, {
-            selfTestRequest: async (data) => {
-                // Never called in edge
-            },
-        }, {
-            smokeAlarm: true,
-            interconnectSmokeAlarm: true,
-            coAlarm: true,
-            interconnectCoAlarm: true,
-            lowBattery: true,
-            hardwareFault: true,
-            endOfService: true,
-            selfTestComplete: true,
-            alarmMuted: true,
-            muteEnded: true,
-            allClear: true,
         });
+        return this;
     }
-    /**
-     * Create the default SmokeCOAlarm Cluster Server.
-     *
-     * @param smokeState - The state of the smoke alarm. Defaults to SmokeCoAlarm.AlarmState.Normal.
-     * @param coState - The state of the CO alarm. Defaults to SmokeCoAlarm.AlarmState.Normal.
-     * @returns The default SmokeCOAlarmClusterServer.
-     */
-    createDefaultSmokeCOAlarmClusterServer(smokeState = SmokeCoAlarm.AlarmState.Normal, coState = SmokeCoAlarm.AlarmState.Normal) {
-        this.addClusterServer(this.getDefaultSmokeCOAlarmClusterServer(smokeState, coState));
-    }
-    /**
-     * Returns the default Carbon Monoxide Concentration Measurement Cluster Server.
-     *
-     * @param {number} measuredValue - The measured value of the concentration.
-     * @param {ConcentrationMeasurement.MeasurementUnit} measurementUnit - The unit of measurement.
-     * @param {ConcentrationMeasurement.MeasurementMedium} measurementMedium - The medium of measurement.
-     * @returns {ClusterServer} - The default Carbon Monoxide Concentration Measurement Cluster Server.
-     */
-    getDefaultCarbonMonoxideConcentrationMeasurementClusterServer(measuredValue = 0, measurementUnit = ConcentrationMeasurement.MeasurementUnit.Ppm, measurementMedium = ConcentrationMeasurement.MeasurementMedium.Air) {
-        return ClusterServer(CarbonMonoxideConcentrationMeasurementCluster.with('NumericMeasurement'), {
-            measuredValue,
-            minMeasuredValue: null,
-            maxMeasuredValue: null,
-            uncertainty: 0,
-            measurementUnit,
-            measurementMedium,
-        }, {}, {});
-    }
-    /**
-     * Create the default Carbon Monoxide Concentration Measurement Cluster Server.
-     *
-     * @param {number} measuredValue - The measured value of the concentration.
-     * @param {ConcentrationMeasurement.MeasurementUnit} measurementUnit - The unit of measurement.
-     * @param {ConcentrationMeasurement.MeasurementMedium} measurementMedium - The medium of measurement.
-     */
     createDefaultCarbonMonoxideConcentrationMeasurementClusterServer(measuredValue = 0, measurementUnit = ConcentrationMeasurement.MeasurementUnit.Ppm, measurementMedium = ConcentrationMeasurement.MeasurementMedium.Air) {
-        this.addClusterServer(this.getDefaultCarbonMonoxideConcentrationMeasurementClusterServer(measuredValue, measurementUnit, measurementMedium));
-    }
-    /**
-     * Returns the default Carbon Dioxide Concentration Measurement Cluster Server.
-     *
-     * @param {number} measuredValue - The measured value of the concentration.
-     * @param {ConcentrationMeasurement.MeasurementUnit} measurementUnit - The unit of measurement.
-     * @param {ConcentrationMeasurement.MeasurementMedium} measurementMedium - The medium of measurement.
-     * @returns {ClusterServer} - The default Carbon Monoxide Concentration Measurement Cluster Server.
-     */
-    getDefaultCarbonDioxideConcentrationMeasurementClusterServer(measuredValue = 0, measurementUnit = ConcentrationMeasurement.MeasurementUnit.Ppm, measurementMedium = ConcentrationMeasurement.MeasurementMedium.Air) {
-        return ClusterServer(CarbonDioxideConcentrationMeasurementCluster.with('NumericMeasurement'), {
+        this.behaviors.require(CarbonMonoxideConcentrationMeasurementServer.with(ConcentrationMeasurement.Feature.NumericMeasurement), {
             measuredValue,
             minMeasuredValue: null,
             maxMeasuredValue: null,
             uncertainty: 0,
             measurementUnit,
             measurementMedium,
-        }, {}, {});
-    }
-    /**
-     * Create the default Carbon Dioxide Concentration Measurement Cluster Server.
-     *
-     * @param {number} measuredValue - The measured value of the concentration.
-     * @param {ConcentrationMeasurement.MeasurementUnit} measurementUnit - The unit of measurement.
-     * @param {ConcentrationMeasurement.MeasurementMedium} measurementMedium - The medium of measurement.
-     */
+        });
+        return this;
+    }
     createDefaultCarbonDioxideConcentrationMeasurementClusterServer(measuredValue = 0, measurementUnit = ConcentrationMeasurement.MeasurementUnit.Ppm, measurementMedium = ConcentrationMeasurement.MeasurementMedium.Air) {
-        this.addClusterServer(this.getDefaultCarbonDioxideConcentrationMeasurementClusterServer(measuredValue, measurementUnit, measurementMedium));
-    }
-    /**
-     * Returns the default Formaldehyde Concentration Measurement Cluster Server.
-     *
-     * @param {number} measuredValue - The measured value of the concentration.
-     * @param {ConcentrationMeasurement.MeasurementUnit} measurementUnit - The unit of measurement.
-     * @param {ConcentrationMeasurement.MeasurementMedium} measurementMedium - The medium of measurement.
-     * @returns {ClusterServer} - The default Carbon Monoxide Concentration Measurement Cluster Server.
-     */
-    getDefaultFormaldehydeConcentrationMeasurementClusterServer(measuredValue = 0, measurementUnit = ConcentrationMeasurement.MeasurementUnit.Ppm, measurementMedium = ConcentrationMeasurement.MeasurementMedium.Air) {
-        return ClusterServer(FormaldehydeConcentrationMeasurementCluster.with('NumericMeasurement'), {
+        this.behaviors.require(CarbonDioxideConcentrationMeasurementServer.with(ConcentrationMeasurement.Feature.NumericMeasurement), {
             measuredValue,
             minMeasuredValue: null,
             maxMeasuredValue: null,
             uncertainty: 0,
             measurementUnit,
             measurementMedium,
-        }, {}, {});
-    }
-    /**
-     * Create the default Formaldehyde Concentration Measurement Cluster Server.
-     *
-     * @param {number} measuredValue - The measured value of the concentration.
-     * @param {ConcentrationMeasurement.MeasurementUnit} measurementUnit - The unit of measurement.
-     * @param {ConcentrationMeasurement.MeasurementMedium} measurementMedium - The medium of measurement.
-     */
+        });
+        return this;
+    }
     createDefaultFormaldehydeConcentrationMeasurementClusterServer(measuredValue = 0, measurementUnit = ConcentrationMeasurement.MeasurementUnit.Ppm, measurementMedium = ConcentrationMeasurement.MeasurementMedium.Air) {
-        this.addClusterServer(this.getDefaultFormaldehydeConcentrationMeasurementClusterServer(measuredValue, measurementUnit, measurementMedium));
-    }
-    /**
-     * Returns the default Pm1 Concentration Measurement Cluster Server.
-     *
-     * @param {number} measuredValue - The measured value of the concentration.
-     * @param {ConcentrationMeasurement.MeasurementUnit} measurementUnit - The unit of measurement.
-     * @param {ConcentrationMeasurement.MeasurementMedium} measurementMedium - The medium of measurement.
-     * @returns {ClusterServer} - The default Carbon Monoxide Concentration Measurement Cluster Server.
-     */
-    getDefaultPm1ConcentrationMeasurementClusterServer(measuredValue = 0, measurementUnit = ConcentrationMeasurement.MeasurementUnit.Ppm, measurementMedium = ConcentrationMeasurement.MeasurementMedium.Air) {
-        return ClusterServer(Pm1ConcentrationMeasurementCluster.with('NumericMeasurement'), {
+        this.behaviors.require(FormaldehydeConcentrationMeasurementServer.with(ConcentrationMeasurement.Feature.NumericMeasurement), {
             measuredValue,
             minMeasuredValue: null,
             maxMeasuredValue: null,
             uncertainty: 0,
             measurementUnit,
             measurementMedium,
-        }, {}, {});
-    }
-    /**
-     * Create the default Pm1 Concentration Measurement Cluster Server.
-     *
-     * @param {number} measuredValue - The measured value of the concentration.
-     * @param {ConcentrationMeasurement.MeasurementUnit} measurementUnit - The unit of measurement.
-     * @param {ConcentrationMeasurement.MeasurementMedium} measurementMedium - The medium of measurement.
-     */
+        });
+        return this;
+    }
     createDefaultPm1ConcentrationMeasurementClusterServer(measuredValue = 0, measurementUnit = ConcentrationMeasurement.MeasurementUnit.Ppm, measurementMedium = ConcentrationMeasurement.MeasurementMedium.Air) {
-        this.addClusterServer(this.getDefaultPm1ConcentrationMeasurementClusterServer(measuredValue, measurementUnit, measurementMedium));
-    }
-    /**
-     * Returns the default Pm25 Concentration Measurement Cluster Server.
-     *
-     * @param {number} measuredValue - The measured value of the concentration.
-     * @param {ConcentrationMeasurement.MeasurementUnit} measurementUnit - The unit of measurement.
-     * @param {ConcentrationMeasurement.MeasurementMedium} measurementMedium - The medium of measurement.
-     * @returns {ClusterServer} - The default Carbon Monoxide Concentration Measurement Cluster Server.
-     */
-    getDefaultPm25ConcentrationMeasurementClusterServer(measuredValue = 0, measurementUnit = ConcentrationMeasurement.MeasurementUnit.Ppm, measurementMedium = ConcentrationMeasurement.MeasurementMedium.Air) {
-        return ClusterServer(Pm25ConcentrationMeasurementCluster.with('NumericMeasurement'), {
+        this.behaviors.require(Pm1ConcentrationMeasurementServer.with(ConcentrationMeasurement.Feature.NumericMeasurement), {
             measuredValue,
             minMeasuredValue: null,
             maxMeasuredValue: null,
             uncertainty: 0,
             measurementUnit,
             measurementMedium,
-        }, {}, {});
-    }
-    /**
-     * Create the default Pm25 Concentration Measurement Cluster Server.
-     *
-     * @param {number} measuredValue - The measured value of the concentration.
-     * @param {ConcentrationMeasurement.MeasurementUnit} measurementUnit - The unit of measurement.
-     * @param {ConcentrationMeasurement.MeasurementMedium} measurementMedium - The medium of measurement.
-     */
+        });
+        return this;
+    }
     createDefaultPm25ConcentrationMeasurementClusterServer(measuredValue = 0, measurementUnit = ConcentrationMeasurement.MeasurementUnit.Ppm, measurementMedium = ConcentrationMeasurement.MeasurementMedium.Air) {
-        this.addClusterServer(this.getDefaultPm25ConcentrationMeasurementClusterServer(measuredValue, measurementUnit, measurementMedium));
-    }
-    /**
-     * Returns the default Pm10 Concentration Measurement Cluster Server.
-     *
-     * @param {number} measuredValue - The measured value of the concentration.
-     * @param {ConcentrationMeasurement.MeasurementUnit} measurementUnit - The unit of measurement.
-     * @param {ConcentrationMeasurement.MeasurementMedium} measurementMedium - The medium of measurement.
-     * @returns {ClusterServer} - The default Carbon Monoxide Concentration Measurement Cluster Server.
-     */
-    getDefaultPm10ConcentrationMeasurementClusterServer(measuredValue = 0, measurementUnit = ConcentrationMeasurement.MeasurementUnit.Ppm, measurementMedium = ConcentrationMeasurement.MeasurementMedium.Air) {
-        return ClusterServer(Pm10ConcentrationMeasurementCluster.with('NumericMeasurement'), {
+        this.behaviors.require(Pm25ConcentrationMeasurementServer.with(ConcentrationMeasurement.Feature.NumericMeasurement), {
             measuredValue,
             minMeasuredValue: null,
             maxMeasuredValue: null,
             uncertainty: 0,
             measurementUnit,
             measurementMedium,
-        }, {}, {});
-    }
-    /**
-     * Create the default Pm10 Concentration Measurement Cluster Server.
-     *
-     * @param {number} measuredValue - The measured value of the concentration.
-     * @param {ConcentrationMeasurement.MeasurementUnit} measurementUnit - The unit of measurement.
-     * @param {ConcentrationMeasurement.MeasurementMedium} measurementMedium - The medium of measurement.
-     */
+        });
+        return this;
+    }
     createDefaultPm10ConcentrationMeasurementClusterServer(measuredValue = 0, measurementUnit = ConcentrationMeasurement.MeasurementUnit.Ppm, measurementMedium = ConcentrationMeasurement.MeasurementMedium.Air) {
-        this.addClusterServer(this.getDefaultPm10ConcentrationMeasurementClusterServer(measuredValue, measurementUnit, measurementMedium));
-    }
-    /**
-     * Returns the default Ozone Concentration Measurement Cluster Server.
-     *
-     * @param {number} measuredValue - The measured value of the concentration.
-     * @param {ConcentrationMeasurement.MeasurementUnit} measurementUnit - The unit of measurement.
-     * @param {ConcentrationMeasurement.MeasurementMedium} measurementMedium - The medium of measurement.
-     * @returns {ClusterServer} - The default Carbon Monoxide Concentration Measurement Cluster Server.
-     */
-    getDefaultOzoneConcentrationMeasurementClusterServer(measuredValue = 0, measurementUnit = ConcentrationMeasurement.MeasurementUnit.Ugm3, measurementMedium = ConcentrationMeasurement.MeasurementMedium.Air) {
-        return ClusterServer(OzoneConcentrationMeasurementCluster.with('NumericMeasurement'), {
+        this.behaviors.require(Pm10ConcentrationMeasurementServer.with(ConcentrationMeasurement.Feature.NumericMeasurement), {
             measuredValue,
             minMeasuredValue: null,
             maxMeasuredValue: null,
             uncertainty: 0,
             measurementUnit,
             measurementMedium,
-        }, {}, {});
-    }
-    /**
-     * Create the default Ozone Concentration Measurement Cluster Server.
-     *
-     * @param {number} measuredValue - The measured value of the concentration.
-     * @param {ConcentrationMeasurement.MeasurementUnit} measurementUnit - The unit of measurement.
-     * @param {ConcentrationMeasurement.MeasurementMedium} measurementMedium - The medium of measurement.
-     */
+        });
+        return this;
+    }
     createDefaultOzoneConcentrationMeasurementClusterServer(measuredValue = 0, measurementUnit = ConcentrationMeasurement.MeasurementUnit.Ugm3, measurementMedium = ConcentrationMeasurement.MeasurementMedium.Air) {
-        this.addClusterServer(this.getDefaultOzoneConcentrationMeasurementClusterServer(measuredValue, measurementUnit, measurementMedium));
-    }
-    /**
-     * Returns the default Radon Concentration Measurement Cluster Server.
-     *
-     * @param {number} measuredValue - The measured value of the concentration.
-     * @param {ConcentrationMeasurement.MeasurementUnit} measurementUnit - The unit of measurement.
-     * @param {ConcentrationMeasurement.MeasurementMedium} measurementMedium - The medium of measurement.
-     * @returns {ClusterServer} - The default Carbon Monoxide Concentration Measurement Cluster Server.
-     */
-    getDefaultRadonConcentrationMeasurementClusterServer(measuredValue = 0, measurementUnit = ConcentrationMeasurement.MeasurementUnit.Ppm, measurementMedium = ConcentrationMeasurement.MeasurementMedium.Air) {
-        return ClusterServer(RadonConcentrationMeasurementCluster.with('NumericMeasurement'), {
+        this.behaviors.require(OzoneConcentrationMeasurementServer.with(ConcentrationMeasurement.Feature.NumericMeasurement), {
             measuredValue,
             minMeasuredValue: null,
             maxMeasuredValue: null,
             uncertainty: 0,
             measurementUnit,
             measurementMedium,
-        }, {}, {});
-    }
-    /**
-     * Create the default Radon Concentration Measurement Cluster Server.
-     *
-     * @param {number} measuredValue - The measured value of the concentration.
-     * @param {ConcentrationMeasurement.MeasurementUnit} measurementUnit - The unit of measurement.
-     * @param {ConcentrationMeasurement.MeasurementMedium} measurementMedium - The medium of measurement.
-     */
+        });
+        return this;
+    }
     createDefaultRadonConcentrationMeasurementClusterServer(measuredValue = 0, measurementUnit = ConcentrationMeasurement.MeasurementUnit.Ppm, measurementMedium = ConcentrationMeasurement.MeasurementMedium.Air) {
-        this.addClusterServer(this.getDefaultRadonConcentrationMeasurementClusterServer(measuredValue, measurementUnit, measurementMedium));
-    }
-    /**
-     * Returns the default Nitrogen Dioxide Concentration Measurement Cluster Server.
-     *
-     * @param {number} measuredValue - The measured value of the concentration.
-     * @param {ConcentrationMeasurement.MeasurementUnit} measurementUnit - The unit of measurement.
-     * @param {ConcentrationMeasurement.MeasurementMedium} measurementMedium - The medium of measurement.
-     * @returns {ClusterServer} - The default Carbon Monoxide Concentration Measurement Cluster Server.
-     */
-    getDefaultNitrogenDioxideConcentrationMeasurementClusterServer(measuredValue = 0, measurementUnit = ConcentrationMeasurement.MeasurementUnit.Ugm3, measurementMedium = ConcentrationMeasurement.MeasurementMedium.Air) {
-        return ClusterServer(NitrogenDioxideConcentrationMeasurementCluster.with('NumericMeasurement'), {
+        this.behaviors.require(RadonConcentrationMeasurementServer.with(ConcentrationMeasurement.Feature.NumericMeasurement), {
             measuredValue,
             minMeasuredValue: null,
             maxMeasuredValue: null,
             uncertainty: 0,
             measurementUnit,
             measurementMedium,
-        }, {}, {});
-    }
-    /**
-     * Create the default Nitrogen Dioxide Concentration Measurement Cluster Server.
-     *
-     * @param {number} measuredValue - The measured value of the concentration.
-     * @param {ConcentrationMeasurement.MeasurementUnit} measurementUnit - The unit of measurement.
-     * @param {ConcentrationMeasurement.MeasurementMedium} measurementMedium - The medium of measurement.
-     */
+        });
+        return this;
+    }
     createDefaultNitrogenDioxideConcentrationMeasurementClusterServer(measuredValue = 0, measurementUnit = ConcentrationMeasurement.MeasurementUnit.Ugm3, measurementMedium = ConcentrationMeasurement.MeasurementMedium.Air) {
-        this.addClusterServer(this.getDefaultNitrogenDioxideConcentrationMeasurementClusterServer(measuredValue, measurementUnit, measurementMedium));
-    }
-    /**
-     * Returns the default fan control cluster server rev 2.
-     *
-     * @param fanMode The fan mode to set. Defaults to `FanControl.FanMode.Off`.
-     * @returns The default fan control cluster server.
-     */
-    getDefaultFanControlClusterServer(fanMode = FanControl.FanMode.Off) {
-        return ClusterServer(FanControlCluster.with(FanControl.Feature.MultiSpeed, FanControl.Feature.Auto, FanControl.Feature.Step), {
-            fanMode,
-            fanModeSequence: FanControl.FanModeSequence.OffLowMedHighAuto,
-            percentSetting: 0,
-            percentCurrent: 0,
-            speedMax: 100,
-            speedSetting: 0,
-            speedCurrent: 0,
-        }, {
-            step: async (data) => {
-                // Never called in edge
-            },
-        }, {});
-    }
-    /**
-     * Create the default fan control cluster server rev 2.
-     *
-     * @param fanMode The fan mode to set. Defaults to `FanControl.FanMode.Off`.
-     * @returns The default fan control cluster server.
-     */
-    createDefaultFanControlClusterServer(fanMode = FanControl.FanMode.Off) {
-        this.addClusterServer(this.getDefaultFanControlClusterServer(fanMode));
-    }
-    /**
-     * Returns the default Pump Configuration And Control cluster server.
-     *
-     * @param {PumpConfigurationAndControl.OperationMode} [pumpMode=PumpConfigurationAndControl.OperationMode.Normal] - The pump mode to set. Defaults to `PumpConfigurationAndControl.OperationMode.Normal`.
-     * @returns {ClusterServer} - The default Pump Configuration And Control cluster server.
-     */
-    getDefaultPumpConfigurationAndControlClusterServer(pumpMode = PumpConfigurationAndControl.OperationMode.Normal) {
-        return ClusterServer(PumpConfigurationAndControlCluster.with(PumpConfigurationAndControl.Feature.ConstantSpeed), {
-            minConstSpeed: null,
-            maxConstSpeed: null,
-            maxPressure: null,
-            maxSpeed: null,
-            maxFlow: null,
-            effectiveOperationMode: pumpMode,
-            effectiveControlMode: PumpConfigurationAndControl.ControlMode.ConstantSpeed,
-            capacity: null,
-            operationMode: pumpMode,
-        }, {}, {});
-    }
-    /**
-     * Creates the default Pump Configuration And Control cluster server.
-     *
-     * @param {PumpConfigurationAndControl.OperationMode} [pumpMode=PumpConfigurationAndControl.OperationMode.Normal] - The pump mode to set. Defaults to `PumpConfigurationAndControl.OperationMode.Normal`.
-     * @returns {void}
-     */
-    createDefaultPumpConfigurationAndControlClusterServer(pumpMode = PumpConfigurationAndControl.OperationMode.Normal) {
-        this.addClusterServer(this.getDefaultPumpConfigurationAndControlClusterServer(pumpMode));
-    }
-    /**
-     * Returns the default Valve Configuration And Control cluster server rev 2.
-     *
-     * @param {ValveConfigurationAndControl.ValveState} [valveState=ValveConfigurationAndControl.ValveState.Closed] - The valve state to set. Defaults to `ValveConfigurationAndControl.ValveState.Closed`.
-     * @param {number} [valveLevel=0] - The valve level to set. Defaults to 0.
-     * @returns {ClusterServer} - The default Valve Configuration And Control cluster server.
-     */
-    getDefaultValveConfigurationAndControlClusterServer(valveState = ValveConfigurationAndControl.ValveState.Closed, valveLevel = 0) {
-        return ClusterServer(ValveConfigurationAndControlCluster.with(ValveConfigurationAndControl.Feature.Level), {
-            currentState: valveState,
-            targetState: valveState,
-            currentLevel: valveLevel,
-            targetLevel: valveLevel,
-            openDuration: null,
-            defaultOpenDuration: null,
-            remainingDuration: null,
-        }, {
-            open: async (data) => {
-                // Never called in edge
-            },
-            close: async (data) => {
-                // Never called in edge
-            },
-        }, {});
-    }
-    /**
-     * Create the default Valve Configuration And Control cluster server rev 2.
-     *
-     * @param {ValveConfigurationAndControl.ValveState} [valveState=ValveConfigurationAndControl.ValveState.Closed] - The valve state to set. Defaults to `ValveConfigurationAndControl.ValveState.Closed`.
-     * @param {number} [valveLevel=0] - The valve level to set. Defaults to 0.
-     * @returns {void}
-     */
-    createDefaultValveConfigurationAndControlClusterServer(valveState = ValveConfigurationAndControl.ValveState.Closed, valveLevel = 0) {
-        this.addClusterServer(this.getDefaultValveConfigurationAndControlClusterServer(valveState, valveLevel));
+        this.behaviors.require(NitrogenDioxideConcentrationMeasurementServer.with(ConcentrationMeasurement.Feature.NumericMeasurement), {
+            measuredValue,
+            minMeasuredValue: null,
+            maxMeasuredValue: null,
+            uncertainty: 0,
+            measurementUnit,
+            measurementMedium,
+        });
+        return this;
     }
 }
-//# sourceMappingURL=matterbridgeEndpoint.js.map