Added Event class