Update to current versions of API