Updating to new pipeline api