EventClass re-design.