Changed system to use build_event_dict