Updated DeviceController