Added device ID support using the virtual-device from XS.