Updated models with additional fields. Updated settings.py