Updated plugin code a bit more.