More changes to model.js