More modular pipeline