Updated plugin manager