Updated plugin setup