Refactoring Service layer