Reworked piping functionality