Updated plugin (OS fork as main project went private)