Include EventData
Update class defintions
Remove inheretence from GCstats