Further changes to adapt to the new piping system