Update for changes to core