[Core] Update for recent changes