Updates to the way plugin events are handled