DAO updated with new methods