Added events to provide cross-plugin compatability