Added fields for metrics