Updated Event class, comments in