changes to some DAOs and triggers