Updated for used with Django admin app