Update to match API changes