Started adapting to Django 1.7