Date Metric Result refactored