Added type header to Metrics