Reworked plugin