Minor changes in the API