Tweak for OpportunityService.