Update to use api.request