Update for API changes.