Major changes to get the pipeline working in the new environment