Another update to match API changes