Small changes due to API