Refactored plugins