Update to the new Api