Adapt to Core changes (service injection)