Started adding metrics data