Minor changes in the model