Finishing dao refactoring.