Updating to reflect API changes