Small changes to the API again