Replacing deprecated generic views with new class-based ones