Minor updates to the API