Switched to class based views