Refactored eventing to allow notify ROLEs, some corrections and improvements