Adding some new metrics to fill out