Refactor Pipelines classes

Follow-up !162 (merged)