Replace some specialization with generic views