updated DAO with more methods