Refactor plugin for next release