More API changes

All good things come in twos