Switched Events for Occurrences, renamed, dropped Occurrences and added generate_events