Refactored pipelines