Migrated code to Django 1.5