replaced deprecated generic views with class based gen-views