More API changes and stuff.'