Refactored to work with django-filer