Update to reflect current API