Updates to reflect API changes.