Updated classes to make use of the latest views.