Added fields to sub event data to enable normalized processing of events