Update for both API changes