Refactoring config plugin