Tweaked plugin to function properly with the rework to the framework