Updated plugin for work with signature v2.0