Added device id code