Small changes to API