Updated plugin with latest additions