Update for V6 Plugin compatibility

Modified plugin for V6 plugin compatibility.