Improved plugin loading.