Refactor to use generic views.