Re-adding pipework as an optional