Updated for Django