Add fields for metrics