Refactor service classes