plugin refactoring continuing