Enhancement for Event reporting