Alter views to CBV