Updated Event service
Just a reminder