Update with API changes