Lots of updates to the API