Enhancements to data model for events