DAO refactorings