Rework Pipe connection rules (again)