Updating to reflect recent API changes