Updated plugin functionality