Some changes to the model of the app