Refactoring of DAOs.