Reworked plugin loading