Plugins refactored some more.