Inheritance Refactoring (Event enum for EventType still in progress.)