Updated plugin structure