Added Metrics support.