Reflecting changes in the API and model