Dao Refactoring