Update to current API spec