Improved the discovery of plugins