Updated plugin matrix