Updated code to work with Django 1.4