Added a few new metrics