Adapting to changes at core