Workstream #3: Event Optimisations