Added support for partial pipeline overriding
Bugfixes and simplifications