refactored pipelines, Add Exceptions