Refactoring du plugin