ServiceHandler update for new PCE compatibility