PluginResults refactor