Updated plugin system