Updated to use generic views.