Adapt to new Core.