Added more piping