Refactored Events that have sub events to use JSONAware