Added pipe detection