Minor changes to API