Some extra logging added and using a more fine grained aggregation strategy