Add some lazy loading for plugins