bugfixes
More references
Added key aggregates data