Minor updates on the API