Additions to reflect API changes.