Updated plugin with an inner wrapper