Added Metrics support