Refactor ConventionPipeline