Added support for device configuration