support new device id format