Converted existing views to generic views