More changes to API