Added some files to DeviceManager