Added trace support for events