Add handling of EventListener