Some more work on plugins.