Adding more to DAO layer