Adjusting to the new pipeline contexts