Updated DAOs for new database