Update to the latest api