Adapt to old core