Added support for better graph metric aggregation

(kind of broken lol xd)