Update to use pipeline