Add more theoretical support for plugins.