Fix Security Errors and add event channel
Fix merge conflicts