Updated Event model