Major changes in models and some other parts of the app.