Improved support for some extra plugins.