Refactored some plugins