Add missing components of generic pipeline