Some minor changes to the model