Consolidate into core.