Event changes to align w/ helpdesk sample