Refactoring full service