Some updates to the API