adding device id support