dao, service Refactoring