Refactored plugins model