Changed to reflect generic views