Better infrastructure to load plugins