Add support for counters and gauges