Update to conform to API changes