Fixed plugin after refactor