Update for unbundle pipeline