Small DAO refactoring.