Made some modifications to the model schema, playing with fetches in data.py