Refactoring Plugins and Actions