Adapting to changes in Core/Engine.