Added patching for plugin-use