Updated to work with the newer django-cms