DeviceController Updated