Updates to API to sync with Java