Start refactoring of Plugin-specific functionality.