Metrics

added metrics support