Minor changes to the API