Update to latest api