Upgraded plugin to version 2.0