DAO-Service refactoring