Added diagnostic event class