Refactoring Plugins setup