Plugins refactoring