Updated plugin to work with signature v2.0