Updated Models.py to new correct format