First set of updates to support pipline func