Refactor plugin for current 1.3 use case