Check in fix for Device Dao to support Reading Type as an object