Updates to Event class