added device name and device id