Improved plugin system