Adding support for failed events