Updated Event hierarchy, added events