Adding pipe management