Reorganise dependency injection in ServiceHandler