Updated to adopt changes in the model project