Added pipework integration