Modify event integration to be most generic
Add comment