Making the other water types work in conjunction with the pipe model