Updated plugin with wrapper