Updating because of API changes