more dao refactoring