Added the pre/post builtin handlers back to the pipeline