Updated Metrics methods