Dao refactorings