Update models.py - fixed order set issues