Add option to use a transient device ID