Improve piping