Updated DeviceManager