Added pipe objects back