Update the models and the API to accommodate the changes