Plugin check refactoring