small plugin base refactor