Updating to match core upgrades