Updated Event Model