Updated plugin+map