We've recently refactored the event hierachy and added generic superclasses to group events (SecurityEvent, AttachmentEvent, etc.). The child classes still contain duplicated code (e.g. getSessionId() is in LoginEvent and LogoutEvent, both children of SecurityEvent). Use inheritance!