Changes to reflect API changes.