Improvements to plugin state reporting