Update models.py

Olivers data scheme changes