Refactored BasicPipeline