Converted pipeline for CP 2.1.1