Adapt to service layer change