Cleaned up classes from old rest call implementation
Added Event Type Enum