Controllers expanded to include views.