Refactored DeviceManager
Refactored DeviceManager