DeviceList handling continued

Improvements in the DeviceList handling