Updated device id retrieval