Reworked how the plug-in works