changed a little structure of the DeviceHelper