Add metrics to queue
Improve metrics API support