Added Metrics

For further tracking, added metrics