[plugin #7] Updated logic for plugins.