Add integrated Metrics support