Added diagnostic logging to DeviceServices