Minor changes int he event class