Updated Event class definitions