Model updated for Django 1.7