Changed to class based views