Changes for new-style pipeline