Updated Event to be parse-friendly