Added better polling for GetDevices