Rewrote the plugin to make use of the extendable join form