Tweaks added to models.py