Update the thing to work with pipes-handle