Changes for model.py