Refactor service classes/background jobs