Updated plugin to be ready for 1.0.0g4