First refactoring Device Dao.  Need to store enities based on Id and
retrieving them this way