matterbridge-example-dynamic-platform 2.0.19-dev-20260606-273db3d → 2.0.19-dev-20260614-df71f89

package/dist/module.js

@@ -1,8 +1,8 @@
-import { aggregator, airPurifier, airQualitySensor, bridgedNode, colorTemperatureLight, contactSensor, coverDevice, dimmableLight, dimmableMountedSwitch, dimmableOutlet, doorLockDevice, electricalSensor, extendedColorLight, fanDevice, flowSensor, genericSwitch, getSemtag, humiditySensor, lightSensor, MatterbridgeDynamicPlatform, MatterbridgeEndpoint, modeSelect, occupancySensor, onOffLight, onOffMountedSwitch, onOffOutlet, onOffSwitch, powerSource, pressureSensor, pumpDevice, rainSensor, smokeCoAlarm, temperatureSensor, thermostatDevice, waterFreezeDetector, waterLeakDetector, waterValve, } from 'matterbridge';
+import { aggregator, airPurifier, airQualitySensor, bridgedNode, colorTemperatureLight, contactSensor, windowCovering, dimmableLight, mountedDimmableLoadControl, dimmablePlugInUnit, doorLock, electricalSensor, extendedColorLight, fan, flowSensor, genericSwitch, getSemtag, humiditySensor, lightSensor, MatterbridgeDynamicPlatform, MatterbridgeEndpoint, modeSelect, occupancySensor, onOffLight, mountedOnOffControl, onOffPlugInUnit, onOffLightSwitch, powerSource, pressureSensor, pump, rainSensor, smokeCoAlarm, temperatureSensor, thermostat, waterFreezeDetector, waterLeakDetector, waterValve, } from 'matterbridge';
 import { AirConditioner, BasicVideoPlayer, BatteryStorage, Cooktop, Dishwasher, Evse, ExtractorHood, HeatPump, IrrigationSystem, LaundryDryer, LaundryWasher, MicrowaveOven, Oven, Refrigerator, RoboticVacuumCleaner, SoilSensor, SolarPower, Speaker, WaterHeater, } from 'matterbridge/devices';
 import { debugStringify } from 'matterbridge/logger';
 import { AreaNamespaceTag, LocationTag, NumberTag, PositionTag, RefrigeratorTag, SwitchesTag, UINT16_MAX, UINT32_MAX } from 'matterbridge/matter';
-import { AirQuality, BooleanState, BridgedDeviceBasicInformation, CarbonDioxideConcentrationMeasurement, CarbonMonoxideConcentrationMeasurement, ColorControl, Descriptor, DeviceEnergyManagement, DoorLock, ElectricalEnergyMeasurement, ElectricalPowerMeasurement, EnergyEvse, EnergyEvseMode, FanControl, FlowMeasurement, FormaldehydeConcentrationMeasurement, Identify, IlluminanceMeasurement, LevelControl, NitrogenDioxideConcentrationMeasurement, OccupancySensing, OnOff, OnOffCluster, OperationalState, OvenMode, OzoneConcentrationMeasurement, Pm1ConcentrationMeasurement, Pm10ConcentrationMeasurement, Pm25ConcentrationMeasurement, PowerSource, PressureMeasurement, RadonConcentrationMeasurement, RelativeHumidityMeasurement, RelativeHumidityMeasurementCluster, RvcCleanMode, RvcOperationalState, RvcRunMode, SmokeCoAlarm, TemperatureMeasurement, Thermostat, ThermostatCluster, TotalVolatileOrganicCompoundsConcentrationMeasurement, WindowCovering, } from 'matterbridge/matter/clusters';
+import { AirQuality, BooleanState, BridgedDeviceBasicInformation, CarbonDioxideConcentrationMeasurement, CarbonMonoxideConcentrationMeasurement, ColorControl, Descriptor, DeviceEnergyManagement, DoorLock, ElectricalEnergyMeasurement, ElectricalPowerMeasurement, EnergyEvse, EnergyEvseMode, FanControl, FlowMeasurement, FormaldehydeConcentrationMeasurement, Identify, IlluminanceMeasurement, LevelControl, NitrogenDioxideConcentrationMeasurement, OccupancySensing, OnOff, OperationalState, OvenMode, OzoneConcentrationMeasurement, Pm1ConcentrationMeasurement, Pm10ConcentrationMeasurement, Pm25ConcentrationMeasurement, PowerSource, PressureMeasurement, RadonConcentrationMeasurement, RelativeHumidityMeasurement, RvcCleanMode, RvcOperationalState, RvcRunMode, SmokeCoAlarm, TemperatureMeasurement, Thermostat, TotalVolatileOrganicCompoundsConcentrationMeasurement, WindowCovering, } from 'matterbridge/matter/clusters';
 import { fireAndForget, getEnumDescription, isValidBoolean, isValidNumber, isValidObject, isValidString } from 'matterbridge/utils';
 function luxToMatter(lux) {
     if (!Number.isFinite(lux) || lux <= 0)
@@ -106,8 +106,8 @@ export class ExampleMatterbridgeDynamicPlatform extends MatterbridgeDynamicPlatf
     constructor(matterbridge, log, config) {
         super(matterbridge, log, config);
         this.config = config;
-        if (typeof this.verifyMatterbridgeVersion !== 'function' || !this.verifyMatterbridgeVersion('3.8.0')) {
-            throw new Error(`This plugin requires Matterbridge version >= "3.8.0". Please update Matterbridge from ${this.matterbridge.matterbridgeVersion} to the latest version in the frontend.`);
+        if (typeof this.verifyMatterbridgeVersion !== 'function' || !this.verifyMatterbridgeVersion('3.9.0')) {
+            throw new Error(`This plugin requires Matterbridge version >= "3.9.0". Please update Matterbridge from ${this.matterbridge.matterbridgeVersion} to the latest version in the frontend.`);
         }
         this.log.info('Initializing platform:', this.config.name);
     }
@@ -195,7 +195,7 @@ export class ExampleMatterbridgeDynamicPlatform extends MatterbridgeDynamicPlatf
         this.select?.addCommandHandler('changeToMode', ({ request: { newMode } }) => {
             this.log.info(`Command changeToMode called newMode:${newMode}`);
         });
-        this.switch = new MatterbridgeEndpoint([onOffSwitch, bridgedNode, powerSource], { id: 'Switch' }, this.config.debug)
+        this.switch = new MatterbridgeEndpoint([onOffLightSwitch, bridgedNode, powerSource], { id: 'Switch' }, this.config.debug)
             .createDefaultIdentifyClusterServer()
             .createDefaultBridgedDeviceBasicInformationClusterServer('Switch', 'SWI00010', 0xfff1, 'Matterbridge', 'Matterbridge Switch')
             .createDefaultOnOffClusterServer()
@@ -211,7 +211,7 @@ export class ExampleMatterbridgeDynamicPlatform extends MatterbridgeDynamicPlatf
         this.switch?.addCommandHandler('off', () => {
             this.switch?.log.info('Command off called');
         });
-        this.mountedOnOffSwitch = new MatterbridgeEndpoint([onOffMountedSwitch, bridgedNode, powerSource], { id: 'OnOffMountedSwitch' }, this.config.debug)
+        this.mountedOnOffSwitch = new MatterbridgeEndpoint([mountedOnOffControl, bridgedNode, powerSource], { id: 'mountedOnOffControl' }, this.config.debug)
             .createDefaultIdentifyClusterServer()
             .createDefaultBridgedDeviceBasicInformationClusterServer('OnOff Mounted Switch', 'OMS00011', 0xfff1, 'Matterbridge', 'Matterbridge OnOff Mounted Switch')
             .createDefaultOnOffClusterServer()
@@ -227,7 +227,7 @@ export class ExampleMatterbridgeDynamicPlatform extends MatterbridgeDynamicPlatf
         this.mountedOnOffSwitch?.addCommandHandler('off', () => {
             this.mountedOnOffSwitch?.log.info('Command off called');
         });
-        this.mountedOnOffSwitchLegacy = new MatterbridgeEndpoint([onOffMountedSwitch, onOffOutlet, bridgedNode, powerSource], { id: 'OnOffMountedSwitchLegacy' }, this.config.debug)
+        this.mountedOnOffSwitchLegacy = new MatterbridgeEndpoint([mountedOnOffControl, onOffPlugInUnit, bridgedNode, powerSource], { id: 'OnOffMountedSwitchLegacy' }, this.config.debug)
             .createDefaultIdentifyClusterServer()
             .createDefaultBridgedDeviceBasicInformationClusterServer('OnOff Mounted Switch Legacy', 'OMSL00011', 0xfff1, 'Matterbridge', 'Matterbridge OnOff Mounted Switch Legacy')
             .createDefaultOnOffClusterServer()
@@ -243,7 +243,7 @@ export class ExampleMatterbridgeDynamicPlatform extends MatterbridgeDynamicPlatf
         this.mountedOnOffSwitchLegacy?.addCommandHandler('off', () => {
             this.mountedOnOffSwitchLegacy?.log.info('Command off called');
         });
-        this.mountedDimmerSwitch = new MatterbridgeEndpoint([dimmableMountedSwitch, bridgedNode, powerSource], { id: 'DimmerMountedSwitch' }, this.config.debug)
+        this.mountedDimmerSwitch = new MatterbridgeEndpoint([mountedDimmableLoadControl, bridgedNode, powerSource], { id: 'DimmerMountedSwitch' }, this.config.debug)
             .createDefaultIdentifyClusterServer()
             .createDefaultBridgedDeviceBasicInformationClusterServer('Dimmer Mounted Switch', 'DMS00012', 0xfff1, 'Matterbridge', 'Matterbridge Dimmer Mounted Switch')
             .createDefaultOnOffClusterServer()
@@ -266,7 +266,7 @@ export class ExampleMatterbridgeDynamicPlatform extends MatterbridgeDynamicPlatf
         this.mountedDimmerSwitch?.addCommandHandler('moveToLevelWithOnOff', ({ request: { level } }) => {
             this.mountedDimmerSwitch?.log.debug(`Command moveToLevelWithOnOff called request: ${level}`);
         });
-        this.mountedDimmerSwitchLegacy = new MatterbridgeEndpoint([dimmableMountedSwitch, dimmableOutlet, bridgedNode, powerSource], { id: 'DimmerMountedSwitchLegacy' }, this.config.debug)
+        this.mountedDimmerSwitchLegacy = new MatterbridgeEndpoint([mountedDimmableLoadControl, dimmablePlugInUnit, bridgedNode, powerSource], { id: 'DimmerMountedSwitchLegacy' }, this.config.debug)
             .createDefaultIdentifyClusterServer()
             .createDefaultBridgedDeviceBasicInformationClusterServer('Dimmer Mounted Switch Legacy', 'DMSL00012', 0xfff1, 'Matterbridge', 'Matterbridge Dimmer Mounted Switch Legacy')
             .createDefaultOnOffClusterServer()
@@ -460,7 +460,7 @@ export class ExampleMatterbridgeDynamicPlatform extends MatterbridgeDynamicPlatf
         this.lightCT?.addCommandHandler('moveToColorTemperature', ({ request: { colorTemperatureMireds } }) => {
             this.lightCT?.log.debug(`Command moveToColorTemperature called request: ${colorTemperatureMireds}`);
         });
-        this.outlet = new MatterbridgeEndpoint([onOffOutlet, bridgedNode, powerSource], { id: 'Outlet' }, this.config.debug)
+        this.outlet = new MatterbridgeEndpoint([onOffPlugInUnit, bridgedNode, powerSource], { id: 'Outlet' }, this.config.debug)
             .createDefaultIdentifyClusterServer()
             .createDefaultBridgedDeviceBasicInformationClusterServer('Outlet', 'OUT00019', 0xfff1, 'Matterbridge', 'Matterbridge Outlet')
             .createDefaultOnOffClusterServer()
@@ -476,7 +476,7 @@ export class ExampleMatterbridgeDynamicPlatform extends MatterbridgeDynamicPlatf
         this.outlet?.addCommandHandler('off', () => {
             this.outlet?.log.info('Command off called');
         });
-        this.outletEnergy = new MatterbridgeEndpoint([onOffOutlet, electricalSensor, bridgedNode, powerSource], { id: 'OutletEnergy' }, this.config.debug)
+        this.outletEnergy = new MatterbridgeEndpoint([onOffPlugInUnit, electricalSensor, bridgedNode, powerSource], { id: 'OutletEnergy' }, this.config.debug)
             .createDefaultIdentifyClusterServer()
             .createDefaultElectricalEnergyMeasurementClusterServer(0, 0)
             .createDefaultElectricalPowerMeasurementClusterServer(220_000, 0, 0, 50_000)
@@ -494,7 +494,7 @@ export class ExampleMatterbridgeDynamicPlatform extends MatterbridgeDynamicPlatf
         this.outletEnergy?.addCommandHandler('off', () => {
             this.outletEnergy?.log.info('Command off called');
         });
-        this.outletEnergyApparent = new MatterbridgeEndpoint([onOffOutlet, electricalSensor, bridgedNode, powerSource], { id: 'OutletEnergyApparent' }, this.config.debug)
+        this.outletEnergyApparent = new MatterbridgeEndpoint([onOffPlugInUnit, electricalSensor, bridgedNode, powerSource], { id: 'OutletEnergyApparent' }, this.config.debug)
             .createDefaultIdentifyClusterServer()
             .createDefaultElectricalEnergyMeasurementClusterServer(0, 0)
             .createApparentElectricalPowerMeasurementClusterServer(220_000, 0, 0, 50_000)
@@ -520,25 +520,25 @@ export class ExampleMatterbridgeDynamicPlatform extends MatterbridgeDynamicPlatf
             .addRequiredClusterServers();
         fireAndForget(this.smartOutlet.addFixedLabel('composed', 'Compound device'), this.log, `Failed to add fixed label`);
         this.smartOutlet
-            .addChildDeviceTypeWithClusterServer('Socket 1', onOffOutlet, [OnOffCluster.id], {
+            .addChildDeviceTypeWithClusterServer('Socket 1', onOffPlugInUnit, [OnOff.id], {
             id: 'Socket1',
             tagList: [getSemtag(NumberTag.One)],
         })
             .addRequiredClusterServers();
         this.smartOutlet
-            .addChildDeviceTypeWithClusterServer('Socket 2', onOffOutlet, [OnOffCluster.id], {
+            .addChildDeviceTypeWithClusterServer('Socket 2', onOffPlugInUnit, [OnOff.id], {
             id: 'Socket2',
             tagList: [getSemtag(NumberTag.Two)],
         })
             .addRequiredClusterServers();
         this.smartOutlet
-            .addChildDeviceTypeWithClusterServer('Socket 3', onOffOutlet, [OnOffCluster.id], {
+            .addChildDeviceTypeWithClusterServer('Socket 3', onOffPlugInUnit, [OnOff.id], {
             id: 'Socket3',
             tagList: [getSemtag(NumberTag.Three)],
         })
             .addRequiredClusterServers();
         this.smartOutlet
-            .addChildDeviceTypeWithClusterServer('Socket 4', onOffOutlet, [OnOffCluster.id], {
+            .addChildDeviceTypeWithClusterServer('Socket 4', onOffPlugInUnit, [OnOff.id], {
             id: 'Socket4',
             tagList: [getSemtag(NumberTag.Four)],
         })
@@ -550,35 +550,35 @@ export class ExampleMatterbridgeDynamicPlatform extends MatterbridgeDynamicPlatf
             .addRequiredClusterServers();
         fireAndForget(this.smartBridgedOutlet.addFixedLabel('composed', 'Bridged device'), this.log, `Failed to add fixed label`);
         this.smartBridgedOutlet
-            .addChildDeviceTypeWithClusterServer('Plug 1', [onOffOutlet, bridgedNode], [OnOffCluster.id], {
+            .addChildDeviceTypeWithClusterServer('Plug 1', [onOffPlugInUnit, bridgedNode], [OnOff.id], {
             id: 'Plug1',
             tagList: [getSemtag(NumberTag.One)],
         })
             .createDefaultBridgedDeviceBasicInformationClusterServer('Plug 1', 'BOU00064-1', 0xfff1, 'Matterbridge', 'Matterbridge Bridged Outlet')
             .addRequiredClusterServers();
         this.smartBridgedOutlet
-            .addChildDeviceTypeWithClusterServer('Plug 2', [onOffOutlet, bridgedNode], [OnOffCluster.id], {
+            .addChildDeviceTypeWithClusterServer('Plug 2', [onOffPlugInUnit, bridgedNode], [OnOff.id], {
             id: 'Plug2',
             tagList: [getSemtag(NumberTag.Two)],
         })
             .createDefaultBridgedDeviceBasicInformationClusterServer('Plug 2', 'BOU00064-2', 0xfff1, 'Matterbridge', 'Matterbridge Bridged Outlet')
             .addRequiredClusterServers();
         this.smartBridgedOutlet
-            .addChildDeviceTypeWithClusterServer('Plug 3', [onOffOutlet, bridgedNode], [OnOffCluster.id], {
+            .addChildDeviceTypeWithClusterServer('Plug 3', [onOffPlugInUnit, bridgedNode], [OnOff.id], {
             id: 'Plug3',
             tagList: [getSemtag(NumberTag.Three)],
         })
             .createDefaultBridgedDeviceBasicInformationClusterServer('Plug 3', 'BOU00064-3', 0xfff1, 'Matterbridge', 'Matterbridge Bridged Outlet')
             .addRequiredClusterServers();
         this.smartBridgedOutlet
-            .addChildDeviceTypeWithClusterServer('Plug 4', [onOffOutlet, bridgedNode], [OnOffCluster.id], {
+            .addChildDeviceTypeWithClusterServer('Plug 4', [onOffPlugInUnit, bridgedNode], [OnOff.id], {
             id: 'Plug4',
             tagList: [getSemtag(NumberTag.Four)],
         })
             .createDefaultBridgedDeviceBasicInformationClusterServer('Plug 4', 'BOU00064-4', 0xfff1, 'Matterbridge', 'Matterbridge Bridged Outlet')
             .addRequiredClusterServers();
         this.smartBridgedOutlet = await this.addDevice(this.smartBridgedOutlet);
-        this.coverLift = new MatterbridgeEndpoint([coverDevice, bridgedNode, powerSource], { id: 'CoverLift' }, this.config.debug)
+        this.coverLift = new MatterbridgeEndpoint([windowCovering, bridgedNode, powerSource], { id: 'CoverLift' }, this.config.debug)
             .createDefaultIdentifyClusterServer()
             .createDefaultBridgedDeviceBasicInformationClusterServer('Cover lift', 'COV00020', 0xfff1, 'Matterbridge', 'Matterbridge Cover')
             .createDefaultWindowCoveringClusterServer()
@@ -630,7 +630,7 @@ export class ExampleMatterbridgeDynamicPlatform extends MatterbridgeDynamicPlatf
             };
             this.coverLift?.log.info(`Command goToLiftPercentage with ${liftPercent100thsValue} executed`);
         });
-        this.coverLiftTilt = new MatterbridgeEndpoint([coverDevice, bridgedNode, powerSource], { id: 'CoverLiftTilt' }, this.config.debug)
+        this.coverLiftTilt = new MatterbridgeEndpoint([windowCovering, bridgedNode, powerSource], { id: 'CoverLiftTilt' }, this.config.debug)
             .createDefaultIdentifyClusterServer()
             .createDefaultBridgedDeviceBasicInformationClusterServer('Cover lift and tilt', 'CLT00021', 0xfff1, 'Matterbridge', 'Matterbridge Cover')
             .createDefaultLiftTiltWindowCoveringClusterServer()
@@ -695,7 +695,7 @@ export class ExampleMatterbridgeDynamicPlatform extends MatterbridgeDynamicPlatf
             };
             this.coverLiftTilt?.log.info(`Command goToTiltPercentage with ${tiltPercent100thsValue} executed`);
         });
-        this.lock = new MatterbridgeEndpoint([doorLockDevice, bridgedNode, powerSource], { id: 'Lock' }, this.config.debug)
+        this.lock = new MatterbridgeEndpoint([doorLock, bridgedNode, powerSource], { id: 'Lock' }, this.config.debug)
             .createDefaultIdentifyClusterServer()
             .createDefaultBridgedDeviceBasicInformationClusterServer('Lock', 'LOC00022', 0xfff1, 'Matterbridge', 'Matterbridge Lock')
             .createDefaultDoorLockClusterServer()
@@ -711,17 +711,17 @@ export class ExampleMatterbridgeDynamicPlatform extends MatterbridgeDynamicPlatf
         this.lock?.addCommandHandler('DoorLock.unlockDoor', () => {
             this.lock?.log.info('Command unlockDoor called');
         });
-        await this.lock?.subscribeAttribute(DoorLock.Cluster.id, 'operatingMode', (value) => {
+        this.lock?.subscribeAttribute(DoorLock.id, 'operatingMode', (value) => {
             this.lock?.log.info(`Subscribe operatingMode called with: ${getEnumDescription(DoorLock.OperatingMode, value)}`);
         }, this.lock.log);
-        this.userPinLock = new MatterbridgeEndpoint([doorLockDevice, bridgedNode, powerSource], { id: 'UserPinLock' }, this.config.debug)
+        this.userPinLock = new MatterbridgeEndpoint([doorLock, bridgedNode, powerSource], { id: 'UserPinLock' }, this.config.debug)
             .createDefaultIdentifyClusterServer()
             .createDefaultBridgedDeviceBasicInformationClusterServer('Lock with User and Pin', 'LUP00070', 0xfff1, 'Matterbridge', 'Matterbridge Lock')
             .createUserPinDoorLockClusterServer()
             .createDefaultPowerSourceRechargeableBatteryClusterServer(95)
             .addRequiredClusterServers();
         this.userPinLock = await this.addDevice(this.userPinLock);
-        await this.userPinLock?.setAttribute(PowerSource.Complete, 'batChargeState', PowerSource.BatChargeState.IsCharging);
+        await this.userPinLock?.setAttribute(PowerSource, 'batChargeState', PowerSource.BatChargeState.IsCharging);
         this.userPinLock?.addCommandHandler('Identify.identify', ({ request: { identifyTime } }) => {
             this.userPinLock?.log.info(`Command identify called identifyTime:${identifyTime}`);
         });
@@ -731,16 +731,16 @@ export class ExampleMatterbridgeDynamicPlatform extends MatterbridgeDynamicPlatf
         this.userPinLock?.addCommandHandler('DoorLock.unlockDoor', () => {
             this.userPinLock?.log.info('Command unlockDoor called');
         });
-        await this.userPinLock?.subscribeAttribute(DoorLock.Cluster, 'operatingMode', (value) => {
+        this.userPinLock?.subscribeAttribute(DoorLock, 'operatingMode', (value) => {
             this.userPinLock?.log.info(`Subscribe operatingMode called with: ${getEnumDescription(DoorLock.OperatingMode, value)}`);
         }, this.userPinLock.log);
-        await this.userPinLock?.subscribeAttribute(DoorLock.Complete, 'wrongCodeEntryLimit', (value) => {
+        this.userPinLock?.subscribeAttribute(DoorLock, 'wrongCodeEntryLimit', (value) => {
             this.userPinLock?.log.info(`Subscribe wrongCodeEntryLimit called with: ${value}`);
         }, this.userPinLock.log);
-        await this.userPinLock?.subscribeAttribute(DoorLock.Complete, 'userCodeTemporaryDisableTime', (value) => {
+        this.userPinLock?.subscribeAttribute(DoorLock, 'userCodeTemporaryDisableTime', (value) => {
             this.userPinLock?.log.info(`Subscribe userCodeTemporaryDisableTime called with: ${value}`);
         }, this.userPinLock.log);
-        this.thermoAuto = new MatterbridgeEndpoint([thermostatDevice, bridgedNode, powerSource], { id: 'Thermostat (AutoMode)' }, this.config.debug)
+        this.thermoAuto = new MatterbridgeEndpoint([thermostat, bridgedNode, powerSource], { id: 'Thermostat (AutoMode)' }, this.config.debug)
             .createDefaultIdentifyClusterServer()
             .createDefaultBridgedDeviceBasicInformationClusterServer('Thermostat (Auto)', 'TAU00023', 0xfff1, 'Matterbridge', 'Matterbridge Thermostat')
             .createDefaultThermostatClusterServer(20, 18, 22)
@@ -769,37 +769,37 @@ export class ExampleMatterbridgeDynamicPlatform extends MatterbridgeDynamicPlatf
             const lookupSetpointAdjustMode = ['Heat', 'Cool', 'Both'];
             this.thermoAuto?.log.info(`Command setpointRaiseLower called with mode: ${lookupSetpointAdjustMode[mode]} amount: ${amount / 10}`);
         });
-        await this.thermoAuto?.subscribeAttribute(Thermostat.Complete, 'systemMode', (value) => {
+        this.thermoAuto?.subscribeAttribute(Thermostat, 'systemMode', (value) => {
             const lookupSystemMode = ['Off', 'Auto', '', 'Cool', 'Heat', 'EmergencyHeat', 'Precooling', 'FanOnly', 'Dry', 'Sleep'];
             this.thermoAuto?.log.info('Subscribe systemMode called with:', lookupSystemMode[value]);
         }, this.thermoAuto.log);
-        await this.thermoAuto?.subscribeAttribute(Thermostat.Cluster.id, 'occupiedHeatingSetpoint', (value) => {
+        this.thermoAuto?.subscribeAttribute(Thermostat.id, 'occupiedHeatingSetpoint', (value) => {
             this.thermoAuto?.log.info('Subscribe occupiedHeatingSetpoint called with:', value / 100);
         }, this.thermoAuto.log);
-        await this.thermoAuto?.subscribeAttribute(Thermostat.Cluster.id, 'occupiedCoolingSetpoint', (value) => {
+        this.thermoAuto?.subscribeAttribute(Thermostat.id, 'occupiedCoolingSetpoint', (value) => {
             this.thermoAuto?.log.info('Subscribe occupiedCoolingSetpoint called with:', value / 100);
         }, this.thermoAuto.log);
-        this.thermoAutoOccupancy = new MatterbridgeEndpoint([thermostatDevice, bridgedNode, powerSource], { id: 'Thermostat (AutoModeOccupancy)' }, this.config.debug)
+        this.thermoAutoOccupancy = new MatterbridgeEndpoint([thermostat, bridgedNode, powerSource], { id: 'Thermostat (AutoModeOccupancy)' }, this.config.debug)
             .createDefaultIdentifyClusterServer()
             .createDefaultBridgedDeviceBasicInformationClusterServer('Thermostat (AutoOccupancy)', 'TAO00058', 0xfff1, 'Matterbridge', 'Matterbridge Thermostat Presets')
             .createDefaultThermostatClusterServer(20, 18, 22, 1, 0, 35, 15, 50, 10, 30, false, 20.5)
             .createDefaultPowerSourceWiredClusterServer()
             .addRequiredClusterServers();
         this.thermoAutoOccupancy = await this.addDevice(this.thermoAutoOccupancy);
-        await this.thermoAutoOccupancy?.subscribeAttribute(Thermostat.Complete, 'systemMode', (value) => {
+        this.thermoAutoOccupancy?.subscribeAttribute(Thermostat, 'systemMode', (value) => {
             const lookupSystemMode = ['Off', 'Auto', '', 'Cool', 'Heat', 'EmergencyHeat', 'Precooling', 'FanOnly', 'Dry', 'Sleep'];
             this.thermoAutoOccupancy?.log.info('Subscribe systemMode called with:', lookupSystemMode[value]);
         }, this.thermoAutoOccupancy.log);
-        await this.thermoAutoOccupancy?.subscribeAttribute(Thermostat.Cluster.id, 'occupiedHeatingSetpoint', (value) => {
+        this.thermoAutoOccupancy?.subscribeAttribute(Thermostat.id, 'occupiedHeatingSetpoint', (value) => {
             this.thermoAutoOccupancy?.log.info('Subscribe occupiedHeatingSetpoint called with:', value / 100);
         }, this.thermoAutoOccupancy.log);
-        await this.thermoAutoOccupancy?.subscribeAttribute(Thermostat.Cluster.id, 'occupiedCoolingSetpoint', (value) => {
+        this.thermoAutoOccupancy?.subscribeAttribute(Thermostat.id, 'occupiedCoolingSetpoint', (value) => {
             this.thermoAutoOccupancy?.log.info('Subscribe occupiedCoolingSetpoint called with:', value / 100);
         }, this.thermoAutoOccupancy.log);
-        await this.thermoAutoOccupancy?.subscribeAttribute(Thermostat.Cluster.id, 'unoccupiedHeatingSetpoint', (value) => {
+        this.thermoAutoOccupancy?.subscribeAttribute(Thermostat.id, 'unoccupiedHeatingSetpoint', (value) => {
             this.thermoAutoOccupancy?.log.info('Subscribe unoccupiedHeatingSetpoint called with:', value / 100);
         }, this.thermoAutoOccupancy.log);
-        await this.thermoAutoOccupancy?.subscribeAttribute(Thermostat.Cluster.id, 'unoccupiedCoolingSetpoint', (value) => {
+        this.thermoAutoOccupancy?.subscribeAttribute(Thermostat.id, 'unoccupiedCoolingSetpoint', (value) => {
             this.thermoAutoOccupancy?.log.info('Subscribe unoccupiedCoolingSetpoint called with:', value / 100);
         }, this.thermoAutoOccupancy.log);
         const presets_List = [
@@ -902,7 +902,7 @@ export class ExampleMatterbridgeDynamicPlatform extends MatterbridgeDynamicPlatf
                 },
             },
         ];
-        this.thermoAutoPresets = new MatterbridgeEndpoint([thermostatDevice, bridgedNode, powerSource], { id: 'Thermostat (AutoModePresets)' }, this.config.debug)
+        this.thermoAutoPresets = new MatterbridgeEndpoint([thermostat, bridgedNode, powerSource], { id: 'Thermostat (AutoModePresets)' }, this.config.debug)
             .createDefaultIdentifyClusterServer()
             .createDefaultBridgedDeviceBasicInformationClusterServer('Thermostat (AutoModePresets)', 'TAP00058', 0xfff1, 'Matterbridge', 'Matterbridge Thermostat With Presets')
             .createDefaultPresetsThermostatClusterServer(20, 18, 22, 1, 0, 35, 15, 50, 10, 30, false, 20.5, undefined, presets_List, presetTypeDefinitions)
@@ -932,23 +932,23 @@ export class ExampleMatterbridgeDynamicPlatform extends MatterbridgeDynamicPlatf
         this.thermoAutoPresets?.addCommandHandler('setActivePresetRequest', ({ request: { presetHandle } }) => {
             this.thermoAutoPresets?.log.info(`Command setActivePresetRequest called with presetHandle: ${presetHandle ? `0x${Buffer.from(presetHandle).toString('hex')}` : 'null'}`);
         });
-        await this.thermoAutoPresets?.subscribeAttribute(Thermostat.Complete, 'systemMode', (newValue, oldValue) => {
+        this.thermoAutoPresets?.subscribeAttribute(Thermostat, 'systemMode', (newValue, oldValue) => {
             const lookupSystemMode = ['Off', 'Auto', '', 'Cool', 'Heat', 'EmergencyHeat', 'Precooling', 'FanOnly', 'Dry', 'Sleep'];
             this.thermoAutoPresets?.log.info(`Subscribe systemMode called with: ${lookupSystemMode[newValue]} (old value: ${lookupSystemMode[oldValue]})`);
         }, this.thermoAutoPresets.log);
-        await this.thermoAutoPresets?.subscribeAttribute(Thermostat.Cluster.id, 'occupiedHeatingSetpoint', (newValue, oldValue) => {
+        this.thermoAutoPresets?.subscribeAttribute(Thermostat.id, 'occupiedHeatingSetpoint', (newValue, oldValue) => {
             this.thermoAutoPresets?.log.info(`Subscribe occupiedHeatingSetpoint called with: ${newValue / 100} (old value: ${oldValue / 100})`);
         }, this.thermoAutoPresets.log);
-        await this.thermoAutoPresets?.subscribeAttribute(Thermostat.Cluster.id, 'occupiedCoolingSetpoint', (newValue, oldValue) => {
+        this.thermoAutoPresets?.subscribeAttribute(Thermostat.id, 'occupiedCoolingSetpoint', (newValue, oldValue) => {
             this.thermoAutoPresets?.log.info(`Subscribe occupiedCoolingSetpoint called with: ${newValue / 100} (old value: ${oldValue / 100})`);
         }, this.thermoAutoPresets.log);
-        await this.thermoAutoPresets?.subscribeAttribute(Thermostat.Cluster.id, 'activePresetHandle', (newValue, oldValue) => {
+        this.thermoAutoPresets?.subscribeAttribute(Thermostat.id, 'activePresetHandle', (newValue, oldValue) => {
             this.thermoAutoPresets?.log.info(`Subscribe activePresetHandle called with: ${newValue ? `0x${Buffer.from(newValue).toString('hex')}` : 'null'} (old value: ${oldValue ? `0x${Buffer.from(oldValue).toString('hex')}` : 'null'})`);
         }, this.thermoAutoPresets.log);
-        await this.thermoAutoPresets?.subscribeAttribute(Thermostat.Cluster.id, 'presets', (newValue, oldValue) => {
+        this.thermoAutoPresets?.subscribeAttribute(Thermostat.id, 'presets', (newValue, oldValue) => {
             this.thermoAutoPresets?.log.info(`Subscribe presets called with: ${debugStringify(newValue)} (old value: ${debugStringify(oldValue)})`);
         }, this.thermoAutoPresets.log);
-        this.thermoHeat = new MatterbridgeEndpoint([thermostatDevice, bridgedNode, powerSource], { id: 'Thermostat (Heat)' }, this.config.debug)
+        this.thermoHeat = new MatterbridgeEndpoint([thermostat, bridgedNode, powerSource], { id: 'Thermostat (Heat)' }, this.config.debug)
             .createDefaultIdentifyClusterServer()
             .createDefaultBridgedDeviceBasicInformationClusterServer('Thermostat (Heat)', 'THE00024', 0xfff1, 'Matterbridge', 'Matterbridge Thermostat')
             .createDefaultHeatingThermostatClusterServer(20, 18, 5, 35)
@@ -979,14 +979,14 @@ export class ExampleMatterbridgeDynamicPlatform extends MatterbridgeDynamicPlatf
         this.thermoHeat?.addCommandHandler('triggerEffect', ({ request: { effectIdentifier, effectVariant } }) => {
             this.thermoHeat?.log.info(`Command identify called effectIdentifier ${effectIdentifier} effectVariant ${effectVariant}`);
         });
-        await this.thermoHeat?.subscribeAttribute(Thermostat.Complete, 'systemMode', (value) => {
+        this.thermoHeat?.subscribeAttribute(Thermostat, 'systemMode', (value) => {
             const lookupSystemMode = ['Off', 'Auto', '', 'Cool', 'Heat', 'EmergencyHeat', 'Precooling', 'FanOnly', 'Dry', 'Sleep'];
             this.thermoHeat?.log.info('Subscribe systemMode called with:', lookupSystemMode[value]);
         }, this.thermoHeat.log);
-        await this.thermoHeat?.subscribeAttribute(Thermostat.Cluster.id, 'occupiedHeatingSetpoint', (value) => {
+        this.thermoHeat?.subscribeAttribute(Thermostat.id, 'occupiedHeatingSetpoint', (value) => {
             this.thermoHeat?.log.info('Subscribe occupiedHeatingSetpoint called with:', value / 100);
         }, this.thermoHeat.log);
-        this.thermoCool = new MatterbridgeEndpoint([thermostatDevice, bridgedNode, powerSource], { id: 'Thermostat (Cool)' }, this.config.debug)
+        this.thermoCool = new MatterbridgeEndpoint([thermostat, bridgedNode, powerSource], { id: 'Thermostat (Cool)' }, this.config.debug)
             .createDefaultIdentifyClusterServer()
             .createDefaultBridgedDeviceBasicInformationClusterServer('Thermostat (Cool)', 'TCO00025', 0xfff1, 'Matterbridge', 'Matterbridge Thermostat')
             .createDefaultCoolingThermostatClusterServer(20, 18, 5, 35)
@@ -999,11 +999,11 @@ export class ExampleMatterbridgeDynamicPlatform extends MatterbridgeDynamicPlatf
         this.thermoCool?.addCommandHandler('triggerEffect', ({ request: { effectIdentifier, effectVariant } }) => {
             this.thermoCool?.log.info(`Command identify called effectIdentifier ${effectIdentifier} effectVariant ${effectVariant}`);
         });
-        await this.thermoCool?.subscribeAttribute(Thermostat.Complete, 'systemMode', (value) => {
+        this.thermoCool?.subscribeAttribute(Thermostat, 'systemMode', (value) => {
             const lookupSystemMode = ['Off', 'Auto', '', 'Cool', 'Heat', 'EmergencyHeat', 'Precooling', 'FanOnly', 'Dry', 'Sleep'];
             this.thermoCool?.log.info('Subscribe systemMode called with:', lookupSystemMode[value]);
         }, this.thermoCool.log);
-        await this.thermoCool?.subscribeAttribute(Thermostat.Cluster.id, 'occupiedCoolingSetpoint', (value) => {
+        this.thermoCool?.subscribeAttribute(Thermostat.id, 'occupiedCoolingSetpoint', (value) => {
             this.thermoCool?.log.info('Subscribe occupiedCoolingSetpoint called with:', value / 100);
         }, this.thermoCool.log);
         this.airPurifier = new MatterbridgeEndpoint([airPurifier, bridgedNode, powerSource], { id: 'Air purifier' }, this.config.debug)
@@ -1028,35 +1028,35 @@ export class ExampleMatterbridgeDynamicPlatform extends MatterbridgeDynamicPlatf
         this.airPurifier?.addCommandHandler('identify', ({ request: { identifyTime } }) => {
             this.airPurifier?.log.info(`Command identify called identifyTime:${identifyTime}`);
         });
-        await this.airPurifier?.subscribeAttribute(FanControl.Cluster.id, 'fanMode', (newValue, oldValue, context) => void (async () => {
-            this.airPurifier?.log.info(`Fan mode changed from ${this.fanModeLookup[oldValue]} to ${this.fanModeLookup[newValue]} context: ${context.offline === true ? 'offline' : 'online'}`);
-            if (context.offline === true)
+        this.airPurifier?.subscribeAttribute(FanControl.id, 'fanMode', (newValue, oldValue, context) => void (async () => {
+            this.airPurifier?.log.info(`Fan mode changed from ${this.fanModeLookup[oldValue]} to ${this.fanModeLookup[newValue]} context: ${context.fabric === undefined ? 'offline' : 'online'}`);
+            if (context.fabric === undefined)
                 return;
             if (newValue === FanControl.FanMode.Off) {
-                await this.airPurifier?.setAttribute(FanControl.Cluster.id, 'percentSetting', 0, this.airPurifier?.log);
-                await this.airPurifier?.setAttribute(FanControl.Cluster.id, 'percentCurrent', 0, this.airPurifier?.log);
+                await this.airPurifier?.setAttribute(FanControl.id, 'percentSetting', 0, this.airPurifier?.log);
+                await this.airPurifier?.setAttribute(FanControl.id, 'percentCurrent', 0, this.airPurifier?.log);
             }
             else if (newValue === FanControl.FanMode.Low) {
-                await this.airPurifier?.setAttribute(FanControl.Cluster.id, 'percentSetting', 33, this.airPurifier?.log);
-                await this.airPurifier?.setAttribute(FanControl.Cluster.id, 'percentCurrent', 33, this.airPurifier?.log);
+                await this.airPurifier?.setAttribute(FanControl.id, 'percentSetting', 33, this.airPurifier?.log);
+                await this.airPurifier?.setAttribute(FanControl.id, 'percentCurrent', 33, this.airPurifier?.log);
             }
             else if (newValue === FanControl.FanMode.Medium) {
-                await this.airPurifier?.setAttribute(FanControl.Cluster.id, 'percentSetting', 66, this.airPurifier?.log);
-                await this.airPurifier?.setAttribute(FanControl.Cluster.id, 'percentCurrent', 66, this.airPurifier?.log);
+                await this.airPurifier?.setAttribute(FanControl.id, 'percentSetting', 66, this.airPurifier?.log);
+                await this.airPurifier?.setAttribute(FanControl.id, 'percentCurrent', 66, this.airPurifier?.log);
             }
             else if (newValue === FanControl.FanMode.High || newValue === FanControl.FanMode.On || newValue === FanControl.FanMode.Auto) {
-                await this.airPurifier?.setAttribute(FanControl.Cluster.id, 'percentSetting', 100, this.airPurifier?.log);
-                await this.airPurifier?.setAttribute(FanControl.Cluster.id, 'percentCurrent', 100, this.airPurifier?.log);
+                await this.airPurifier?.setAttribute(FanControl.id, 'percentSetting', 100, this.airPurifier?.log);
+                await this.airPurifier?.setAttribute(FanControl.id, 'percentCurrent', 100, this.airPurifier?.log);
             }
         })(), this.airPurifier.log);
-        await this.airPurifier?.subscribeAttribute(FanControl.Cluster.id, 'percentSetting', (newValue, oldValue, context) => void (async () => {
-            this.airPurifier?.log.info(`Percent setting changed from ${oldValue} to ${newValue} context: ${context.offline === true ? 'offline' : 'online'}`);
-            if (context.offline === true)
+        this.airPurifier?.subscribeAttribute(FanControl.id, 'percentSetting', (newValue, oldValue, context) => void (async () => {
+            this.airPurifier?.log.info(`Percent setting changed from ${oldValue} to ${newValue} context: ${context.fabric === undefined ? 'offline' : 'online'}`);
+            if (context.fabric === undefined)
                 return;
             if (isValidNumber(newValue, 0, 100))
-                await this.airPurifier?.setAttribute(FanControl.Cluster.id, 'percentCurrent', newValue, this.airPurifier?.log);
+                await this.airPurifier?.setAttribute(FanControl.id, 'percentCurrent', newValue, this.airPurifier?.log);
         })(), this.airPurifier.log);
-        this.pump = new MatterbridgeEndpoint([pumpDevice, bridgedNode, powerSource], { id: 'Pump' }, this.config.debug)
+        this.pump = new MatterbridgeEndpoint([pump, bridgedNode, powerSource], { id: 'Pump' }, this.config.debug)
             .createDefaultBridgedDeviceBasicInformationClusterServer('Pump', 'PUM00028', 0xfff1, 'Matterbridge', 'Matterbridge Pump')
             .createDefaultIdentifyClusterServer()
             .createOnOffClusterServer()
@@ -1090,13 +1090,13 @@ export class ExampleMatterbridgeDynamicPlatform extends MatterbridgeDynamicPlatf
         this.valve?.addCommandHandler('identify', ({ request: { identifyTime } }) => {
             this.valve?.log.info(`Command identify called identifyTime:${identifyTime}`);
         });
-        this.fanDefault = new MatterbridgeEndpoint([fanDevice, bridgedNode, powerSource], { id: 'Fan off low medium high auto' }, this.config.debug)
+        this.fanDefault = new MatterbridgeEndpoint([fan, bridgedNode, powerSource], { id: 'Fan off low medium high auto' }, this.config.debug)
             .createDefaultBridgedDeviceBasicInformationClusterServer('Fan', 'FAN00030', 0xfff1, 'Matterbridge', 'Matterbridge Fan')
             .createDefaultPowerSourceWiredClusterServer()
             .createDefaultFanControlClusterServer()
             .addRequiredClusterServers();
         this.fanDefault = await this.addDevice(this.fanDefault);
-        await this.fanDefault?.subscribeAttribute(FanControl, 'fanMode', (newValue, oldValue, context) => void (async () => {
+        this.fanDefault?.subscribeAttribute(FanControl, 'fanMode', (newValue, oldValue, context) => void (async () => {
             this.fanDefault?.log.info(`Fan mode changed from ${this.fanModeLookup[oldValue]} to ${this.fanModeLookup[newValue]} context: ${context.fabric === undefined ? 'offline' : 'online'}`);
             if (context.fabric === undefined)
                 return;
@@ -1126,7 +1126,7 @@ export class ExampleMatterbridgeDynamicPlatform extends MatterbridgeDynamicPlatf
                 await this.fanDefault?.setAttribute(FanControl, 'percentCurrent', 50, this.fanDefault?.log);
             }
         })(), this.fanDefault.log);
-        await this.fanDefault?.subscribeAttribute(FanControl, 'percentSetting', (newValue, oldValue, context) => void (async () => {
+        this.fanDefault?.subscribeAttribute(FanControl, 'percentSetting', (newValue, oldValue, context) => void (async () => {
             this.fanDefault?.log.info(`Percent setting changed from ${oldValue} to ${newValue} context: ${context.fabric === undefined ? 'offline' : 'online'}`);
             if (context.fabric === undefined)
                 return;
@@ -1143,13 +1143,13 @@ export class ExampleMatterbridgeDynamicPlatform extends MatterbridgeDynamicPlatf
             if (newValue === null)
                 await this.fanDefault?.setAttribute(FanControl, 'fanMode', FanControl.FanMode.Auto, this.fanDefault?.log);
         })(), this.fanDefault.log);
-        this.fanBase = new MatterbridgeEndpoint([fanDevice, bridgedNode, powerSource], { id: 'Fan off low medium high' }, this.config.debug)
+        this.fanBase = new MatterbridgeEndpoint([fan, bridgedNode, powerSource], { id: 'Fan off low medium high' }, this.config.debug)
             .createDefaultBridgedDeviceBasicInformationClusterServer('Fan base', 'FBA00031', 0xfff1, 'Matterbridge', 'Matterbridge Fan')
             .createDefaultPowerSourceWiredClusterServer()
             .createBaseFanControlClusterServer()
             .addRequiredClusterServers();
         this.fanBase = await this.addDevice(this.fanBase);
-        await this.fanBase?.subscribeAttribute(FanControl, 'fanMode', (newValue, oldValue, context) => void (async () => {
+        this.fanBase?.subscribeAttribute(FanControl, 'fanMode', (newValue, oldValue, context) => void (async () => {
             this.fanBase?.log.info(`Fan mode changed from ${this.fanModeLookup[oldValue]} to ${this.fanModeLookup[newValue]} context: ${context.fabric === undefined ? 'offline' : 'online'}`);
             if (context.fabric === undefined)
                 return;
@@ -1179,7 +1179,7 @@ export class ExampleMatterbridgeDynamicPlatform extends MatterbridgeDynamicPlatf
                 await this.fanBase?.setAttribute(FanControl, 'percentCurrent', 50, this.fanBase?.log);
             }
         })(), this.fanBase.log);
-        await this.fanBase?.subscribeAttribute(FanControl, 'percentSetting', (newValue, oldValue, context) => void (async () => {
+        this.fanBase?.subscribeAttribute(FanControl, 'percentSetting', (newValue, oldValue, context) => void (async () => {
             this.fanBase?.log.info(`Percent setting changed from ${oldValue} to ${newValue} context: ${context.fabric === undefined ? 'offline' : 'online'}`);
             if (context.fabric === undefined)
                 return;
@@ -1194,13 +1194,13 @@ export class ExampleMatterbridgeDynamicPlatform extends MatterbridgeDynamicPlatf
             if (isValidNumber(newValue, 67, 100))
                 await this.fanBase?.setAttribute(FanControl, 'fanMode', FanControl.FanMode.High, this.fanBase?.log);
         })(), this.fanBase.log);
-        this.fanOnHigh = new MatterbridgeEndpoint([fanDevice, bridgedNode, powerSource], { id: 'Fan off high' }, this.config.debug)
+        this.fanOnHigh = new MatterbridgeEndpoint([fan, bridgedNode, powerSource], { id: 'Fan off high' }, this.config.debug)
             .createDefaultBridgedDeviceBasicInformationClusterServer('Fan off high', 'FOH00032', 0xfff1, 'Matterbridge', 'Matterbridge Fan')
             .createDefaultPowerSourceWiredClusterServer()
             .createOnOffFanControlClusterServer()
             .addRequiredClusterServers();
         this.fanOnHigh = await this.addDevice(this.fanOnHigh);
-        await this.fanOnHigh?.subscribeAttribute(FanControl, 'fanMode', (newValue, oldValue, context) => void (async () => {
+        this.fanOnHigh?.subscribeAttribute(FanControl, 'fanMode', (newValue, oldValue, context) => void (async () => {
             this.fanOnHigh?.log.info(`Fan mode changed from ${this.fanModeLookup[oldValue]} to ${this.fanModeLookup[newValue]} context: ${context.fabric === undefined ? 'offline' : 'online'}`);
             if (context.fabric === undefined)
                 return;
@@ -1218,7 +1218,7 @@ export class ExampleMatterbridgeDynamicPlatform extends MatterbridgeDynamicPlatf
                 await this.fanOnHigh?.setAttribute(FanControl, 'percentCurrent', 100, this.fanOnHigh?.log);
             }
         })(), this.fanOnHigh.log);
-        await this.fanOnHigh?.subscribeAttribute(FanControl, 'percentSetting', (newValue, oldValue, context) => void (async () => {
+        this.fanOnHigh?.subscribeAttribute(FanControl, 'percentSetting', (newValue, oldValue, context) => void (async () => {
             this.fanOnHigh?.log.info(`Percent setting changed from ${oldValue} to ${newValue} context: ${context.fabric === undefined ? 'offline' : 'online'}`);
             if (context.fabric === undefined)
                 return;
@@ -1230,13 +1230,13 @@ export class ExampleMatterbridgeDynamicPlatform extends MatterbridgeDynamicPlatf
                 await this.fanOnHigh?.setAttribute(FanControl, 'fanMode', newValue === 0 ? FanControl.FanMode.Off : FanControl.FanMode.High, this.fanOnHigh?.log);
             }
         })(), this.fanOnHigh.log);
-        this.fanComplete = new MatterbridgeEndpoint([fanDevice, bridgedNode, powerSource], { id: 'Fan complete' }, this.config.debug)
+        this.fanComplete = new MatterbridgeEndpoint([fan, bridgedNode, powerSource], { id: 'Fan complete' }, this.config.debug)
             .createDefaultBridgedDeviceBasicInformationClusterServer('Fan complete', 'FCO00033', 0xfff1, 'Matterbridge', 'Matterbridge Fan')
             .createDefaultPowerSourceWiredClusterServer()
             .createCompleteFanControlClusterServer()
             .addRequiredClusterServers();
         this.fanComplete = await this.addDevice(this.fanComplete);
-        await this.fanComplete?.subscribeAttribute(FanControl, 'fanMode', (newValue, oldValue, context) => void (async () => {
+        this.fanComplete?.subscribeAttribute(FanControl, 'fanMode', (newValue, oldValue, context) => void (async () => {
             this.fanComplete?.log.info(`Fan mode changed from ${this.fanModeLookup[oldValue]} to ${this.fanModeLookup[newValue]} context: ${context.fabric === undefined ? 'offline' : 'online'}`);
             if (context.fabric === undefined)
                 return;
@@ -1266,7 +1266,7 @@ export class ExampleMatterbridgeDynamicPlatform extends MatterbridgeDynamicPlatf
                 await this.fanComplete?.setAttribute(FanControl, 'percentCurrent', 50, this.fanComplete?.log);
             }
         })(), this.fanComplete?.log);
-        await this.fanComplete?.subscribeAttribute(FanControl, 'percentSetting', (newValue, oldValue, context) => void (async () => {
+        this.fanComplete?.subscribeAttribute(FanControl, 'percentSetting', (newValue, oldValue, context) => void (async () => {
             this.fanComplete?.log.info(`Percent setting changed from ${oldValue} to ${newValue} context: ${context.fabric === undefined ? 'offline' : 'online'}`);
             if (context.fabric === undefined)
                 return;
@@ -1283,13 +1283,13 @@ export class ExampleMatterbridgeDynamicPlatform extends MatterbridgeDynamicPlatf
             if (newValue === null)
                 await this.fanComplete?.setAttribute(FanControl, 'fanMode', FanControl.FanMode.Auto, this.fanComplete?.log);
         })(), this.fanComplete?.log);
-        await this.fanComplete?.subscribeAttribute(FanControl, 'rockSetting', (newValue, oldValue, context) => {
+        this.fanComplete?.subscribeAttribute(FanControl, 'rockSetting', (newValue, oldValue, context) => {
             this.fanComplete?.log.info(`Rock setting changed from ${debugStringify(oldValue)} to ${debugStringify(newValue)} context: ${context.fabric === undefined ? 'offline' : 'online'}`);
         }, this.fanComplete?.log);
-        await this.fanComplete?.subscribeAttribute(FanControl, 'windSetting', (newValue, oldValue, context) => {
+        this.fanComplete?.subscribeAttribute(FanControl, 'windSetting', (newValue, oldValue, context) => {
             this.fanComplete?.log.info(`Wind setting changed from ${debugStringify(oldValue)} to ${debugStringify(newValue)} context: ${context.fabric === undefined ? 'offline' : 'online'}`);
         }, this.fanComplete?.log);
-        await this.fanComplete?.subscribeAttribute(FanControl, 'airflowDirection', (newValue, oldValue, context) => {
+        this.fanComplete?.subscribeAttribute(FanControl, 'airflowDirection', (newValue, oldValue, context) => {
             this.fanComplete?.log.info(`Airflow direction changed from ${this.fanDirectionLookup[oldValue]} to ${this.fanDirectionLookup[newValue]} context: ${context.fabric === undefined ? 'offline' : 'online'}`);
         }, this.fanComplete?.log);
         this.waterLeak = new MatterbridgeEndpoint([waterLeakDetector, bridgedNode, powerSource], { id: 'Water leak detector' }, this.config.debug)
@@ -1338,7 +1338,7 @@ export class ExampleMatterbridgeDynamicPlatform extends MatterbridgeDynamicPlatf
             .createDefaultBridgedDeviceBasicInformationClusterServer('Air quality sensor', 'AQS00040', 0xfff1, 'Matterbridge', 'Matterbridge Air Quality Sensor')
             .createDefaultPowerSourceReplaceableBatteryClusterServer(50, PowerSource.BatChargeLevel.Warning, 2900, 'CR2450', 1)
             .addRequiredClusterServers()
-            .addClusterServers([TemperatureMeasurement.Cluster.id, RelativeHumidityMeasurement.Cluster.id])
+            .addClusterServers([TemperatureMeasurement.id, RelativeHumidityMeasurement.id])
             .createDefaultAirQualityClusterServer(AirQuality.AirQualityEnum.Good)
             .createDefaultCarbonMonoxideConcentrationMeasurementClusterServer(10)
             .createDefaultCarbonDioxideConcentrationMeasurementClusterServer(400)
@@ -1485,7 +1485,7 @@ export class ExampleMatterbridgeDynamicPlatform extends MatterbridgeDynamicPlatf
                 name: 'First floor',
             },
         ]);
-        if (this.config.enableServerRvc === true) {
+        if (this.config.enableServerRvc) {
             this.log.notice('RVC is in server mode so it has its own QR code (it shows in the "Devices" panel of the Home page)');
         }
         this.roboticVacuum = await this.addDevice(this.roboticVacuum);
@@ -1580,53 +1580,53 @@ export class ExampleMatterbridgeDynamicPlatform extends MatterbridgeDynamicPlatf
         });
         this.airConditioner?.addCommandHandler('on', async () => {
             this.airConditioner?.log.info('Command on called');
-            await this.airConditioner?.setAttribute(ThermostatCluster.id, 'localTemperature', 20 * 100, this.airConditioner?.log);
-            await this.airConditioner?.setAttribute(TemperatureMeasurement.Cluster.id, 'measuredValue', 20 * 100, this.airConditioner?.log);
-            await this.airConditioner?.setAttribute(RelativeHumidityMeasurementCluster.id, 'measuredValue', 50 * 100, this.airConditioner?.log);
-            await this.airConditioner?.setAttribute(FanControl.Cluster.id, 'percentSetting', 50, this.airConditioner?.log);
+            await this.airConditioner?.setAttribute(Thermostat.id, 'localTemperature', 20 * 100, this.airConditioner?.log);
+            await this.airConditioner?.setAttribute(TemperatureMeasurement.id, 'measuredValue', 20 * 100, this.airConditioner?.log);
+            await this.airConditioner?.setAttribute(RelativeHumidityMeasurement.id, 'measuredValue', 50 * 100, this.airConditioner?.log);
+            await this.airConditioner?.setAttribute(FanControl.id, 'percentSetting', 50, this.airConditioner?.log);
         });
         this.airConditioner?.addCommandHandler('off', async () => {
             this.airConditioner?.log.info('Command off called');
-            await this.airConditioner?.setAttribute(ThermostatCluster.id, 'localTemperature', null, this.airConditioner?.log);
-            await this.airConditioner?.setAttribute(TemperatureMeasurement.Cluster.id, 'measuredValue', null, this.airConditioner?.log);
-            await this.airConditioner?.setAttribute(RelativeHumidityMeasurementCluster.id, 'measuredValue', null, this.airConditioner?.log);
-            await this.airConditioner?.setAttribute(FanControl.Cluster.id, 'percentSetting', null, this.airConditioner?.log);
-        });
-        await this.airConditioner?.subscribeAttribute(FanControl.Cluster.id, 'fanMode', (newValue, oldValue, context) => void (async () => {
-            this.airConditioner?.log.info(`Fan mode changed from ${this.fanModeLookup[oldValue]} to ${this.fanModeLookup[newValue]} context: ${context.offline === true ? 'offline' : 'online'}`);
-            if (context.offline === true)
+            await this.airConditioner?.setAttribute(Thermostat.id, 'localTemperature', null, this.airConditioner?.log);
+            await this.airConditioner?.setAttribute(TemperatureMeasurement.id, 'measuredValue', null, this.airConditioner?.log);
+            await this.airConditioner?.setAttribute(RelativeHumidityMeasurement.id, 'measuredValue', null, this.airConditioner?.log);
+            await this.airConditioner?.setAttribute(FanControl.id, 'percentSetting', null, this.airConditioner?.log);
+        });
+        this.airConditioner?.subscribeAttribute(FanControl.id, 'fanMode', (newValue, oldValue, context) => void (async () => {
+            this.airConditioner?.log.info(`Fan mode changed from ${this.fanModeLookup[oldValue]} to ${this.fanModeLookup[newValue]} context: ${context.fabric === undefined ? 'offline' : 'online'}`);
+            if (context.fabric === undefined)
                 return;
             if (newValue === FanControl.FanMode.Off) {
-                await this.airConditioner?.setAttribute(FanControl.Cluster.id, 'percentSetting', 0, this.airConditioner?.log);
-                await this.airConditioner?.setAttribute(FanControl.Cluster.id, 'percentCurrent', 0, this.airConditioner?.log);
+                await this.airConditioner?.setAttribute(FanControl.id, 'percentSetting', 0, this.airConditioner?.log);
+                await this.airConditioner?.setAttribute(FanControl.id, 'percentCurrent', 0, this.airConditioner?.log);
             }
             else if (newValue === FanControl.FanMode.Low) {
-                await this.airConditioner?.setAttribute(FanControl.Cluster.id, 'percentSetting', 33, this.airConditioner?.log);
-                await this.airConditioner?.setAttribute(FanControl.Cluster.id, 'percentCurrent', 33, this.airConditioner?.log);
+                await this.airConditioner?.setAttribute(FanControl.id, 'percentSetting', 33, this.airConditioner?.log);
+                await this.airConditioner?.setAttribute(FanControl.id, 'percentCurrent', 33, this.airConditioner?.log);
             }
             else if (newValue === FanControl.FanMode.Medium) {
-                await this.airConditioner?.setAttribute(FanControl.Cluster.id, 'percentSetting', 66, this.airConditioner?.log);
-                await this.airConditioner?.setAttribute(FanControl.Cluster.id, 'percentCurrent', 66, this.airConditioner?.log);
+                await this.airConditioner?.setAttribute(FanControl.id, 'percentSetting', 66, this.airConditioner?.log);
+                await this.airConditioner?.setAttribute(FanControl.id, 'percentCurrent', 66, this.airConditioner?.log);
             }
             else if (newValue === FanControl.FanMode.High) {
-                await this.airConditioner?.setAttribute(FanControl.Cluster.id, 'percentSetting', 100, this.airConditioner?.log);
-                await this.airConditioner?.setAttribute(FanControl.Cluster.id, 'percentCurrent', 100, this.airConditioner?.log);
+                await this.airConditioner?.setAttribute(FanControl.id, 'percentSetting', 100, this.airConditioner?.log);
+                await this.airConditioner?.setAttribute(FanControl.id, 'percentCurrent', 100, this.airConditioner?.log);
             }
             else if (newValue === FanControl.FanMode.On) {
-                await this.airConditioner?.setAttribute(FanControl.Cluster.id, 'percentSetting', 100, this.airConditioner?.log);
-                await this.airConditioner?.setAttribute(FanControl.Cluster.id, 'percentCurrent', 100, this.airConditioner?.log);
+                await this.airConditioner?.setAttribute(FanControl.id, 'percentSetting', 100, this.airConditioner?.log);
+                await this.airConditioner?.setAttribute(FanControl.id, 'percentCurrent', 100, this.airConditioner?.log);
             }
             else if (newValue === FanControl.FanMode.Auto) {
-                await this.airConditioner?.setAttribute(FanControl.Cluster.id, 'percentSetting', 50, this.airConditioner?.log);
-                await this.airConditioner?.setAttribute(FanControl.Cluster.id, 'percentCurrent', 50, this.airConditioner?.log);
+                await this.airConditioner?.setAttribute(FanControl.id, 'percentSetting', 50, this.airConditioner?.log);
+                await this.airConditioner?.setAttribute(FanControl.id, 'percentCurrent', 50, this.airConditioner?.log);
             }
         })(), this.airConditioner?.log);
-        await this.airConditioner?.subscribeAttribute(FanControl.Cluster.id, 'percentSetting', (newValue, oldValue, context) => void (async () => {
-            this.airConditioner?.log.info(`Percent setting changed from ${oldValue} to ${newValue} context: ${context.offline === true ? 'offline' : 'online'}`);
-            if (context.offline === true)
+        this.airConditioner?.subscribeAttribute(FanControl.id, 'percentSetting', (newValue, oldValue, context) => void (async () => {
+            this.airConditioner?.log.info(`Percent setting changed from ${oldValue} to ${newValue} context: ${context.fabric === undefined ? 'offline' : 'online'}`);
+            if (context.fabric === undefined)
                 return;
             if (isValidNumber(newValue, 0, 100))
-                await this.airConditioner?.setAttribute(FanControl.Cluster.id, 'percentCurrent', newValue, this.airConditioner?.log);
+                await this.airConditioner?.setAttribute(FanControl.id, 'percentCurrent', newValue, this.airConditioner?.log);
         })(), this.airConditioner?.log);
         this.basicVideoPlayer = new BasicVideoPlayer('BasicVideoPlayer', 'BVP00062');
         this.basicVideoPlayer = (await this.addDevice(this.basicVideoPlayer));
@@ -1665,7 +1665,7 @@ export class ExampleMatterbridgeDynamicPlatform extends MatterbridgeDynamicPlatf
         return interval;
     }
     async executeIntervals(times, pauseTime = 100) {
-        for (let i = 0; i < times; i++) {
+        for (let i = 0; i < times; i += 1) {
             for (const { callback } of this.intervals) {
                 await callback();
             }
@@ -1687,14 +1687,14 @@ export class ExampleMatterbridgeDynamicPlatform extends MatterbridgeDynamicPlatf
                 if (this.phase === 0) {
                     if (this.airConditioner || this.laundryWasher || this.laundryDryer || this.dishwasher)
                         this.log.info(`Set appliances dead front OnOff to true`);
-                    await this.airConditioner?.setAttribute(OnOff.Cluster.id, 'onOff', true, this.airConditioner.log);
-                    await this.laundryWasher?.setAttribute(OnOff.Cluster.id, 'onOff', true, this.laundryWasher.log);
-                    await this.laundryDryer?.setAttribute(OnOff.Cluster.id, 'onOff', true, this.laundryDryer.log);
-                    await this.dishwasher?.setAttribute(OnOff.Cluster.id, 'onOff', true, this.dishwasher.log);
+                    await this.airConditioner?.setAttribute(OnOff.id, 'onOff', true, this.airConditioner.log);
+                    await this.laundryWasher?.setAttribute(OnOff.id, 'onOff', true, this.laundryWasher.log);
+                    await this.laundryDryer?.setAttribute(OnOff.id, 'onOff', true, this.laundryDryer.log);
+                    await this.dishwasher?.setAttribute(OnOff.id, 'onOff', true, this.dishwasher.log);
                     this.cooktop?.log.info(`Set Cooktop offOnly onOff clusters to true`);
-                    await this.cooktop?.setAttribute(OnOff.Cluster.id, 'onOff', true, this.cooktop.log);
-                    await this.cooktop?.getChildEndpointByName('SurfaceTopLeft')?.setAttribute(OnOff.Cluster.id, 'onOff', true, this.cooktop?.log);
-                    await this.cooktop?.getChildEndpointByName('SurfaceTopRight')?.setAttribute(OnOff.Cluster.id, 'onOff', true, this.cooktop?.log);
+                    await this.cooktop?.setAttribute(OnOff.id, 'onOff', true, this.cooktop.log);
+                    await this.cooktop?.getChildEndpointById('SurfaceTopLeft')?.setAttribute(OnOff.id, 'onOff', true, this.cooktop?.log);
+                    await this.cooktop?.getChildEndpointById('SurfaceTopRight')?.setAttribute(OnOff.id, 'onOff', true, this.cooktop?.log);
                 }
                 if (this.roboticVacuum) {
                     if (this.phase === 0) {
@@ -1783,8 +1783,8 @@ export class ExampleMatterbridgeDynamicPlatform extends MatterbridgeDynamicPlatf
                     }
                 }
                 if (this.oven) {
-                    const upperCabinet = this.oven.getChildEndpointByName('UpperCabinet');
-                    const lowerCabinet = this.oven.getChildEndpointByName('LowerCabinet');
+                    const upperCabinet = this.oven.getChildEndpointById('UpperCabinet');
+                    const lowerCabinet = this.oven.getChildEndpointById('LowerCabinet');
                     if (this.phase === 0) {
                         await upperCabinet?.setAttribute('OvenMode', 'currentMode', 3, upperCabinet.log);
                         await upperCabinet?.setAttribute('OvenCavityOperationalState', 'operationalState', OperationalState.OperationalStateEnum.Stopped, upperCabinet.log);
@@ -1852,7 +1852,7 @@ export class ExampleMatterbridgeDynamicPlatform extends MatterbridgeDynamicPlatf
                 if (this.refrigerator) {
                     if (this.phase === 0) {
                         let mode;
-                        const refrigerator = this.refrigerator.getChildEndpointByName('RefrigeratorTop');
+                        const refrigerator = this.refrigerator.getChildEndpointById('RefrigeratorTop');
                         mode = this.refrigerator.getAttribute('RefrigeratorAndTemperatureControlledCabinetMode', 'currentMode', this.refrigerator.log);
                         mode = mode === 1 ? 2 : 1;
                         await this.refrigerator.setAttribute('RefrigeratorAndTemperatureControlledCabinetMode', 'currentMode', mode, this.refrigerator.log);
@@ -1864,7 +1864,7 @@ export class ExampleMatterbridgeDynamicPlatform extends MatterbridgeDynamicPlatf
                             await refrigerator?.setAttribute('TemperatureControl', 'temperatureSetpoint', 10 * 100, refrigerator.log);
                         if (mode === 2)
                             await refrigerator?.setAttribute('TemperatureMeasurement', 'measuredValue', 1000, refrigerator.log);
-                        const freezer = this.refrigerator.getChildEndpointByName('FreezerBottom');
+                        const freezer = this.refrigerator.getChildEndpointById('FreezerBottom');
                         mode = this.refrigerator.getAttribute('RefrigeratorAndTemperatureControlledCabinetMode', 'currentMode', this.refrigerator.log);
                         mode = mode === 1 ? 2 : 1;
                         await this.refrigerator.setAttribute('RefrigeratorAndTemperatureControlledCabinetMode', 'currentMode', mode, this.refrigerator.log);
@@ -1894,103 +1894,103 @@ export class ExampleMatterbridgeDynamicPlatform extends MatterbridgeDynamicPlatf
                     if (this.phase === 9)
                         await this.refrigerator.triggerDoorOpenState(false);
                 }
-                this.phase++;
+                this.phase += 1;
                 this.phase = this.phase >= 10 ? 0 : this.phase;
             }, 10 * 1000);
         }
         if (this.config.useInterval) {
             this.addInterval(async () => {
-                let value = this.door?.getAttribute(BooleanState.Cluster.id, 'stateValue', this.door.log);
+                let value = this.door?.getAttribute(BooleanState.id, 'stateValue', this.door.log);
                 if (isValidBoolean(value)) {
                     value = !value;
-                    await this.door?.setAttribute(BooleanState.Cluster.id, 'stateValue', value, this.door.log);
+                    await this.door?.setAttribute(BooleanState.id, 'stateValue', value, this.door.log);
                     this.door?.log.info(`Set door stateValue to ${value}`);
                 }
-                const occupancyValue = this.occupancy?.getAttribute(OccupancySensing.Cluster.id, 'occupancy', this.occupancy.log);
+                const occupancyValue = this.occupancy?.getAttribute(OccupancySensing, 'occupancy', this.occupancy.log);
                 if (isValidObject(occupancyValue, 1)) {
                     occupancyValue.occupied = !occupancyValue.occupied;
-                    await this.occupancy?.setAttribute(OccupancySensing.Cluster.id, 'occupancy', occupancyValue, this.occupancy.log);
+                    await this.occupancy?.setAttribute(OccupancySensing.id, 'occupancy', occupancyValue, this.occupancy.log);
                     this.occupancy?.log.info(`Set occupancy to ${occupancyValue.occupied}`);
                 }
-                value = this.illuminance?.getAttribute(IlluminanceMeasurement.Cluster.id, 'measuredValue', this.illuminance.log);
+                value = this.illuminance?.getAttribute(IlluminanceMeasurement.id, 'measuredValue', this.illuminance.log);
                 if (isValidNumber(value, 0, 0xfffe)) {
                     value = matterToLux(value);
                     value = value + 10 < 500 ? value + 10 : 1;
-                    await this.illuminance?.setAttribute(IlluminanceMeasurement.Cluster.id, 'measuredValue', luxToMatter(value), this.illuminance.log);
+                    await this.illuminance?.setAttribute(IlluminanceMeasurement.id, 'measuredValue', luxToMatter(value), this.illuminance.log);
                     this.illuminance?.log.info(`Set illuminance measuredValue to ${value}`);
                 }
-                value = this.temperature?.getAttribute(TemperatureMeasurement.Cluster.id, 'measuredValue', this.temperature.log);
+                value = this.temperature?.getAttribute(TemperatureMeasurement.id, 'measuredValue', this.temperature.log);
                 if (isValidNumber(value, 0, 0xfffe)) {
                     value = value + 100 < 3000 ? value + 100 : 1000;
-                    await this.temperature?.setAttribute(TemperatureMeasurement.Cluster.id, 'measuredValue', value, this.temperature.log);
-                    await this.climate?.getChildEndpointById('Temperature')?.setAttribute(TemperatureMeasurement.Cluster.id, 'measuredValue', value, this.climate.log);
+                    await this.temperature?.setAttribute(TemperatureMeasurement.id, 'measuredValue', value, this.temperature.log);
+                    await this.climate?.getChildEndpointById('Temperature')?.setAttribute(TemperatureMeasurement.id, 'measuredValue', value, this.climate.log);
                     this.temperature?.log.info(`Set temperature measuredValue to ${value}`);
                 }
-                value = this.humidity?.getAttribute(RelativeHumidityMeasurement.Cluster.id, 'measuredValue', this.humidity.log);
+                value = this.humidity?.getAttribute(RelativeHumidityMeasurement.id, 'measuredValue', this.humidity.log);
                 if (isValidNumber(value, 0, 0xfffe)) {
                     value = value + 100 < 10000 ? value + 100 : 100;
-                    await this.humidity?.setAttribute(RelativeHumidityMeasurement.Cluster.id, 'measuredValue', value, this.humidity.log);
-                    await this.climate?.getChildEndpointById('Humidity')?.setAttribute(RelativeHumidityMeasurement.Cluster.id, 'measuredValue', value, this.climate.log);
+                    await this.humidity?.setAttribute(RelativeHumidityMeasurement.id, 'measuredValue', value, this.humidity.log);
+                    await this.climate?.getChildEndpointById('Humidity')?.setAttribute(RelativeHumidityMeasurement.id, 'measuredValue', value, this.climate.log);
                     this.humidity?.log.info(`Set humidity measuredValue to ${value}`);
                 }
-                value = this.pressure?.getAttribute(PressureMeasurement.Cluster.id, 'measuredValue', this.pressure.log);
+                value = this.pressure?.getAttribute(PressureMeasurement.id, 'measuredValue', this.pressure.log);
                 if (isValidNumber(value, 0, 0xfffe)) {
                     value = value + 10 < 9900 ? value + 10 : 8600;
-                    await this.pressure?.setAttribute(PressureMeasurement.Cluster.id, 'measuredValue', value, this.pressure.log);
-                    await this.climate?.getChildEndpointById('Pressure')?.setAttribute(PressureMeasurement.Cluster.id, 'measuredValue', value, this.climate.log);
+                    await this.pressure?.setAttribute(PressureMeasurement.id, 'measuredValue', value, this.pressure.log);
+                    await this.climate?.getChildEndpointById('Pressure')?.setAttribute(PressureMeasurement.id, 'measuredValue', value, this.climate.log);
                     this.pressure?.log.info(`Set pressure measuredValue to ${value}`);
                 }
-                value = this.flow?.getAttribute(FlowMeasurement.Cluster.id, 'measuredValue', this.flow.log);
+                value = this.flow?.getAttribute(FlowMeasurement.id, 'measuredValue', this.flow.log);
                 if (isValidNumber(value, 0, 0xfffe)) {
                     value = value + 1 < 50 ? value + 1 : 1;
-                    await this.flow?.setAttribute(FlowMeasurement.Cluster.id, 'measuredValue', value, this.flow.log);
+                    await this.flow?.setAttribute(FlowMeasurement.id, 'measuredValue', value, this.flow.log);
                     this.flow?.log.info(`Set flow measuredValue to ${value}`);
                 }
             }, 60 * 1000 + 900);
         }
-        await this.switch?.setAttribute(OnOff.Cluster.id, 'onOff', this.intervalOnOff, this.switch.log);
-        await this.mountedOnOffSwitch?.setAttribute(OnOff.Cluster.id, 'onOff', this.intervalOnOff, this.mountedOnOffSwitch.log);
-        await this.mountedOnOffSwitchLegacy?.setAttribute(OnOff.Cluster.id, 'onOff', this.intervalOnOff, this.mountedOnOffSwitchLegacy.log);
+        await this.switch?.setAttribute(OnOff.id, 'onOff', this.intervalOnOff, this.switch.log);
+        await this.mountedOnOffSwitch?.setAttribute(OnOff.id, 'onOff', this.intervalOnOff, this.mountedOnOffSwitch.log);
+        await this.mountedOnOffSwitchLegacy?.setAttribute(OnOff.id, 'onOff', this.intervalOnOff, this.mountedOnOffSwitchLegacy.log);
         this.switch?.log.info(`Set switch initial onOff to ${this.intervalOnOff}`);
         if (this.config.useInterval) {
             this.addInterval(async () => {
-                await this.switch?.setAttribute(OnOff.Cluster.id, 'onOff', this.intervalOnOff, this.switch.log);
-                await this.mountedOnOffSwitch?.setAttribute(OnOff.Cluster.id, 'onOff', this.intervalOnOff, this.mountedOnOffSwitch.log);
-                await this.mountedOnOffSwitchLegacy?.setAttribute(OnOff.Cluster.id, 'onOff', this.intervalOnOff, this.mountedOnOffSwitchLegacy.log);
+                await this.switch?.setAttribute(OnOff.id, 'onOff', this.intervalOnOff, this.switch.log);
+                await this.mountedOnOffSwitch?.setAttribute(OnOff.id, 'onOff', this.intervalOnOff, this.mountedOnOffSwitch.log);
+                await this.mountedOnOffSwitchLegacy?.setAttribute(OnOff.id, 'onOff', this.intervalOnOff, this.mountedOnOffSwitchLegacy.log);
                 this.log.info(`Set switches onOff to ${this.intervalOnOff}`);
                 this.intervalOnOff = !this.intervalOnOff;
             }, 60 * 1000 + 100);
         }
-        await this.lightOnOff?.setAttribute(OnOff.Cluster.id, 'onOff', false, this.lightOnOff.log);
+        await this.lightOnOff?.setAttribute(OnOff.id, 'onOff', false, this.lightOnOff.log);
         this.lightOnOff?.log.info('Set light initial onOff to false.');
-        await this.dimmer?.setAttribute(OnOff.Cluster.id, 'onOff', false, this.dimmer.log);
-        await this.dimmer?.setAttribute(LevelControl.Cluster.id, 'currentLevel', 1, this.dimmer.log);
-        await this.mountedDimmerSwitch?.setAttribute(OnOff.Cluster.id, 'onOff', false, this.mountedDimmerSwitch.log);
-        await this.mountedDimmerSwitch?.setAttribute(LevelControl.Cluster.id, 'currentLevel', 1, this.mountedDimmerSwitch.log);
-        await this.mountedDimmerSwitchLegacy?.setAttribute(OnOff.Cluster.id, 'onOff', false, this.mountedDimmerSwitchLegacy.log);
-        await this.mountedDimmerSwitchLegacy?.setAttribute(LevelControl.Cluster.id, 'currentLevel', 1, this.mountedDimmerSwitchLegacy.log);
+        await this.dimmer?.setAttribute(OnOff.id, 'onOff', false, this.dimmer.log);
+        await this.dimmer?.setAttribute(LevelControl.id, 'currentLevel', 1, this.dimmer.log);
+        await this.mountedDimmerSwitch?.setAttribute(OnOff.id, 'onOff', false, this.mountedDimmerSwitch.log);
+        await this.mountedDimmerSwitch?.setAttribute(LevelControl.id, 'currentLevel', 1, this.mountedDimmerSwitch.log);
+        await this.mountedDimmerSwitchLegacy?.setAttribute(OnOff.id, 'onOff', false, this.mountedDimmerSwitchLegacy.log);
+        await this.mountedDimmerSwitchLegacy?.setAttribute(LevelControl.id, 'currentLevel', 1, this.mountedDimmerSwitchLegacy.log);
         this.dimmer?.log.info(`Set dimmer initial onOff to false, currentLevel to 1.`);
-        await this.light?.setAttribute(OnOff.Cluster.id, 'onOff', false, this.light.log);
-        await this.light?.setAttribute(LevelControl.Cluster.id, 'currentLevel', 200, this.light.log);
-        await this.light?.setAttribute(ColorControl.Cluster.id, 'currentHue', 0, this.light.log);
-        await this.light?.setAttribute(ColorControl.Cluster.id, 'currentSaturation', 128, this.light.log);
+        await this.light?.setAttribute(OnOff.id, 'onOff', false, this.light.log);
+        await this.light?.setAttribute(LevelControl.id, 'currentLevel', 200, this.light.log);
+        await this.light?.setAttribute(ColorControl.id, 'currentHue', 0, this.light.log);
+        await this.light?.setAttribute(ColorControl.id, 'currentSaturation', 128, this.light.log);
         await this.light?.configureColorControlMode(ColorControl.ColorMode.CurrentHueAndCurrentSaturation);
         this.light?.log.info('Set light initial onOff to false, currentLevel to 1, hue to 0 and saturation to 50%.');
-        await this.lightXY?.setAttribute(OnOff.Cluster.id, 'onOff', true, this.lightXY.log);
-        await this.lightXY?.setAttribute(LevelControl.Cluster.id, 'currentLevel', 254, this.lightXY.log);
-        await this.lightXY?.setAttribute(ColorControl.Cluster.id, 'currentX', 0.7006 * 65536, this.lightXY.log);
-        await this.lightXY?.setAttribute(ColorControl.Cluster.id, 'currentY', 0.2993 * 65536, this.lightXY.log);
+        await this.lightXY?.setAttribute(OnOff.id, 'onOff', true, this.lightXY.log);
+        await this.lightXY?.setAttribute(LevelControl.id, 'currentLevel', 254, this.lightXY.log);
+        await this.lightXY?.setAttribute(ColorControl.id, 'currentX', 0.7006 * 65536, this.lightXY.log);
+        await this.lightXY?.setAttribute(ColorControl.id, 'currentY', 0.2993 * 65536, this.lightXY.log);
         await this.lightXY?.configureColorControlMode(ColorControl.ColorMode.CurrentXAndCurrentY);
         this.lightXY?.log.info('Set light XY initial onOff to true, currentLevel to 254, X to 0.7006 and Y to 0.2993.');
-        await this.lightHS?.setAttribute(OnOff.Cluster.id, 'onOff', false, this.lightHS.log);
-        await this.lightHS?.setAttribute(LevelControl.Cluster.id, 'currentLevel', 1, this.lightHS.log);
-        await this.lightHS?.setAttribute(ColorControl.Cluster.id, 'currentHue', 0, this.lightHS.log);
-        await this.lightHS?.setAttribute(ColorControl.Cluster.id, 'currentSaturation', 128, this.lightHS.log);
+        await this.lightHS?.setAttribute(OnOff.id, 'onOff', false, this.lightHS.log);
+        await this.lightHS?.setAttribute(LevelControl.id, 'currentLevel', 1, this.lightHS.log);
+        await this.lightHS?.setAttribute(ColorControl.id, 'currentHue', 0, this.lightHS.log);
+        await this.lightHS?.setAttribute(ColorControl.id, 'currentSaturation', 128, this.lightHS.log);
         await this.lightHS?.configureColorControlMode(ColorControl.ColorMode.CurrentHueAndCurrentSaturation);
         this.lightHS?.log.info('Set light HS initial onOff to false, currentLevel to 1, hue to 0 and saturation to 50%.');
-        await this.lightCT?.setAttribute(OnOff.Cluster.id, 'onOff', true, this.lightCT.log);
-        await this.lightCT?.setAttribute(LevelControl.Cluster.id, 'currentLevel', 128, this.lightCT.log);
-        await this.lightCT?.setAttribute(ColorControl.Cluster.id, 'colorTemperatureMireds', 250, this.lightCT.log);
+        await this.lightCT?.setAttribute(OnOff.id, 'onOff', true, this.lightCT.log);
+        await this.lightCT?.setAttribute(LevelControl.id, 'currentLevel', 128, this.lightCT.log);
+        await this.lightCT?.setAttribute(ColorControl.id, 'colorTemperatureMireds', 250, this.lightCT.log);
         await this.lightCT?.configureColorControlMode(ColorControl.ColorMode.ColorTemperatureMireds);
         this.lightCT?.log.info('Set light CT initial onOff to true, currentLevel to 128, colorTemperatureMireds to 250.');
         if (this.config.useInterval) {
@@ -1998,43 +1998,43 @@ export class ExampleMatterbridgeDynamicPlatform extends MatterbridgeDynamicPlatf
                 this.intervalLevel += 10;
                 if (this.intervalLevel >= 250) {
                     this.intervalLevel = 1;
-                    await this.lightOnOff?.setAttribute(OnOff.Cluster.id, 'onOff', false, this.lightOnOff.log);
-                    await this.dimmer?.setAttribute(OnOff.Cluster.id, 'onOff', false, this.dimmer.log);
-                    await this.mountedDimmerSwitch?.setAttribute(OnOff.Cluster.id, 'onOff', false, this.mountedDimmerSwitch.log);
-                    await this.mountedDimmerSwitchLegacy?.setAttribute(OnOff.Cluster.id, 'onOff', false, this.mountedDimmerSwitchLegacy.log);
-                    await this.light?.setAttribute(OnOff.Cluster.id, 'onOff', false, this.light.log);
-                    await this.lightXY?.setAttribute(OnOff.Cluster.id, 'onOff', false, this.lightXY.log);
-                    await this.lightHS?.setAttribute(OnOff.Cluster.id, 'onOff', false, this.lightHS.log);
-                    await this.lightCT?.setAttribute(OnOff.Cluster.id, 'onOff', false, this.lightCT.log);
+                    await this.lightOnOff?.setAttribute(OnOff.id, 'onOff', false, this.lightOnOff.log);
+                    await this.dimmer?.setAttribute(OnOff.id, 'onOff', false, this.dimmer.log);
+                    await this.mountedDimmerSwitch?.setAttribute(OnOff.id, 'onOff', false, this.mountedDimmerSwitch.log);
+                    await this.mountedDimmerSwitchLegacy?.setAttribute(OnOff.id, 'onOff', false, this.mountedDimmerSwitchLegacy.log);
+                    await this.light?.setAttribute(OnOff.id, 'onOff', false, this.light.log);
+                    await this.lightXY?.setAttribute(OnOff.id, 'onOff', false, this.lightXY.log);
+                    await this.lightHS?.setAttribute(OnOff.id, 'onOff', false, this.lightHS.log);
+                    await this.lightCT?.setAttribute(OnOff.id, 'onOff', false, this.lightCT.log);
                     this.log.info('Set lights onOff to false');
                 }
                 else {
-                    await this.lightOnOff?.setAttribute(OnOff.Cluster.id, 'onOff', true, this.lightOnOff?.log);
-                    await this.dimmer?.setAttribute(OnOff.Cluster.id, 'onOff', true, this.dimmer.log);
-                    await this.mountedDimmerSwitch?.setAttribute(OnOff.Cluster.id, 'onOff', true, this.mountedDimmerSwitch.log);
-                    await this.mountedDimmerSwitchLegacy?.setAttribute(OnOff.Cluster.id, 'onOff', true, this.mountedDimmerSwitchLegacy.log);
-                    await this.light?.setAttribute(OnOff.Cluster.id, 'onOff', true, this.light.log);
-                    await this.lightXY?.setAttribute(OnOff.Cluster.id, 'onOff', true, this.lightXY.log);
-                    await this.lightHS?.setAttribute(OnOff.Cluster.id, 'onOff', true, this.lightHS.log);
-                    await this.lightCT?.setAttribute(OnOff.Cluster.id, 'onOff', true, this.lightCT.log);
+                    await this.lightOnOff?.setAttribute(OnOff.id, 'onOff', true, this.lightOnOff?.log);
+                    await this.dimmer?.setAttribute(OnOff.id, 'onOff', true, this.dimmer.log);
+                    await this.mountedDimmerSwitch?.setAttribute(OnOff.id, 'onOff', true, this.mountedDimmerSwitch.log);
+                    await this.mountedDimmerSwitchLegacy?.setAttribute(OnOff.id, 'onOff', true, this.mountedDimmerSwitchLegacy.log);
+                    await this.light?.setAttribute(OnOff.id, 'onOff', true, this.light.log);
+                    await this.lightXY?.setAttribute(OnOff.id, 'onOff', true, this.lightXY.log);
+                    await this.lightHS?.setAttribute(OnOff.id, 'onOff', true, this.lightHS.log);
+                    await this.lightCT?.setAttribute(OnOff.id, 'onOff', true, this.lightCT.log);
                     this.log.info('Set lights onOff to true');
-                    await this.dimmer?.setAttribute(LevelControl.Cluster.id, 'currentLevel', this.intervalLevel, this.dimmer.log);
-                    await this.mountedDimmerSwitch?.setAttribute(LevelControl.Cluster.id, 'currentLevel', this.intervalLevel, this.mountedDimmerSwitch.log);
-                    await this.mountedDimmerSwitchLegacy?.setAttribute(LevelControl.Cluster.id, 'currentLevel', this.intervalLevel, this.mountedDimmerSwitchLegacy.log);
-                    await this.light?.setAttribute(LevelControl.Cluster.id, 'currentLevel', this.intervalLevel, this.light.log);
-                    await this.lightXY?.setAttribute(LevelControl.Cluster.id, 'currentLevel', this.intervalLevel, this.lightXY.log);
-                    await this.lightHS?.setAttribute(LevelControl.Cluster.id, 'currentLevel', this.intervalLevel, this.lightHS.log);
-                    await this.lightCT?.setAttribute(LevelControl.Cluster.id, 'currentLevel', this.intervalLevel, this.lightCT.log);
+                    await this.dimmer?.setAttribute(LevelControl.id, 'currentLevel', this.intervalLevel, this.dimmer.log);
+                    await this.mountedDimmerSwitch?.setAttribute(LevelControl.id, 'currentLevel', this.intervalLevel, this.mountedDimmerSwitch.log);
+                    await this.mountedDimmerSwitchLegacy?.setAttribute(LevelControl.id, 'currentLevel', this.intervalLevel, this.mountedDimmerSwitchLegacy.log);
+                    await this.light?.setAttribute(LevelControl.id, 'currentLevel', this.intervalLevel, this.light.log);
+                    await this.lightXY?.setAttribute(LevelControl.id, 'currentLevel', this.intervalLevel, this.lightXY.log);
+                    await this.lightHS?.setAttribute(LevelControl.id, 'currentLevel', this.intervalLevel, this.lightHS.log);
+                    await this.lightCT?.setAttribute(LevelControl.id, 'currentLevel', this.intervalLevel, this.lightCT.log);
                     this.log.info(`Set lights currentLevel to ${this.intervalLevel}`);
                 }
                 this.intervalColorTemperature += 50;
                 if (this.intervalColorTemperature > 500) {
                     this.intervalColorTemperature = 147;
                 }
-                await this.light?.setAttribute(ColorControl.Cluster.id, 'colorTemperatureMireds', this.intervalColorTemperature, this.light.log);
-                await this.lightHS?.setAttribute(ColorControl.Cluster.id, 'colorTemperatureMireds', this.intervalColorTemperature, this.lightHS.log);
-                await this.lightXY?.setAttribute(ColorControl.Cluster.id, 'colorTemperatureMireds', this.intervalColorTemperature, this.lightXY.log);
-                await this.lightCT?.setAttribute(ColorControl.Cluster.id, 'colorTemperatureMireds', this.intervalColorTemperature, this.lightCT.log);
+                await this.light?.setAttribute(ColorControl.id, 'colorTemperatureMireds', this.intervalColorTemperature, this.light.log);
+                await this.lightHS?.setAttribute(ColorControl.id, 'colorTemperatureMireds', this.intervalColorTemperature, this.lightHS.log);
+                await this.lightXY?.setAttribute(ColorControl.id, 'colorTemperatureMireds', this.intervalColorTemperature, this.lightXY.log);
+                await this.lightCT?.setAttribute(ColorControl.id, 'colorTemperatureMireds', this.intervalColorTemperature, this.lightCT.log);
                 await this.light?.configureColorControlMode(ColorControl.ColorMode.ColorTemperatureMireds);
                 await this.lightHS?.configureColorControlMode(ColorControl.ColorMode.ColorTemperatureMireds);
                 await this.lightXY?.configureColorControlMode(ColorControl.ColorMode.ColorTemperatureMireds);
@@ -2043,76 +2043,76 @@ export class ExampleMatterbridgeDynamicPlatform extends MatterbridgeDynamicPlatf
             }, 60 * 1000 + 200);
         }
         this.outlet?.log.info('Set outlet initial onOff to false');
-        await this.outlet?.setAttribute(OnOff.Cluster.id, 'onOff', false, this.outlet.log);
+        await this.outlet?.setAttribute(OnOff.id, 'onOff', false, this.outlet.log);
         this.outletEnergy?.log.info('Set outlet initial onOff to false and energy/power to 0');
-        await this.outletEnergy?.setAttribute(OnOff.Cluster.id, 'onOff', false, this.outletEnergy.log);
-        await this.outletEnergy?.setAttribute(ElectricalEnergyMeasurement.Cluster.id, 'cumulativeEnergyImported', { energy: 0 }, this.outletEnergy.log);
-        await this.outletEnergy?.setAttribute(ElectricalPowerMeasurement.Cluster.id, 'voltage', 220_000, this.outletEnergy.log);
-        await this.outletEnergy?.setAttribute(ElectricalPowerMeasurement.Cluster.id, 'activeCurrent', 0, this.outletEnergy.log);
-        await this.outletEnergy?.setAttribute(ElectricalPowerMeasurement.Cluster.id, 'activePower', 0, this.outletEnergy.log);
+        await this.outletEnergy?.setAttribute(OnOff.id, 'onOff', false, this.outletEnergy.log);
+        await this.outletEnergy?.setAttribute(ElectricalEnergyMeasurement.id, 'cumulativeEnergyImported', { energy: 0 }, this.outletEnergy.log);
+        await this.outletEnergy?.setAttribute(ElectricalPowerMeasurement.id, 'voltage', 220_000, this.outletEnergy.log);
+        await this.outletEnergy?.setAttribute(ElectricalPowerMeasurement.id, 'activeCurrent', 0, this.outletEnergy.log);
+        await this.outletEnergy?.setAttribute(ElectricalPowerMeasurement.id, 'activePower', 0, this.outletEnergy.log);
         this.outletEnergyApparent?.log.info('Set outlet initial onOff to false and apparent energy/power to 0');
-        await this.outletEnergyApparent?.setAttribute(OnOff.Cluster.id, 'onOff', false, this.outletEnergyApparent.log);
-        await this.outletEnergyApparent?.setAttribute(ElectricalEnergyMeasurement.Cluster.id, 'cumulativeEnergyImported', { energy: 0 }, this.outletEnergyApparent.log);
-        await this.outletEnergyApparent?.setAttribute(ElectricalPowerMeasurement.Cluster.id, 'voltage', 220_000, this.outletEnergyApparent.log);
-        await this.outletEnergyApparent?.setAttribute(ElectricalPowerMeasurement.Cluster.id, 'apparentCurrent', 0, this.outletEnergyApparent.log);
-        await this.outletEnergyApparent?.setAttribute(ElectricalPowerMeasurement.Cluster.id, 'apparentPower', 0, this.outletEnergyApparent.log);
+        await this.outletEnergyApparent?.setAttribute(OnOff.id, 'onOff', false, this.outletEnergyApparent.log);
+        await this.outletEnergyApparent?.setAttribute(ElectricalEnergyMeasurement.id, 'cumulativeEnergyImported', { energy: 0 }, this.outletEnergyApparent.log);
+        await this.outletEnergyApparent?.setAttribute(ElectricalPowerMeasurement.id, 'voltage', 220_000, this.outletEnergyApparent.log);
+        await this.outletEnergyApparent?.setAttribute(ElectricalPowerMeasurement.id, 'apparentCurrent', 0, this.outletEnergyApparent.log);
+        await this.outletEnergyApparent?.setAttribute(ElectricalPowerMeasurement.id, 'apparentPower', 0, this.outletEnergyApparent.log);
         if (this.config.useInterval) {
             this.addInterval(async () => {
-                let state = this.outlet?.getAttribute(OnOff.Cluster.id, 'onOff', this.outlet.log);
+                let state = this.outlet?.getAttribute(OnOff.id, 'onOff', this.outlet.log);
                 if (isValidBoolean(state)) {
                     this.outlet?.log.info(`Set outlet onOff to ${!state}`);
-                    await this.outlet?.setAttribute(OnOff.Cluster.id, 'onOff', !state, this.outlet.log);
+                    await this.outlet?.setAttribute(OnOff.id, 'onOff', !state, this.outlet.log);
                 }
-                state = this.outletEnergy?.getAttribute(OnOff.Cluster.id, 'onOff', this.outletEnergy.log);
+                state = this.outletEnergy?.getAttribute(OnOff.id, 'onOff', this.outletEnergy.log);
                 if (isValidBoolean(state)) {
                     this.outletEnergy?.log.info(`Set outlet onOff to ${!state}`);
-                    await this.outletEnergy?.setAttribute(OnOff.Cluster.id, 'onOff', !state, this.outletEnergy.log);
-                    if (!state) {
-                        await this.outletEnergy?.setAttribute(ElectricalPowerMeasurement.Cluster.id, 'activeCurrent', 100_000, this.outletEnergy.log);
-                        await this.outletEnergy?.setAttribute(ElectricalPowerMeasurement.Cluster.id, 'activePower', 220_000_000, this.outletEnergy.log);
-                        const energy = this.outletEnergy?.getAttribute(ElectricalEnergyMeasurement.Cluster.id, 'cumulativeEnergyImported', this.outletEnergy.log);
+                    await this.outletEnergy?.setAttribute(OnOff.id, 'onOff', !state, this.outletEnergy.log);
+                    if (state) {
+                        await this.outletEnergy?.setAttribute(ElectricalPowerMeasurement.id, 'activeCurrent', 0, this.outletEnergy.log);
+                        await this.outletEnergy?.setAttribute(ElectricalPowerMeasurement.id, 'activePower', 0, this.outletEnergy.log);
+                    }
+                    else {
+                        await this.outletEnergy?.setAttribute(ElectricalPowerMeasurement.id, 'activeCurrent', 100_000, this.outletEnergy.log);
+                        await this.outletEnergy?.setAttribute(ElectricalPowerMeasurement.id, 'activePower', 220_000_000, this.outletEnergy.log);
+                        const energy = this.outletEnergy?.getAttribute(ElectricalEnergyMeasurement, 'cumulativeEnergyImported', this.outletEnergy.log);
                         if (isValidObject(energy, 1)) {
                             if (typeof energy.energy === 'bigint')
                                 energy.energy += 5000n;
                             else
                                 energy.energy += 5000;
-                            await this.outletEnergy?.setAttribute(ElectricalEnergyMeasurement.Cluster.id, 'cumulativeEnergyImported', energy, this.outletEnergy.log);
+                            await this.outletEnergy?.setAttribute(ElectricalEnergyMeasurement.id, 'cumulativeEnergyImported', energy, this.outletEnergy.log);
                         }
-                        await this.outletEnergy?.setAttribute(ElectricalEnergyMeasurement.Cluster.id, 'cumulativeEnergyImported', { energy: 0 }, this.outletEnergy.log);
-                    }
-                    else {
-                        await this.outletEnergy?.setAttribute(ElectricalPowerMeasurement.Cluster.id, 'activeCurrent', 0, this.outletEnergy.log);
-                        await this.outletEnergy?.setAttribute(ElectricalPowerMeasurement.Cluster.id, 'activePower', 0, this.outletEnergy.log);
+                        await this.outletEnergy?.setAttribute(ElectricalEnergyMeasurement.id, 'cumulativeEnergyImported', { energy: 0 }, this.outletEnergy.log);
                     }
                 }
-                state = this.outletEnergyApparent?.getAttribute(OnOff.Cluster.id, 'onOff', this.outletEnergyApparent.log);
+                state = this.outletEnergyApparent?.getAttribute(OnOff.id, 'onOff', this.outletEnergyApparent.log);
                 if (isValidBoolean(state)) {
                     this.outletEnergyApparent?.log.info(`Set outlet onOff to ${!state}`);
-                    await this.outletEnergyApparent?.setAttribute(OnOff.Cluster.id, 'onOff', !state, this.outletEnergyApparent.log);
-                    if (!state) {
-                        await this.outletEnergyApparent?.setAttribute(ElectricalPowerMeasurement.Cluster.id, 'apparentCurrent', 100_000, this.outletEnergyApparent.log);
-                        await this.outletEnergyApparent?.setAttribute(ElectricalPowerMeasurement.Cluster.id, 'apparentPower', 220_000_000, this.outletEnergyApparent.log);
-                        const energy = this.outletEnergyApparent?.getAttribute(ElectricalEnergyMeasurement.Cluster.id, 'cumulativeEnergyImported', this.outletEnergyApparent.log);
+                    await this.outletEnergyApparent?.setAttribute(OnOff.id, 'onOff', !state, this.outletEnergyApparent.log);
+                    if (state) {
+                        await this.outletEnergyApparent?.setAttribute(ElectricalPowerMeasurement.id, 'apparentCurrent', 0, this.outletEnergyApparent.log);
+                        await this.outletEnergyApparent?.setAttribute(ElectricalPowerMeasurement.id, 'apparentPower', 0, this.outletEnergyApparent.log);
+                    }
+                    else {
+                        await this.outletEnergyApparent?.setAttribute(ElectricalPowerMeasurement.id, 'apparentCurrent', 100_000, this.outletEnergyApparent.log);
+                        await this.outletEnergyApparent?.setAttribute(ElectricalPowerMeasurement.id, 'apparentPower', 220_000_000, this.outletEnergyApparent.log);
+                        const energy = this.outletEnergyApparent?.getAttribute(ElectricalEnergyMeasurement, 'cumulativeEnergyImported', this.outletEnergyApparent.log);
                         if (isValidObject(energy, 1)) {
                             if (typeof energy.energy === 'bigint')
                                 energy.energy += 5000n;
                             else
                                 energy.energy += 5000;
-                            await this.outletEnergyApparent?.setAttribute(ElectricalEnergyMeasurement.Cluster.id, 'cumulativeEnergyImported', energy, this.outletEnergyApparent.log);
+                            await this.outletEnergyApparent?.setAttribute(ElectricalEnergyMeasurement.id, 'cumulativeEnergyImported', energy, this.outletEnergyApparent.log);
                         }
                     }
-                    else {
-                        await this.outletEnergyApparent?.setAttribute(ElectricalPowerMeasurement.Cluster.id, 'apparentCurrent', 0, this.outletEnergyApparent.log);
-                        await this.outletEnergyApparent?.setAttribute(ElectricalPowerMeasurement.Cluster.id, 'apparentPower', 0, this.outletEnergyApparent.log);
-                    }
                 }
-                state = this.smartOutlet?.getChildEndpointById('Socket1')?.getAttribute(OnOff.Cluster.id, 'onOff', this.smartOutlet.log);
+                state = this.smartOutlet?.getChildEndpointById('Socket1')?.getAttribute(OnOff.id, 'onOff', this.smartOutlet.log);
                 if (isValidBoolean(state)) {
                     this.smartOutlet?.log.info(`Set smart outlets onOff`);
-                    await this.smartOutlet?.getChildEndpointById('Socket1')?.setAttribute(OnOff.Cluster.id, 'onOff', !state, this.smartOutlet.log);
-                    await this.smartOutlet?.getChildEndpointById('Socket2')?.setAttribute(OnOff.Cluster.id, 'onOff', state, this.smartOutlet.log);
-                    await this.smartOutlet?.getChildEndpointById('Socket3')?.setAttribute(OnOff.Cluster.id, 'onOff', !state, this.smartOutlet.log);
-                    await this.smartOutlet?.getChildEndpointById('Socket4')?.setAttribute(OnOff.Cluster.id, 'onOff', state, this.smartOutlet.log);
+                    await this.smartOutlet?.getChildEndpointById('Socket1')?.setAttribute(OnOff.id, 'onOff', !state, this.smartOutlet.log);
+                    await this.smartOutlet?.getChildEndpointById('Socket2')?.setAttribute(OnOff.id, 'onOff', state, this.smartOutlet.log);
+                    await this.smartOutlet?.getChildEndpointById('Socket3')?.setAttribute(OnOff.id, 'onOff', !state, this.smartOutlet.log);
+                    await this.smartOutlet?.getChildEndpointById('Socket4')?.setAttribute(OnOff.id, 'onOff', state, this.smartOutlet.log);
                 }
             }, 60 * 1000 + 300);
         }
@@ -2120,201 +2120,201 @@ export class ExampleMatterbridgeDynamicPlatform extends MatterbridgeDynamicPlatf
         this.coverLift?.log.info('Set cover initial targetPositionLiftPercent100ths = currentPositionLiftPercent100ths and operationalStatus to Stopped.');
         if (this.config.useInterval) {
             this.addInterval(async () => {
-                let position = this.coverLift?.getAttribute(WindowCovering.Cluster.id, 'currentPositionLiftPercent100ths', this.coverLift.log);
+                let position = this.coverLift?.getAttribute(WindowCovering.id, 'currentPositionLiftPercent100ths', this.coverLift.log);
                 if (isValidNumber(position, 0, 10000)) {
                     position = position > 9000 ? 0 : position + 1000;
-                    await this.coverLift?.setAttribute(WindowCovering.Cluster.id, 'targetPositionLiftPercent100ths', position, this.coverLift.log);
-                    await this.coverLift?.setAttribute(WindowCovering.Cluster.id, 'currentPositionLiftPercent100ths', position, this.coverLift.log);
-                    await this.coverLift?.setAttribute(WindowCovering.Cluster.id, 'operationalStatus', { global: WindowCovering.MovementStatus.Stopped, lift: WindowCovering.MovementStatus.Stopped, tilt: WindowCovering.MovementStatus.Stopped }, this.coverLift.log);
+                    await this.coverLift?.setAttribute(WindowCovering.id, 'targetPositionLiftPercent100ths', position, this.coverLift.log);
+                    await this.coverLift?.setAttribute(WindowCovering.id, 'currentPositionLiftPercent100ths', position, this.coverLift.log);
+                    await this.coverLift?.setAttribute(WindowCovering.id, 'operationalStatus', { global: WindowCovering.MovementStatus.Stopped, lift: WindowCovering.MovementStatus.Stopped, tilt: WindowCovering.MovementStatus.Stopped }, this.coverLift.log);
                     this.coverLift?.log.info(`Set cover current and target positionLiftPercent100ths to ${position} and operationalStatus to Stopped`);
                 }
             }, 60 * 1000 + 400);
         }
-        await this.lock?.setAttribute(DoorLock.Cluster.id, 'lockState', DoorLock.LockState.Locked, this.lock.log);
+        await this.lock?.setAttribute(DoorLock.id, 'lockState', DoorLock.LockState.Locked, this.lock.log);
         this.lock?.log.info('Set lock initial lockState to Locked');
         if (this.config.useInterval) {
             this.addInterval(async () => {
-                const status = this.lock?.getAttribute(DoorLock.Cluster.id, 'lockState', this.lock.log);
+                const status = this.lock?.getAttribute(DoorLock, 'lockState', this.lock.log);
                 if (isValidNumber(status, DoorLock.LockState.Locked, DoorLock.LockState.Unlocked)) {
-                    await this.lock?.setAttribute(DoorLock.Cluster.id, 'lockState', status === DoorLock.LockState.Locked ? DoorLock.LockState.Unlocked : DoorLock.LockState.Locked, this.lock.log);
+                    await this.lock?.setAttribute(DoorLock.id, 'lockState', status === DoorLock.LockState.Locked ? DoorLock.LockState.Unlocked : DoorLock.LockState.Locked, this.lock.log);
                     this.lock?.log.info(`Set lock lockState to ${status === DoorLock.LockState.Locked ? 'Locked' : 'Unlocked'}`);
                 }
             }, 60 * 1000 + 500);
         }
-        await this.thermoAuto?.setAttribute(ThermostatCluster.id, 'localTemperature', 16 * 100, this.thermoAuto.log);
-        await this.thermoAuto?.setAttribute(ThermostatCluster.id, 'systemMode', Thermostat.SystemMode.Auto, this.thermoAuto.log);
-        if (this.thermoAuto?.hasAttributeServer(ThermostatCluster.id, 'thermostatRunningState')) {
-            const runningState = this.thermoAuto?.getAttribute(ThermostatCluster.id, 'thermostatRunningState', this.thermoAuto.log);
-            await this.thermoAuto?.setAttribute(ThermostatCluster.id, 'thermostatRunningState', { ...runningState, heat: true }, this.thermoAuto.log);
+        await this.thermoAuto?.setAttribute(Thermostat.id, 'localTemperature', 16 * 100, this.thermoAuto.log);
+        await this.thermoAuto?.setAttribute(Thermostat.id, 'systemMode', Thermostat.SystemMode.Auto, this.thermoAuto.log);
+        if (this.thermoAuto?.hasAttributeServer(Thermostat.id, 'thermostatRunningState')) {
+            const runningState = this.thermoAuto?.getAttribute(Thermostat.id, 'thermostatRunningState', this.thermoAuto.log);
+            await this.thermoAuto?.setAttribute(Thermostat.id, 'thermostatRunningState', { ...runningState, heat: true }, this.thermoAuto.log);
         }
         this.thermoAuto?.log.info('Set thermostat initial localTemperature to 16°C, mode Auto and heat runningState to true');
-        const temperature = this.thermoAuto?.getChildEndpointByName('Temperature');
-        await temperature?.setAttribute(TemperatureMeasurement.Cluster.id, 'measuredValue', 16 * 100, this.thermoAuto?.log);
-        const humidity = this.thermoAuto?.getChildEndpointByName('Humidity');
-        await humidity?.setAttribute(RelativeHumidityMeasurementCluster.id, 'measuredValue', 50 * 100, this.thermoAuto?.log);
-        const flow = this.thermoAuto?.getChildEndpointByName('Flow');
-        await flow?.setAttribute(FlowMeasurement.Cluster.id, 'measuredValue', 10, this.thermoAuto?.log);
+        const temperature = this.thermoAuto?.getChildEndpointById('Temperature');
+        await temperature?.setAttribute(TemperatureMeasurement.id, 'measuredValue', 16 * 100, this.thermoAuto?.log);
+        const humidity = this.thermoAuto?.getChildEndpointById('Humidity');
+        await humidity?.setAttribute(RelativeHumidityMeasurement.id, 'measuredValue', 50 * 100, this.thermoAuto?.log);
+        const flow = this.thermoAuto?.getChildEndpointById('Flow');
+        await flow?.setAttribute(FlowMeasurement.id, 'measuredValue', 10, this.thermoAuto?.log);
         this.thermoAuto?.log.info('Set thermostat ext temperature to 16°C, ext humidity to 50% and ext valve flow to 10');
-        await this.thermoAutoOccupancy?.setAttribute(ThermostatCluster.id, 'occupancy', { occupied: true }, this.thermoAutoOccupancy.log);
-        await this.thermoAutoOccupancy?.setAttribute(ThermostatCluster.id, 'systemMode', Thermostat.SystemMode.Auto, this.thermoAutoOccupancy.log);
+        await this.thermoAutoOccupancy?.setAttribute(Thermostat.id, 'occupancy', { occupied: true }, this.thermoAutoOccupancy.log);
+        await this.thermoAutoOccupancy?.setAttribute(Thermostat.id, 'systemMode', Thermostat.SystemMode.Auto, this.thermoAutoOccupancy.log);
         this.thermoAutoOccupancy?.log.info('Set thermostat occupancy to true and mode Auto');
         if (this.config.useInterval) {
             this.addInterval(async () => {
-                let temperature = this.thermoAuto?.getAttribute(ThermostatCluster.id, 'localTemperature', this.thermoAuto.log);
+                let temperature = this.thermoAuto?.getAttribute(Thermostat.id, 'localTemperature', this.thermoAuto.log);
                 if (isValidNumber(temperature, 1600, 2400)) {
                     temperature = temperature + 100 > 2400 ? 1600 : temperature + 100;
-                    await this.thermoAuto?.setAttribute(ThermostatCluster.id, 'localTemperature', temperature, this.thermoAuto.log);
-                    await this.thermoHeat?.setAttribute(ThermostatCluster.id, 'localTemperature', temperature, this.thermoHeat.log);
-                    const tempIn = this.thermoHeat?.getChildEndpointByName('TemperatureIN');
-                    await tempIn?.setAttribute(TemperatureMeasurement.Cluster.id, 'measuredValue', temperature - 50, this.thermoHeat?.log);
-                    const tempOut = this.thermoHeat?.getChildEndpointByName('TemperatureOUT');
-                    await tempOut?.setAttribute(TemperatureMeasurement.Cluster.id, 'measuredValue', temperature - 400, this.thermoHeat?.log);
-                    await this.thermoCool?.setAttribute(ThermostatCluster.id, 'localTemperature', temperature, this.thermoCool.log);
-                    const temp = this.thermoCool?.getChildEndpointByName('Temperature');
-                    await temp?.setAttribute(TemperatureMeasurement.Cluster.id, 'measuredValue', temperature, this.thermoCool?.log);
-                    const humidity = this.thermoCool?.getChildEndpointByName('Humidity');
-                    await humidity?.setAttribute(RelativeHumidityMeasurementCluster.id, 'measuredValue', 50 * 100, this.thermoCool?.log);
-                    const flow = this.thermoCool?.getChildEndpointByName('Flow');
-                    await flow?.setAttribute(FlowMeasurement.Cluster.id, 'measuredValue', 10, this.thermoCool?.log);
+                    await this.thermoAuto?.setAttribute(Thermostat.id, 'localTemperature', temperature, this.thermoAuto.log);
+                    await this.thermoHeat?.setAttribute(Thermostat.id, 'localTemperature', temperature, this.thermoHeat.log);
+                    const tempIn = this.thermoHeat?.getChildEndpointById('TemperatureIN');
+                    await tempIn?.setAttribute(TemperatureMeasurement.id, 'measuredValue', temperature - 50, this.thermoHeat?.log);
+                    const tempOut = this.thermoHeat?.getChildEndpointById('TemperatureOUT');
+                    await tempOut?.setAttribute(TemperatureMeasurement.id, 'measuredValue', temperature - 400, this.thermoHeat?.log);
+                    await this.thermoCool?.setAttribute(Thermostat.id, 'localTemperature', temperature, this.thermoCool.log);
+                    const temp = this.thermoCool?.getChildEndpointById('Temperature');
+                    await temp?.setAttribute(TemperatureMeasurement.id, 'measuredValue', temperature, this.thermoCool?.log);
+                    const humidity = this.thermoCool?.getChildEndpointById('Humidity');
+                    await humidity?.setAttribute(RelativeHumidityMeasurement.id, 'measuredValue', 50 * 100, this.thermoCool?.log);
+                    const flow = this.thermoCool?.getChildEndpointById('Flow');
+                    await flow?.setAttribute(FlowMeasurement.id, 'measuredValue', 10, this.thermoCool?.log);
                     this.thermoAuto?.log.info(`Set thermostat localTemperature to ${temperature / 100}°C`);
                     this.thermoHeat?.log.info(`Set thermostat localTemperature to ${temperature / 100}°C`);
                     this.thermoCool?.log.info(`Set thermostat localTemperature to ${temperature / 100}°C`);
                 }
-                let temperatureOccupancy = this.thermoAutoOccupancy?.getAttribute(ThermostatCluster.id, 'localTemperature', this.thermoAutoOccupancy.log);
+                let temperatureOccupancy = this.thermoAutoOccupancy?.getAttribute(Thermostat.id, 'localTemperature', this.thermoAutoOccupancy.log);
                 if (isValidNumber(temperatureOccupancy, 1600, 2400)) {
                     temperatureOccupancy = temperatureOccupancy + 100 > 2400 ? 1600 : temperatureOccupancy + 100;
-                    await this.thermoAutoOccupancy?.setAttribute(ThermostatCluster.id, 'localTemperature', temperatureOccupancy, this.thermoAutoOccupancy.log);
-                    await this.thermoAutoOccupancy?.setAttribute(ThermostatCluster.id, 'outdoorTemperature', temperatureOccupancy + 100, this.thermoAutoOccupancy.log);
-                    const occupancyValue = this.thermoAutoOccupancy?.getAttribute(Thermostat.Cluster.id, 'occupancy', this.thermoAutoOccupancy.log);
+                    await this.thermoAutoOccupancy?.setAttribute(Thermostat.id, 'localTemperature', temperatureOccupancy, this.thermoAutoOccupancy.log);
+                    await this.thermoAutoOccupancy?.setAttribute(Thermostat.id, 'outdoorTemperature', temperatureOccupancy + 100, this.thermoAutoOccupancy.log);
+                    const occupancyValue = this.thermoAutoOccupancy?.getAttribute(Thermostat, 'occupancy', this.thermoAutoOccupancy.log);
                     if (isValidObject(occupancyValue, 1)) {
                         occupancyValue.occupied = !occupancyValue.occupied;
-                        await this.thermoAutoOccupancy?.setAttribute(Thermostat.Cluster.id, 'occupancy', occupancyValue, this.thermoAutoOccupancy.log);
+                        await this.thermoAutoOccupancy?.setAttribute(Thermostat.id, 'occupancy', occupancyValue, this.thermoAutoOccupancy.log);
                         this.thermoAutoOccupancy?.log.info(`Set thermostat occupancy to ${occupancyValue.occupied}`);
                     }
                 }
-                if (this.thermoAuto?.hasAttributeServer(ThermostatCluster.id, 'thermostatRunningState')) {
-                    const runningState = this.thermoAuto?.getAttribute(ThermostatCluster.id, 'thermostatRunningState', this.thermoAuto.log);
+                if (this.thermoAuto?.hasAttributeServer(Thermostat.id, 'thermostatRunningState')) {
+                    const runningState = this.thermoAuto?.getAttribute(Thermostat.id, 'thermostatRunningState', this.thermoAuto.log);
                     runningState.heat = !runningState?.heat;
                     runningState.cool = !runningState?.cool;
-                    await this.thermoAuto?.setAttribute(ThermostatCluster.id, 'thermostatRunningState', runningState, this.thermoAuto.log);
+                    await this.thermoAuto?.setAttribute(Thermostat.id, 'thermostatRunningState', runningState, this.thermoAuto.log);
                 }
             }, 60 * 1000 + 600);
         }
-        await this.airConditioner?.setAttribute(OnOff.Cluster.id, 'onOff', true, this.airConditioner.log);
-        await this.airConditioner?.setAttribute(ThermostatCluster.id, 'localTemperature', 2000, this.airConditioner.log);
+        await this.airConditioner?.setAttribute(OnOff.id, 'onOff', true, this.airConditioner.log);
+        await this.airConditioner?.setAttribute(Thermostat.id, 'localTemperature', 2000, this.airConditioner.log);
         if (this.config.useInterval) {
             this.addInterval(async () => {
-                let temperature = this.airConditioner?.getAttribute(ThermostatCluster.id, 'localTemperature', this.airConditioner.log);
+                let temperature = this.airConditioner?.getAttribute(Thermostat.id, 'localTemperature', this.airConditioner.log);
                 if (isValidNumber(temperature, 1600, 2400)) {
                     temperature = temperature + 100 > 2400 ? 1600 : temperature + 100;
-                    await this.airConditioner?.setAttribute(ThermostatCluster.id, 'localTemperature', temperature, this.airConditioner.log);
-                    await this.airConditioner?.setAttribute(TemperatureMeasurement.Cluster.id, 'measuredValue', temperature, this.airConditioner.log);
-                    await this.airConditioner?.setAttribute(RelativeHumidityMeasurementCluster.id, 'measuredValue', 50 * 100, this.airConditioner.log);
+                    await this.airConditioner?.setAttribute(Thermostat.id, 'localTemperature', temperature, this.airConditioner.log);
+                    await this.airConditioner?.setAttribute(TemperatureMeasurement.id, 'measuredValue', temperature, this.airConditioner.log);
+                    await this.airConditioner?.setAttribute(RelativeHumidityMeasurement.id, 'measuredValue', 50 * 100, this.airConditioner.log);
                     this.airConditioner?.log.info(`Set airConditioner localTemperature to ${temperature / 100}°C`);
                 }
             }, 60 * 1000 + 550);
         }
         this.fanBase?.log.info('Set fan initial fanMode to Off, percentCurrent and percentSetting to 0');
-        await this.fanBase?.setAttribute(FanControl.Cluster.id, 'fanMode', FanControl.FanMode.Off, this.fanBase.log);
-        await this.fanBase?.setAttribute(FanControl.Cluster.id, 'percentCurrent', 0, this.fanBase.log);
-        await this.fanBase?.setAttribute(FanControl.Cluster.id, 'percentSetting', 0, this.fanBase.log);
-        await this.fanDefault?.setAttribute(FanControl.Cluster.id, 'fanMode', FanControl.FanMode.Auto, this.fanDefault.log);
-        await this.fanDefault?.setAttribute(FanControl.Cluster.id, 'percentCurrent', 0, this.fanDefault.log);
-        await this.fanDefault?.setAttribute(FanControl.Cluster.id, 'percentSetting', 0, this.fanDefault.log);
-        await this.fanComplete?.setAttribute(FanControl.Cluster.id, 'fanMode', FanControl.FanMode.Auto, this.fanComplete.log);
-        await this.fanComplete?.setAttribute(FanControl.Cluster.id, 'percentCurrent', 0, this.fanComplete.log);
-        await this.fanComplete?.setAttribute(FanControl.Cluster.id, 'percentSetting', 0, this.fanComplete.log);
+        await this.fanBase?.setAttribute(FanControl.id, 'fanMode', FanControl.FanMode.Off, this.fanBase.log);
+        await this.fanBase?.setAttribute(FanControl.id, 'percentCurrent', 0, this.fanBase.log);
+        await this.fanBase?.setAttribute(FanControl.id, 'percentSetting', 0, this.fanBase.log);
+        await this.fanDefault?.setAttribute(FanControl.id, 'fanMode', FanControl.FanMode.Auto, this.fanDefault.log);
+        await this.fanDefault?.setAttribute(FanControl.id, 'percentCurrent', 0, this.fanDefault.log);
+        await this.fanDefault?.setAttribute(FanControl.id, 'percentSetting', 0, this.fanDefault.log);
+        await this.fanComplete?.setAttribute(FanControl.id, 'fanMode', FanControl.FanMode.Auto, this.fanComplete.log);
+        await this.fanComplete?.setAttribute(FanControl.id, 'percentCurrent', 0, this.fanComplete.log);
+        await this.fanComplete?.setAttribute(FanControl.id, 'percentSetting', 0, this.fanComplete.log);
         if (this.config.useInterval) {
             this.addInterval(async () => {
-                let mode = this.fanBase?.getAttribute(FanControl.Cluster.id, 'fanMode', this.fanBase.log);
-                let value = this.fanBase?.getAttribute(FanControl.Cluster.id, 'percentCurrent', this.fanBase.log);
-                mode = this.fanDefault?.getAttribute(FanControl.Cluster.id, 'fanMode', this.fanDefault.log);
-                value = this.fanDefault?.getAttribute(FanControl.Cluster.id, 'percentCurrent', this.fanDefault.log);
+                let mode = this.fanBase?.getAttribute(FanControl, 'fanMode', this.fanBase.log);
+                let value = this.fanBase?.getAttribute(FanControl, 'percentCurrent', this.fanBase.log);
+                mode = this.fanDefault?.getAttribute(FanControl, 'fanMode', this.fanDefault.log);
+                value = this.fanDefault?.getAttribute(FanControl, 'percentCurrent', this.fanDefault.log);
                 if (isValidNumber(mode, FanControl.FanMode.Off, FanControl.FanMode.Auto) && mode === FanControl.FanMode.Auto && isValidNumber(value, 0, 100)) {
                     value = value + 10 >= 100 ? 0 : value + 10;
-                    await this.fanDefault?.setAttribute(FanControl.Cluster.id, 'percentCurrent', value, this.fanDefault.log);
-                    await this.fanDefault?.setAttribute(FanControl.Cluster.id, 'percentSetting', value, this.fanDefault.log);
+                    await this.fanDefault?.setAttribute(FanControl, 'percentCurrent', value, this.fanDefault.log);
+                    await this.fanDefault?.setAttribute(FanControl, 'percentSetting', value, this.fanDefault.log);
                     this.fanDefault?.log.info(`Set fan percentCurrent and percentSetting to ${value}`);
                 }
-                mode = this.fanComplete?.getAttribute(FanControl.Cluster.id, 'fanMode', this.fanComplete.log);
-                value = this.fanComplete?.getAttribute(FanControl.Cluster.id, 'percentCurrent', this.fanComplete.log);
+                mode = this.fanComplete?.getAttribute(FanControl, 'fanMode', this.fanComplete.log);
+                value = this.fanComplete?.getAttribute(FanControl, 'percentCurrent', this.fanComplete.log);
                 if (isValidNumber(mode, FanControl.FanMode.Off, FanControl.FanMode.Auto) && mode === FanControl.FanMode.Auto && isValidNumber(value, 0, 100)) {
                     value = value + 10 >= 100 ? 0 : value + 10;
-                    await this.fanComplete?.setAttribute(FanControl.Cluster.id, 'percentCurrent', value, this.fanComplete.log);
-                    await this.fanComplete?.setAttribute(FanControl.Cluster.id, 'percentSetting', value, this.fanComplete.log);
+                    await this.fanComplete?.setAttribute(FanControl, 'percentCurrent', value, this.fanComplete.log);
+                    await this.fanComplete?.setAttribute(FanControl, 'percentSetting', value, this.fanComplete.log);
                     this.fanComplete?.log.info(`Set fan percentCurrent and percentSetting to ${value}`);
                 }
             }, 60 * 1000 + 700);
         }
-        await this.waterLeak?.setAttribute(BooleanState.Cluster.id, 'stateValue', false, this.waterLeak.log);
+        await this.waterLeak?.setAttribute(BooleanState.id, 'stateValue', false, this.waterLeak.log);
         if (this.config.useInterval) {
             this.addInterval(async () => {
-                let value = this.waterLeak?.getAttribute(BooleanState.Cluster.id, 'stateValue', this.waterLeak.log);
+                let value = this.waterLeak?.getAttribute(BooleanState.id, 'stateValue', this.waterLeak.log);
                 if (isValidBoolean(value)) {
                     value = !value;
-                    await this.waterLeak?.setAttribute(BooleanState.Cluster.id, 'stateValue', value, this.waterLeak.log);
+                    await this.waterLeak?.setAttribute(BooleanState.id, 'stateValue', value, this.waterLeak.log);
                     this.waterLeak?.log.info(`Set waterLeak stateValue to ${value}`);
                 }
             }, 60 * 1000 + 800);
         }
-        await this.waterFreeze?.setAttribute(BooleanState.Cluster.id, 'stateValue', false, this.waterFreeze.log);
+        await this.waterFreeze?.setAttribute(BooleanState.id, 'stateValue', false, this.waterFreeze.log);
         if (this.config.useInterval) {
             this.addInterval(async () => {
-                let value = this.waterFreeze?.getAttribute(BooleanState.Cluster.id, 'stateValue', this.waterFreeze.log);
+                let value = this.waterFreeze?.getAttribute(BooleanState.id, 'stateValue', this.waterFreeze.log);
                 if (isValidBoolean(value)) {
                     value = !value;
-                    await this.waterFreeze?.setAttribute(BooleanState.Cluster.id, 'stateValue', value, this.waterFreeze.log);
+                    await this.waterFreeze?.setAttribute(BooleanState.id, 'stateValue', value, this.waterFreeze.log);
                     this.waterFreeze?.log.info(`Set waterFreeze stateValue to ${value}`);
                 }
             }, 60 * 1000 + 900);
         }
-        await this.rain?.setAttribute(BooleanState.Cluster.id, 'stateValue', false, this.rain.log);
+        await this.rain?.setAttribute(BooleanState.id, 'stateValue', false, this.rain.log);
         if (this.config.useInterval) {
             this.addInterval(async () => {
-                let value = this.rain?.getAttribute(BooleanState.Cluster.id, 'stateValue', this.rain.log);
+                let value = this.rain?.getAttribute(BooleanState.id, 'stateValue', this.rain.log);
                 if (isValidBoolean(value)) {
                     value = !value;
-                    await this.rain?.setAttribute(BooleanState.Cluster.id, 'stateValue', value, this.rain.log);
+                    await this.rain?.setAttribute(BooleanState.id, 'stateValue', value, this.rain.log);
                     this.rain?.log.info(`Set rain stateValue to ${value}`);
                 }
             }, 60 * 1000 + 1000);
         }
-        await this.smokeCo?.setAttribute(SmokeCoAlarm.Cluster.id, 'smokeState', SmokeCoAlarm.AlarmState.Normal, this.smokeCo.log);
-        await this.smokeCo?.setAttribute(SmokeCoAlarm.Cluster.id, 'coState', SmokeCoAlarm.AlarmState.Normal, this.smokeCo.log);
-        await this.smokeOnly?.setAttribute(SmokeCoAlarm.Cluster.id, 'smokeState', SmokeCoAlarm.AlarmState.Normal, this.smokeOnly.log);
-        await this.coOnly?.setAttribute(SmokeCoAlarm.Cluster.id, 'coState', SmokeCoAlarm.AlarmState.Normal, this.coOnly.log);
+        await this.smokeCo?.setAttribute(SmokeCoAlarm.id, 'smokeState', SmokeCoAlarm.AlarmState.Normal, this.smokeCo.log);
+        await this.smokeCo?.setAttribute(SmokeCoAlarm.id, 'coState', SmokeCoAlarm.AlarmState.Normal, this.smokeCo.log);
+        await this.smokeOnly?.setAttribute(SmokeCoAlarm.id, 'smokeState', SmokeCoAlarm.AlarmState.Normal, this.smokeOnly.log);
+        await this.coOnly?.setAttribute(SmokeCoAlarm.id, 'coState', SmokeCoAlarm.AlarmState.Normal, this.coOnly.log);
         if (this.config.useInterval) {
             this.addInterval(async () => {
-                let value = this.smokeCo?.getAttribute(SmokeCoAlarm.Cluster.id, 'smokeState', this.smokeCo.log);
+                let value = this.smokeCo?.getAttribute(SmokeCoAlarm, 'smokeState', this.smokeCo.log);
                 if (isValidNumber(value, SmokeCoAlarm.AlarmState.Normal, SmokeCoAlarm.AlarmState.Critical)) {
                     value = value === SmokeCoAlarm.AlarmState.Normal ? SmokeCoAlarm.AlarmState.Critical : SmokeCoAlarm.AlarmState.Normal;
-                    await this.smokeCo?.setAttribute(SmokeCoAlarm.Cluster.id, 'smokeState', value, this.smokeCo.log);
-                    await this.smokeCo?.setAttribute(SmokeCoAlarm.Cluster.id, 'coState', value, this.smokeCo.log);
-                    await this.smokeOnly?.setAttribute(SmokeCoAlarm.Cluster.id, 'smokeState', value, this.smokeOnly.log);
-                    await this.coOnly?.setAttribute(SmokeCoAlarm.Cluster.id, 'coState', value, this.coOnly.log);
+                    await this.smokeCo?.setAttribute(SmokeCoAlarm, 'smokeState', value, this.smokeCo.log);
+                    await this.smokeCo?.setAttribute(SmokeCoAlarm, 'coState', value, this.smokeCo.log);
+                    await this.smokeOnly?.setAttribute(SmokeCoAlarm, 'smokeState', value, this.smokeOnly.log);
+                    await this.coOnly?.setAttribute(SmokeCoAlarm, 'coState', value, this.coOnly.log);
                     this.smokeCo?.log.info(`Set smoke smokeState and coState to ${value}`);
                 }
             }, 60 * 1000 + 1100);
         }
-        await this.airQuality?.setAttribute(AirQuality.Cluster.id, 'airQuality', AirQuality.AirQualityEnum.Good, this.airQuality.log);
-        await this.airQuality?.setAttribute(TemperatureMeasurement.Cluster.id, 'measuredValue', 2150, this.airQuality.log);
-        await this.airQuality?.setAttribute(RelativeHumidityMeasurement.Cluster.id, 'measuredValue', 5500, this.airQuality.log);
-        await this.airQuality?.setAttribute(CarbonMonoxideConcentrationMeasurement.Cluster.id, 'measuredValue', 10, this.airQuality.log);
-        await this.airQuality?.setAttribute(CarbonDioxideConcentrationMeasurement.Cluster.id, 'measuredValue', 400, this.airQuality.log);
-        await this.airQuality?.setAttribute(NitrogenDioxideConcentrationMeasurement.Cluster.id, 'measuredValue', 1, this.airQuality.log);
-        await this.airQuality?.setAttribute(OzoneConcentrationMeasurement.Cluster.id, 'measuredValue', 1, this.airQuality.log);
-        await this.airQuality?.setAttribute(FormaldehydeConcentrationMeasurement.Cluster.id, 'measuredValue', 1, this.airQuality.log);
-        await this.airQuality?.setAttribute(Pm1ConcentrationMeasurement.Cluster.id, 'measuredValue', 100, this.airQuality.log);
-        await this.airQuality?.setAttribute(Pm25ConcentrationMeasurement.Cluster.id, 'measuredValue', 100, this.airQuality.log);
-        await this.airQuality?.setAttribute(Pm10ConcentrationMeasurement.Cluster.id, 'measuredValue', 100, this.airQuality.log);
-        await this.airQuality?.setAttribute(RadonConcentrationMeasurement.Cluster.id, 'measuredValue', 100, this.airQuality.log);
-        await this.airQuality?.setAttribute(TotalVolatileOrganicCompoundsConcentrationMeasurement.Cluster.id, 'measuredValue', 100, this.airQuality.log);
+        await this.airQuality?.setAttribute(AirQuality, 'airQuality', AirQuality.AirQualityEnum.Good, this.airQuality.log);
+        await this.airQuality?.setAttribute(TemperatureMeasurement, 'measuredValue', 2150, this.airQuality.log);
+        await this.airQuality?.setAttribute(RelativeHumidityMeasurement.id, 'measuredValue', 5500, this.airQuality.log);
+        await this.airQuality?.setAttribute(CarbonMonoxideConcentrationMeasurement.id, 'measuredValue', 10, this.airQuality.log);
+        await this.airQuality?.setAttribute(CarbonDioxideConcentrationMeasurement.id, 'measuredValue', 400, this.airQuality.log);
+        await this.airQuality?.setAttribute(NitrogenDioxideConcentrationMeasurement.id, 'measuredValue', 1, this.airQuality.log);
+        await this.airQuality?.setAttribute(OzoneConcentrationMeasurement.id, 'measuredValue', 1, this.airQuality.log);
+        await this.airQuality?.setAttribute(FormaldehydeConcentrationMeasurement.id, 'measuredValue', 1, this.airQuality.log);
+        await this.airQuality?.setAttribute(Pm1ConcentrationMeasurement.id, 'measuredValue', 100, this.airQuality.log);
+        await this.airQuality?.setAttribute(Pm25ConcentrationMeasurement.id, 'measuredValue', 100, this.airQuality.log);
+        await this.airQuality?.setAttribute(Pm10ConcentrationMeasurement.id, 'measuredValue', 100, this.airQuality.log);
+        await this.airQuality?.setAttribute(RadonConcentrationMeasurement.id, 'measuredValue', 100, this.airQuality.log);
+        await this.airQuality?.setAttribute(TotalVolatileOrganicCompoundsConcentrationMeasurement.id, 'measuredValue', 100, this.airQuality.log);
         if (this.config.useInterval) {
             this.addInterval(async () => {
-                let value = this.airQuality?.getAttribute(AirQuality.Cluster.id, 'airQuality', this.airQuality?.log);
+                let value = this.airQuality?.getAttribute(AirQuality, 'airQuality', this.airQuality?.log);
                 if (isValidNumber(value, AirQuality.AirQualityEnum.Good, AirQuality.AirQualityEnum.ExtremelyPoor)) {
                     value = value >= AirQuality.AirQualityEnum.ExtremelyPoor ? AirQuality.AirQualityEnum.Good : value + 1;
-                    await this.airQuality?.setAttribute(AirQuality.Cluster.id, 'airQuality', value, this.airQuality.log);
+                    await this.airQuality?.setAttribute(AirQuality, 'airQuality', value, this.airQuality.log);
                     this.airQuality?.log.info(`Set air quality to ${value}`);
                 }
             }, 60 * 1000 + 1100);
@@ -2324,24 +2324,24 @@ export class ExampleMatterbridgeDynamicPlatform extends MatterbridgeDynamicPlatf
             this.addInterval(async () => {
                 if (this.genericSwitchLastEvent === 'Release') {
                     this.genericSwitchLastEvent = 'Single';
-                    await this.momentarySwitch?.getChildEndpointByName('Momentaryswitch1')?.triggerSwitchEvent('Single', this.momentarySwitch?.log);
-                    await this.momentarySwitch?.getChildEndpointByName('Momentaryswitch2')?.triggerSwitchEvent('Double', this.momentarySwitch?.log);
-                    await this.momentarySwitch?.getChildEndpointByName('Momentaryswitch3')?.triggerSwitchEvent('Long', this.momentarySwitch?.log);
-                    await this.momentarySwitch?.getChildEndpointByName('Momentaryswitch4')?.triggerSwitchEvent('Single', this.momentarySwitch?.log);
-                    await this.momentarySwitch?.getChildEndpointByName('Momentaryswitch5')?.triggerSwitchEvent('Single', this.momentarySwitch?.log);
-                    await this.momentarySwitch?.getChildEndpointByName('Momentaryswitch6')?.triggerSwitchEvent('Single', this.momentarySwitch?.log);
+                    await this.momentarySwitch?.getChildEndpointById('Momentaryswitch1')?.triggerSwitchEvent('Single', this.momentarySwitch?.log);
+                    await this.momentarySwitch?.getChildEndpointById('Momentaryswitch2')?.triggerSwitchEvent('Double', this.momentarySwitch?.log);
+                    await this.momentarySwitch?.getChildEndpointById('Momentaryswitch3')?.triggerSwitchEvent('Long', this.momentarySwitch?.log);
+                    await this.momentarySwitch?.getChildEndpointById('Momentaryswitch4')?.triggerSwitchEvent('Single', this.momentarySwitch?.log);
+                    await this.momentarySwitch?.getChildEndpointById('Momentaryswitch5')?.triggerSwitchEvent('Single', this.momentarySwitch?.log);
+                    await this.momentarySwitch?.getChildEndpointById('Momentaryswitch6')?.triggerSwitchEvent('Single', this.momentarySwitch?.log);
                 }
                 else if (this.genericSwitchLastEvent === 'Single') {
                     this.genericSwitchLastEvent = 'Double';
-                    await this.momentarySwitch?.getChildEndpointByName('Momentaryswitch1')?.triggerSwitchEvent('Double', this.momentarySwitch?.log);
-                    await this.momentarySwitch?.getChildEndpointByName('Momentaryswitch2')?.triggerSwitchEvent('Long', this.momentarySwitch?.log);
-                    await this.momentarySwitch?.getChildEndpointByName('Momentaryswitch3')?.triggerSwitchEvent('Single', this.momentarySwitch?.log);
+                    await this.momentarySwitch?.getChildEndpointById('Momentaryswitch1')?.triggerSwitchEvent('Double', this.momentarySwitch?.log);
+                    await this.momentarySwitch?.getChildEndpointById('Momentaryswitch2')?.triggerSwitchEvent('Long', this.momentarySwitch?.log);
+                    await this.momentarySwitch?.getChildEndpointById('Momentaryswitch3')?.triggerSwitchEvent('Single', this.momentarySwitch?.log);
                 }
                 else if (this.genericSwitchLastEvent === 'Double') {
                     this.genericSwitchLastEvent = 'Long';
-                    await this.momentarySwitch?.getChildEndpointByName('Momentaryswitch1')?.triggerSwitchEvent('Long', this.momentarySwitch?.log);
-                    await this.momentarySwitch?.getChildEndpointByName('Momentaryswitch2')?.triggerSwitchEvent('Single', this.momentarySwitch?.log);
-                    await this.momentarySwitch?.getChildEndpointByName('Momentaryswitch3')?.triggerSwitchEvent('Double', this.momentarySwitch?.log);
+                    await this.momentarySwitch?.getChildEndpointById('Momentaryswitch1')?.triggerSwitchEvent('Long', this.momentarySwitch?.log);
+                    await this.momentarySwitch?.getChildEndpointById('Momentaryswitch2')?.triggerSwitchEvent('Single', this.momentarySwitch?.log);
+                    await this.momentarySwitch?.getChildEndpointById('Momentaryswitch3')?.triggerSwitchEvent('Double', this.momentarySwitch?.log);
                 }
                 else if (this.genericSwitchLastEvent === 'Long') {
                     this.genericSwitchLastEvent = 'Press';
@@ -2358,33 +2358,33 @@ export class ExampleMatterbridgeDynamicPlatform extends MatterbridgeDynamicPlatf
         this.clearIntervals();
         await super.onShutdown(reason);
         this.log.info('onShutdown called with reason:', reason ?? 'none');
-        if (this.config.unregisterOnShutdown === true)
+        if (this.config.unregisterOnShutdown)
             await this.unregisterAllDevices(500);
     }
     async addDevice(device) {
         if (!device.serialNumber || !device.deviceName)
-            return;
+            return undefined;
         this.setSelectDevice(device.serialNumber, device.deviceName, undefined, 'hub');
         if (this.validateDevice(device.deviceName)) {
-            device.softwareVersion = parseInt(this.version.replace(/\D/g, ''));
+            device.softwareVersion = Number.parseInt(this.version.replace(/\D/g, ''));
             device.softwareVersionString = this.version === '' ? 'Unknown' : this.version;
-            device.hardwareVersion = parseInt(this.matterbridge.matterbridgeVersion.replace(/\D/g, ''));
+            device.hardwareVersion = Number.parseInt(this.matterbridge.matterbridgeVersion.replace(/\D/g, ''));
             device.hardwareVersionString = this.matterbridge.matterbridgeVersion;
             device.softwareVersion = isValidNumber(device.softwareVersion, 0, UINT32_MAX) ? device.softwareVersion : undefined;
             device.softwareVersionString = isValidString(device.softwareVersionString) ? device.softwareVersionString.slice(0, 64) : undefined;
             device.hardwareVersion = isValidNumber(device.hardwareVersion, 0, UINT16_MAX) ? device.hardwareVersion : undefined;
             device.hardwareVersionString = isValidString(device.hardwareVersionString) ? device.hardwareVersionString.slice(0, 64) : undefined;
-            const options = device.getClusterServerOptions(BridgedDeviceBasicInformation.Cluster.id);
+            const options = device.getClusterServerOptions(BridgedDeviceBasicInformation.id);
             if (options) {
-                options.softwareVersion = device.softwareVersion || 1;
-                options.softwareVersionString = device.softwareVersionString || '1.0.0';
-                options.hardwareVersion = device.hardwareVersion || 1;
-                options.hardwareVersionString = device.hardwareVersionString || '1.0.0';
+                options.softwareVersion = device.softwareVersion ?? 1;
+                options.softwareVersionString = device.softwareVersionString ?? '1.0.0';
+                options.hardwareVersion = device.hardwareVersion ?? 1;
+                options.hardwareVersionString = device.hardwareVersionString ?? '1.0.0';
             }
             if (device.mode === undefined && !device.deviceTypes.has(bridgedNode.code)) {
                 device.deviceTypes.set(bridgedNode.code, bridgedNode);
-                const options = device.getClusterServerOptions(Descriptor.Cluster.id);
-                if (options) {
+                const options = device.getClusterServerOptions(Descriptor);
+                if (options?.deviceTypeList) {
                     const deviceTypeList = options.deviceTypeList;
                     if (!deviceTypeList.find((dt) => dt.deviceType === bridgedNode.code)) {
                         deviceTypeList.push({ deviceType: bridgedNode.code, revision: bridgedNode.revision });