EvidenceMetrics refactor complete