total daos refactoring