Add types to event class