#46 Added Event class