[Minor] added @EventHandler