Updated to use latest quiver-component