Add changes to model.py and views