Trace

Add extra event data that are not aggregate specific.
This is probably me not knowing enough ruby, but why is it necessary to store both the `@@` and the `@` variable?