Add pipe and filter box support