Update for Path changes and flatpipes removal