Update for pre-core integration.