Various enhancements to data model for events and calendars.