Just explicitly include pipework and if a interface is passed in use it, else dont wait