refactor to enable Pipeline option

done for [AGIOS-57](https://issues.jboss.org/browse/AGIOS-57)