Added more classes for events