Refactoring. Create new plugins