DAO Refactoring Complete