Plugin rework