Adapt to service changes #5200