Added eventOf classification