Add plugin request views, clean up a few things