Updated Generic DAO interface