Some changes on the model