Added subplugin unloading/loading