Add in new metrics