Update to reflect API changes

As the title says.