refactor to enable Pipeline option