Finished dao refactoring.