Update to use new dedicated api.