Changes to DAO inline with new spec