Home Bridge Integration

My Aqara M2 has 12 Water Leak Sensors assigned to the bridge. When the M2 is added to HA via HomeBridge all the water leak sensors have same name and no method to distinguish them. Can you expose the serial number \ accessory id to HomeBridge so the sensors can be uniquely identify the device.

Had the same issue with Home app but serial number \ accessory id was exposed so could compare devices from aqara app with Home app.