As mentioned in the other PR, we can blitz all plugins with these types of changes once the plugin template is agreed upon.