Update index definitions
Try to keep all datastore relations in models.py
Remove fetch logs for now, they are not working properly