Refactored pipeline to individual steps again