Update for API changes