Added support for device/event