Added support for getting device id