Major updates to API