Continue refactoring the core-to-core pipeline