Rework plugin for component