Event class tweak