Refactoring new service layer