Enhance Metrics accuracy