Update to current API