Corrected my change to EventDataHandler