Add metrics to enable deeper interogation of data