Modified Event classes to clarify usage.